From 1b7488a040d8f8efae3b5c7298e37857976dc144 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 25 Apr 2013 23:51:00 +0000 Subject: [PATCH 001/160] [maven-release-plugin] prepare for next development iteration svn path=/trunk/api/javaee-api/javax.servlet/; revision=61657 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3d0169b6..424827f1 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 3.1.0 + 3.1.1-b01-SNAPSHOT 3.1 @@ -118,9 +118,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-3.1.0 - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-3.1.0 - http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-3.1.0 + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet From 48185d151c4c425a10c25a56cc03a41e81dcc280 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Mon, 1 Jul 2013 16:33:35 +0000 Subject: [PATCH 002/160] fix typo in javadoc of ServletContext#getEffectiveMinorVersion svn path=/trunk/api/javaee-api/javax.servlet/; revision=62274 --- src/main/java/javax/servlet/ServletContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 3ba38e04..be6b785d 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -224,7 +224,7 @@ public interface ServletContext { * supported by the Servlet container. * * @return the minor version of the Servlet specification that the - * application xrepresented by this ServletContext is based on + * application represented by this ServletContext is based on * * @throws UnsupportedOperationException if this ServletContext was * passed to the {@link ServletContextListener#contextInitialized} method From 6949762d5c9a10d190d44f99972dcf644c6c1e0e Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Mon, 1 Jul 2013 16:33:54 +0000 Subject: [PATCH 003/160] update maven-compiler-plugin version svn path=/trunk/api/javaee-api/javax.servlet/; revision=62275 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 424827f1..0a7b2267 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ maven-compiler-plugin - 2.0.2 + 3.1 1.7 1.7 From 5ec5dfd567ec76c61f0cea2d122f6b0b28caed32 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 30 Jul 2013 22:51:02 +0000 Subject: [PATCH 004/160] fix issue https://java.net/jira/browse/SERVLET_SPEC-76 ("Javadoc coding error in javax.servlet.http.HttpSession interface") svn path=/trunk/api/javaee-api/javax.servlet/; revision=62430 --- src/main/java/javax/servlet/http/HttpSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java index 23071ed6..b3249003 100644 --- a/src/main/java/javax/servlet/http/HttpSession.java +++ b/src/main/java/javax/servlet/http/HttpSession.java @@ -291,7 +291,7 @@ public interface HttpSession { * HttpSessionBindingListener.valueUnbound method is called. * *

If the value passed in is null, this has the same effect as calling - * removeAttribute(). + * removeAttribute(). * * * @param name the name to which the object is bound; From c4d474c9e4e81a82a7fc877962d895875558d29a Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Mon, 5 Aug 2013 19:23:04 +0000 Subject: [PATCH 005/160] fix issue https://java.net/jira/browse/SERVLET_SPEC-77 ("Wrong @returns description of javax.servlet.ServletContext.getInitParameter") svn path=/trunk/api/javaee-api/javax.servlet/; revision=62445 --- src/main/java/javax/servlet/ServletContext.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index be6b785d..b1d15da4 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -590,8 +590,9 @@ public interface ServletContext { * @param name a String containing the name of the * parameter whose value is requested * - * @return a String containing at least the - * servlet container name and version number + * @return a String containing the value + * of the context's initialization parameter, or null if + * the context's initialization parameter does not exist * * @see ServletConfig#getInitParameter */ From 07879693a505133f4562811683edcef33ce2ac66 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 3 Oct 2013 18:48:11 +0000 Subject: [PATCH 006/160] use ASCII " in javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=62774 --- src/main/java/javax/servlet/ServletContext.java | 6 +++--- src/main/java/javax/servlet/http/HttpServletRequest.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index b1d15da4..fd98c618 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -123,10 +123,10 @@ public interface ServletContext { * *

The context path is the portion of the request URI that is used * to select the context of the request. The context path always comes - * first in a request URI. If this context is the “default” context - * rooted at the base of the Web server’s URL name space, this path + * first in a request URI. If this context is the "default" context + * rooted at the base of the Web server's URL name space, this path * will be an empty string. Otherwise, if the context is not rooted at - * the root of the server’s name space, the path starts with a / + * the root of the server's name space, the path starts with a / * character but does not end with a / character. * *

It is possible that a servlet container may match a context by diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index d41f32f6..047695d5 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -362,12 +362,12 @@ public interface HttpServletRequest extends ServletRequest { * defined using deployment descriptors. If the user has not been * authenticated, the method returns false. * - *

The role name “*” should never be used as an argument in calling + *

The role name "*" should never be used as an argument in calling * isUserInRole. Any call to isUserInRole with - * “*” must return false. - * If the role-name of the security-role to be tested is “**”, and + * "*" must return false. + * If the role-name of the security-role to be tested is "**", and * the application has NOT declared an application security-role with - * role-name “**”, isUserInRole must only return true if + * role-name "**", isUserInRole must only return true if * the user has been authenticated; that is, only when * {@link #getRemoteUser} and {@link #getUserPrincipal} would both return * a non-null value. Otherwise, the container must check From 0d0d762488c556a67ee582051397602478d84552 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 13 Feb 2015 22:30:38 +0000 Subject: [PATCH 007/160] fix javadoc error svn path=/trunk/api/javaee-api/javax.servlet/; revision=63770 --- src/main/java/javax/servlet/AsyncContext.java | 6 +- .../javax/servlet/HttpConstraintElement.java | 6 +- .../java/javax/servlet/ServletContext.java | 70 +++++++++---------- .../servlet/annotation/HttpConstraint.java | 4 +- .../descriptor/JspConfigDescriptor.java | 4 +- .../servlet/http/HttpServletRequest.java | 4 +- .../http/HttpServletRequestWrapper.java | 4 +- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java index 752c912d..d950cfb7 100644 --- a/src/main/java/javax/servlet/AsyncContext.java +++ b/src/main/java/javax/servlet/AsyncContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -167,7 +167,7 @@ public interface AsyncContext { * last dispatched by the container. * *

The following sequence illustrates how this will work: - * 

+     * 
{@code
      * // REQUEST dispatch to /url/A
      * AsyncContext ac = request.startAsync();
      * ...
@@ -190,7 +190,7 @@ public interface AsyncContext {
      * ac = request.startAsync(request,response);
      * ...
      * ac.dispatch(); // ASYNC dispatch to /url/B
-     * 

+     * }
* *

This method returns immediately after passing the request * and response objects to a container managed thread, on which the diff --git a/src/main/java/javax/servlet/HttpConstraintElement.java b/src/main/java/javax/servlet/HttpConstraintElement.java index 69863561..57f9841f 100644 --- a/src/main/java/javax/servlet/HttpConstraintElement.java +++ b/src/main/java/javax/servlet/HttpConstraintElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -93,7 +93,7 @@ public HttpConstraintElement(TransportGuarantee guarantee, * @param semantic EmptyRoleSemantic.DENY or * EmptyRoleSemantic.PERMIT * @param guarantee TransportGuarantee.NONE or - * TransportGuarantee.CONFIDENTIAL + * TransportGuarantee.CONFIDENTIAL * @param roleNames the names of the roles that are to be allowed * access, or missing if the semantic is EmptyRoleSemantic.DENY */ @@ -113,7 +113,7 @@ public HttpConstraintElement(EmptyRoleSemantic semantic, * *

This value is insignificant when getRolesAllowed * returns a non-empty array, and should not be specified when a - * non-empty array is specified for getRolesAllowed. + * non-empty array is specified for getRolesAllowed. * * @return the {@link EmptyRoleSemantic} to be applied when * getRolesAllowed returns an empty (that is, zero-length) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index fd98c618..06727bea 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -265,7 +265,7 @@ public interface ServletContext { * *

For example, for a web application containing: * - * 

+     * 
{@code
      *   /welcome.html
      *   /catalog/index.html
      *   /catalog/products.html
@@ -275,7 +275,7 @@ public interface ServletContext {
      *   /WEB-INF/web.xml
      *   /WEB-INF/classes/com.acme.OrderServlet.class
      *   /WEB-INF/lib/catalog.jar!/META-INF/resources/catalog/moreOffers/books.html
-     * 

+     * }
* * getResourcePaths("/") would return * {"/welcome.html", "/catalog/", "/customer/", "/WEB-INF/"}, @@ -1284,12 +1284,12 @@ public T createFilter(Class clazz) * ServletContext, and must implement one or more of the following * interfaces: *
    - *
  • {@link ServletContextAttributeListener} - *
  • {@link ServletRequestListener} - *
  • {@link ServletRequestAttributeListener} - *
  • {@link javax.servlet.http.HttpSessionAttributeListener} - *
  • {@link javax.servlet.http.HttpSessionIdListener} - *
  • {@link javax.servlet.http.HttpSessionListener} + *
  • {@link ServletContextAttributeListener} + *
  • {@link ServletRequestListener} + *
  • {@link ServletRequestAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionIdListener} + *
  • {@link javax.servlet.http.HttpSessionListener} *
* *

If this ServletContext was passed to @@ -1341,12 +1341,12 @@ public T createFilter(Class clazz) *

The given listener must be an instance of one or more of the * following interfaces: *

    - *
  • {@link ServletContextAttributeListener} - *
  • {@link ServletRequestListener} - *
  • {@link ServletRequestAttributeListener} - *
  • {@link javax.servlet.http.HttpSessionAttributeListener} - *
  • {@link javax.servlet.http.HttpSessionIdListener} - *
  • {@link javax.servlet.http.HttpSessionListener} + *
  • {@link ServletContextAttributeListener} + *
  • {@link ServletRequestListener} + *
  • {@link ServletRequestAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionIdListener} + *
  • {@link javax.servlet.http.HttpSessionListener} *
* *

If this ServletContext was passed to @@ -1389,12 +1389,12 @@ public T createFilter(Class clazz) *

The given listenerClass must implement one or more of the * following interfaces: *

    - *
  • {@link ServletContextAttributeListener} - *
  • {@link ServletRequestListener} - *
  • {@link ServletRequestAttributeListener} - *
  • {@link javax.servlet.http.HttpSessionAttributeListener} - *
  • {@link javax.servlet.http.HttpSessionIdListener} - *
  • {@link javax.servlet.http.HttpSessionListener} + *
  • {@link ServletContextAttributeListener} + *
  • {@link ServletRequestListener} + *
  • {@link ServletRequestAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionAttributeListener} + *
  • {@link javax.servlet.http.HttpSessionIdListener} + *
  • {@link javax.servlet.http.HttpSessionListener} *
* *

If this ServletContext was passed to @@ -1441,13 +1441,13 @@ public T createFilter(Class clazz) * Instantiates the given EventListener class. * *

The specified EventListener class must implement at least one of - * the {@link ServletContextListener}, - * {@link ServletContextAttributeListener}, - * {@link ServletRequestListener}, - * {@link ServletRequestAttributeListener}, - * {@link javax.servlet.http.HttpSessionAttributeListener} - * {@link javax.servlet.http.HttpSessionIdListener}, or - * {@link javax.servlet.http.HttpSessionListener}, or + * the {@link ServletContextListener}, + * {@link ServletContextAttributeListener}, + * {@link ServletRequestListener}, + * {@link ServletRequestAttributeListener}, + * {@link javax.servlet.http.HttpSessionAttributeListener}, + * {@link javax.servlet.http.HttpSessionIdListener}, or + * {@link javax.servlet.http.HttpSessionListener} * interfaces. * *

The returned EventListener instance may be further customized @@ -1477,13 +1477,13 @@ public T createFilter(Class clazz) * * @throws IllegalArgumentException if the specified EventListener class * does not implement any of the - * {@link ServletContextListener}, - * {@link ServletContextAttributeListener}, - * {@link ServletRequestListener}, - * {@link ServletRequestAttributeListener}, - * {@link javax.servlet.http.HttpSessionAttributeListener} - * {@link javax.servlet.http.HttpSessionIdListener}, or - * {@link javax.servlet.http.HttpSessionListener}, or + * {@link ServletContextListener}, + * {@link ServletContextAttributeListener}, + * {@link ServletRequestListener}, + * {@link ServletRequestAttributeListener}, + * {@link javax.servlet.http.HttpSessionAttributeListener}, + * {@link javax.servlet.http.HttpSessionIdListener}, or + * {@link javax.servlet.http.HttpSessionListener} * interfaces. * * @since Servlet 3.0 diff --git a/src/main/java/javax/servlet/annotation/HttpConstraint.java b/src/main/java/javax/servlet/annotation/HttpConstraint.java index 99c5e12a..d4230889 100644 --- a/src/main/java/javax/servlet/annotation/HttpConstraint.java +++ b/src/main/java/javax/servlet/annotation/HttpConstraint.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -72,7 +72,7 @@ * The default authorization semantic. * This value is insignificant when rolesAllowed returns a * non-empty array, and should not be specified when a non-empty - * array is specified for rolesAllowed. + * array is specified for rolesAllowed. * * @return the {@link EmptyRoleSemantic} to be applied when * rolesAllowed returns an empty (that is, zero-length) array. diff --git a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java index fc1599c1..22ab0748 100644 --- a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -62,7 +62,7 @@ public interface JspConfigDescriptor { * affect this JspConfigDescriptor. * * @return a (possibly empty) Collection of the - * <taglib<>/code> child elements of the + * <taglib> child elements of the * <jsp-config> element represented by this * JspConfigDescriptor */ diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 047695d5..28ba83e5 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -727,7 +727,7 @@ public void login(String username, String password) public Part getPart(String name) throws IOException, ServletException; /** - * Create an instance of HttpUpgradeHandler for an given + * Create an instance of HttpUpgradeHandler for a given * class and uses it for the http protocol upgrade processing. * * @param handlerClass The HttpUpgradeHandler class used for the upgrade. diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index e6ee1191..c67ff26c 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -388,7 +388,7 @@ public Part getPart(String name) throws IOException, ServletException { } /** - * Create an instance of HttpUpgradeHandler for an given + * Create an instance of HttpUpgradeHandler for a given * class and uses it for the http protocol upgrade processing. * * @since Servlet 3.1 From cd189c1b057d6cd39778306ca8046364b4565ba9 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 18 Feb 2015 01:56:52 +0000 Subject: [PATCH 008/160] javadoc change major version to 4 svn path=/trunk/api/javaee-api/javax.servlet/; revision=63774 --- src/main/java/javax/servlet/ServletContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 06727bea..7f1b90eb 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -176,9 +176,9 @@ public interface ServletContext { /** * Returns the major version of the Servlet API that this * servlet container supports. All implementations that comply - * with Version 3.0 must have this method return the integer 3. + * with Version 4.0 must have this method return the integer 4. * - * @return 3 + * @return 4 */ public int getMajorVersion(); From c908bd8ee40d3a6750403b8ba797829790f86456 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Sat, 21 Feb 2015 16:34:05 +0000 Subject: [PATCH 009/160] javadoc fix for https://java.net/jira/browse/SERVLET_SPEC-127 "Minor mistakes in the specification (Servlet 3.1 Final Release for Evaluation)" svn path=/trunk/api/javaee-api/javax.servlet/; revision=63779 --- src/main/java/javax/servlet/ServletContainerInitializer.java | 4 ++-- src/main/java/javax/servlet/ServletSecurityElement.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContainerInitializer.java b/src/main/java/javax/servlet/ServletContainerInitializer.java index 9ebdbdf6..eb48a705 100644 --- a/src/main/java/javax/servlet/ServletContainerInitializer.java +++ b/src/main/java/javax/servlet/ServletContainerInitializer.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -59,7 +59,7 @@ * to {@link #onStartup}. * *

When examining the classes of an application to see if they match - * any of the criteria specified by the HandlesTypes annontation + * any of the criteria specified by the HandlesTypes annotation * of a ServletContainerInitializer, the container may run into * classloading problems if any of the application's optional JAR * files are missing. Because the container is not in a position to decide diff --git a/src/main/java/javax/servlet/ServletSecurityElement.java b/src/main/java/javax/servlet/ServletSecurityElement.java index 5947174b..a00a256e 100644 --- a/src/main/java/javax/servlet/ServletSecurityElement.java +++ b/src/main/java/javax/servlet/ServletSecurityElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -45,7 +45,7 @@ import javax.servlet.annotation.ServletSecurity; /** - * Java Class represntation of a {@link ServletSecurity} annotation value. + * Java Class representation of a {@link ServletSecurity} annotation value. * * @since Servlet 3.0 */ From 30bd36e228bcaffd9de0e58dbb49d1e4f24c42a2 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 4 Aug 2015 17:25:02 +0000 Subject: [PATCH 010/160] fix javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64016 --- src/main/java/javax/servlet/annotation/HandlesTypes.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java index a1dbdae8..bc4f3ec6 100644 --- a/src/main/java/javax/servlet/annotation/HandlesTypes.java +++ b/src/main/java/javax/servlet/annotation/HandlesTypes.java @@ -69,6 +69,8 @@ * the {@link javax.servlet.ServletContainerInitializer#onStartup} * method of the ServletContainerInitializer (if no matching classes * are found, null must be passed instead) + * + * @return the classes in which ServletContainerInitializer has expressed interest */ Class[] value(); } From bde4daa6dc6848575729d6e898e79dc4a4e883b8 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 4 Aug 2015 20:06:02 +0000 Subject: [PATCH 011/160] fix copyright year svn path=/trunk/api/javaee-api/javax.servlet/; revision=64017 --- src/main/java/javax/servlet/annotation/HandlesTypes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java index bc4f3ec6..c6ce790c 100644 --- a/src/main/java/javax/servlet/annotation/HandlesTypes.java +++ b/src/main/java/javax/servlet/annotation/HandlesTypes.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From ac0204758bc76706a71274bfb60db56e00803b7c Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 4 Aug 2015 20:11:38 +0000 Subject: [PATCH 012/160] fix javadoc warnings svn path=/trunk/api/javaee-api/javax.servlet/; revision=64018 --- .../servlet/annotation/MultipartConfig.java | 10 ++++++- .../javax/servlet/annotation/WebFilter.java | 24 ++++++++++++++++- .../servlet/annotation/WebInitParam.java | 8 +++++- .../javax/servlet/annotation/WebListener.java | 4 ++- .../javax/servlet/annotation/WebServlet.java | 27 ++++++++++++++++--- 5 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/main/java/javax/servlet/annotation/MultipartConfig.java b/src/main/java/javax/servlet/annotation/MultipartConfig.java index 69c04332..f697cf70 100644 --- a/src/main/java/javax/servlet/annotation/MultipartConfig.java +++ b/src/main/java/javax/servlet/annotation/MultipartConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -63,6 +63,8 @@ /** * The directory location where files will be stored + * + * @return the directory location where files will be stored */ String location() default ""; @@ -70,6 +72,8 @@ * The maximum size allowed for uploaded files. * *

The default is -1L, which means unlimited. + * + * @return the maximum size allowed for uploaded files */ long maxFileSize() default -1L; @@ -78,11 +82,15 @@ * requests * *

The default is -1L, which means unlimited. + * + * @return the maximum size allowed for multipart/form-data requests */ long maxRequestSize() default -1L; /** * The size threshold after which the file will be written to disk + * + * @return the size threshold after which the file will be written to disk */ int fileSizeThreshold() default 0; } diff --git a/src/main/java/javax/servlet/annotation/WebFilter.java b/src/main/java/javax/servlet/annotation/WebFilter.java index 88b09099..ce01fb3c 100644 --- a/src/main/java/javax/servlet/annotation/WebFilter.java +++ b/src/main/java/javax/servlet/annotation/WebFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -65,57 +65,79 @@ /** * The description of the filter + * + * @return the description of the filter */ String description() default ""; /** * The display name of the filter + * + * @return the display name of the filter */ String displayName() default ""; /** * The init parameters of the filter + * + * @return the init parameters of the filter */ WebInitParam[] initParams() default {}; /** * The name of the filter + * + * @return the name of the filter */ String filterName() default ""; /** * The small-icon of the filter + * + * @return the small-icon of the filter */ String smallIcon() default ""; /** * The large-icon of the filter + * + * @return the large-icon of the filter */ String largeIcon() default ""; /** * The names of the servlets to which the filter applies. + * + * @return the names of the servlets to which the filter applies */ String[] servletNames() default {}; /** * The URL patterns to which the filter applies + * The default value is an empty array. + * + * @return the URL patterns to which the filter applies */ String[] value() default {}; /** * The URL patterns to which the filter applies + * + * @return the URL patterns to which the filter applies */ String[] urlPatterns() default {}; /** * The dispatcher types to which the filter applies + * + * @return the dispatcher types to which the filter applies */ DispatcherType[] dispatcherTypes() default {DispatcherType.REQUEST}; /** * Declares whether the filter supports asynchronous operation mode. * + * @return {@code true} if the filter supports asynchronous operation mode * @see javax.servlet.ServletRequest#startAsync * @see javax.servlet.ServletRequest#startAsync(ServletRequest, * ServletResponse) diff --git a/src/main/java/javax/servlet/annotation/WebInitParam.java b/src/main/java/javax/servlet/annotation/WebInitParam.java index d608215e..14572774 100644 --- a/src/main/java/javax/servlet/annotation/WebInitParam.java +++ b/src/main/java/javax/servlet/annotation/WebInitParam.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -59,16 +59,22 @@ /** * Name of the initialization parameter + * + * @return name of the initialization parameter */ String name(); /** * Value of the initialization parameter + * + * @return value of the initialization parameter */ String value(); /** * Description of the initialization parameter + * + * @return description of the initialization parameter */ String description() default ""; } diff --git a/src/main/java/javax/servlet/annotation/WebListener.java b/src/main/java/javax/servlet/annotation/WebListener.java index 085aad2f..cd54c7c0 100644 --- a/src/main/java/javax/servlet/annotation/WebListener.java +++ b/src/main/java/javax/servlet/annotation/WebListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -66,6 +66,8 @@ public @interface WebListener { /** * Description of the listener + * + * @return description of the listener */ String value() default ""; } diff --git a/src/main/java/javax/servlet/annotation/WebServlet.java b/src/main/java/javax/servlet/annotation/WebServlet.java index 65fa60e7..4e3c3b6b 100644 --- a/src/main/java/javax/servlet/annotation/WebServlet.java +++ b/src/main/java/javax/servlet/annotation/WebServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -64,32 +64,43 @@ /** * The name of the servlet + * + * @return the name of the servlet */ String name() default ""; /** * The URL patterns of the servlet + * + * @return the URL patterns of the servlet */ String[] value() default {}; /** * The URL patterns of the servlet + * + * @return the URL patterns of the servlet */ String[] urlPatterns() default {}; /** * The load-on-startup order of the servlet + * + * @return the load-on-startup order of the servlet */ int loadOnStartup() default -1; /** * The init parameters of the servlet + * + * @return the init parameters of the servlet */ WebInitParam [] initParams() default {}; /** * Declares whether the servlet supports asynchronous operation mode. * + * @return {@code true} if the servlet supports asynchronous operation mode * @see javax.servlet.ServletRequest#startAsync * @see javax.servlet.ServletRequest#startAsync(ServletRequest, * ServletResponse) @@ -98,21 +109,29 @@ /** * The small-icon of the servlet + * + * @return the small-icon of the servlet */ String smallIcon() default ""; - /** - * The large-icon of the servlet - */ + /** + * The large-icon of the servlet + * + * @return the large-icon of the servlet + */ String largeIcon() default ""; /** * The description of the servlet + * + * @return the description of the servlet */ String description() default ""; /** * The display name of the servlet + * + * @return the display name of the servlet */ String displayName() default ""; From b67fdc2f06df8773da3277320a37b9977a5f95da Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 4 Aug 2015 21:05:58 +0000 Subject: [PATCH 013/160] fix javadoc warnings svn path=/trunk/api/javaee-api/javax.servlet/; revision=64019 --- src/main/java/javax/servlet/AsyncContext.java | 1 + src/main/java/javax/servlet/ReadListener.java | 4 +++- src/main/java/javax/servlet/WriteListener.java | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java index d950cfb7..fec5ba13 100644 --- a/src/main/java/javax/servlet/AsyncContext.java +++ b/src/main/java/javax/servlet/AsyncContext.java @@ -452,6 +452,7 @@ public void addListener(AsyncListener listener, *

This method supports any annotations applicable to AsyncListener. * + * @param the class of the object to instantiate * @param clazz the AsyncListener class to instantiate * * @return the new AsyncListener instance diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java index c8582e22..19355de6 100644 --- a/src/main/java/javax/servlet/ReadListener.java +++ b/src/main/java/javax/servlet/ReadListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -75,6 +75,8 @@ public interface ReadListener extends EventListener { /** * Invoked when an error occurs processing the request. + * + * @param t the throwable to indicate why the read operation failed */ public void onError(Throwable t); diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java index 6724dad0..74a45731 100644 --- a/src/main/java/javax/servlet/WriteListener.java +++ b/src/main/java/javax/servlet/WriteListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -66,6 +66,8 @@ public interface WriteListener extends EventListener { /** * Invoked when an error occurs writing data using the non-blocking APIs. + * + * @param t the throwable to indicate why the write operation failed */ public void onError(final Throwable t); From 60b0425c4b58b1fae0f4a2e8dad32f0ec9b15ddc Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 4 Aug 2015 22:40:11 +0000 Subject: [PATCH 014/160] fix typo in javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64020 --- src/main/java/javax/servlet/http/Part.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/http/Part.java b/src/main/java/javax/servlet/http/Part.java index 550247ca..3954f083 100644 --- a/src/main/java/javax/servlet/http/Part.java +++ b/src/main/java/javax/servlet/http/Part.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -55,7 +55,7 @@ public interface Part { * Gets the content of this part as an InputStream * * @return The content of this part as an InputStream - * @throws IOException If an error occurs in retrieving the contet + * @throws IOException If an error occurs in retrieving the content * as an InputStream */ public InputStream getInputStream() throws IOException; From e800327a64004ab5ba568b1639a27a1f7b27f1c0 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 4 Aug 2015 22:41:00 +0000 Subject: [PATCH 015/160] add link in javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64021 --- src/main/java/javax/servlet/annotation/HandlesTypes.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java index c6ce790c..33ebfd36 100644 --- a/src/main/java/javax/servlet/annotation/HandlesTypes.java +++ b/src/main/java/javax/servlet/annotation/HandlesTypes.java @@ -70,7 +70,8 @@ * method of the ServletContainerInitializer (if no matching classes * are found, null must be passed instead) * - * @return the classes in which ServletContainerInitializer has expressed interest + * @return the classes in which {@link javax.servlet.ServletContainerInitializer + * ServletContainerInitializer} has expressed interest */ Class[] value(); } From 6b431f4656588883285980adad375103f04e7262 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 6 Aug 2015 15:01:14 +0000 Subject: [PATCH 016/160] Fix Java SE 8 javadoc warnings M src/main/java/javax/servlet/ServletRequestEvent.java M src/main/java/javax/servlet/ServletResponse.java M src/main/java/javax/servlet/ServletResponseWrapper.java M src/main/java/javax/servlet/ServletRequest.java M src/main/java/javax/servlet/ServletRequestWrapper.java M src/main/java/javax/servlet/http/HttpSessionContext.java M src/main/java/javax/servlet/http/HttpServletRequest.java M src/main/java/javax/servlet/http/HttpServletRequestWrapper.java M src/main/java/javax/servlet/http/HttpServletResponseWrapper.java M src/main/java/javax/servlet/http/HttpSessionActivationListener.java M src/main/java/javax/servlet/http/HttpSessionBindingEvent.java M src/main/java/javax/servlet/http/HttpSession.java M src/main/java/javax/servlet/http/HttpSessionEvent.java - fix javadoc warnings svn path=/trunk/api/javaee-api/javax.servlet/; revision=64023 --- src/main/java/javax/servlet/ServletRequest.java | 5 +++++ src/main/java/javax/servlet/ServletRequestEvent.java | 4 ++++ src/main/java/javax/servlet/ServletRequestWrapper.java | 10 ++++++++++ src/main/java/javax/servlet/ServletResponse.java | 5 +++++ .../java/javax/servlet/ServletResponseWrapper.java | 6 ++++++ .../java/javax/servlet/http/HttpServletRequest.java | 10 +++++++++- .../javax/servlet/http/HttpServletRequestWrapper.java | 2 ++ .../javax/servlet/http/HttpServletResponseWrapper.java | 2 ++ src/main/java/javax/servlet/http/HttpSession.java | 1 + .../servlet/http/HttpSessionActivationListener.java | 10 ++++++++-- .../javax/servlet/http/HttpSessionBindingEvent.java | 3 +++ .../java/javax/servlet/http/HttpSessionContext.java | 5 +++++ src/main/java/javax/servlet/http/HttpSessionEvent.java | 3 +++ 13 files changed, 63 insertions(+), 3 deletions(-) diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java index 5d99560a..93a8edc8 100644 --- a/src/main/java/javax/servlet/ServletRequest.java +++ b/src/main/java/javax/servlet/ServletRequest.java @@ -457,6 +457,11 @@ public interface ServletRequest { public RequestDispatcher getRequestDispatcher(String path); /** + * @param path the path for which the real path is to be returned. + + * @return the real path, or null if the + * translation cannot be performed. + * @deprecated As of Version 2.1 of the Java Servlet API, * use {@link ServletContext#getRealPath} instead. */ diff --git a/src/main/java/javax/servlet/ServletRequestEvent.java b/src/main/java/javax/servlet/ServletRequestEvent.java index 8d04e649..3c7a8610 100644 --- a/src/main/java/javax/servlet/ServletRequestEvent.java +++ b/src/main/java/javax/servlet/ServletRequestEvent.java @@ -83,6 +83,8 @@ public ServletRequestEvent(ServletContext sc, ServletRequest request) { /** * Returns the ServletRequest that is changing. + + * @return the {@link ServletRequest} corresponding to this event. */ public ServletRequest getServletRequest () { return this.request; @@ -90,6 +92,8 @@ public ServletRequest getServletRequest () { /** * Returns the ServletContext of this web application. + + * @return the {@link ServletContext} for this web application. */ public ServletContext getServletContext () { return (ServletContext) super.getSource(); diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java index 565fd36f..7b457296 100644 --- a/src/main/java/javax/servlet/ServletRequestWrapper.java +++ b/src/main/java/javax/servlet/ServletRequestWrapper.java @@ -83,6 +83,8 @@ public class ServletRequestWrapper implements ServletRequest { /** * Creates a ServletRequest adaptor wrapping the given request object. * @throws java.lang.IllegalArgumentException if the request is null + * + * @param request the {@link ServletRequest} to be wrapped */ public ServletRequestWrapper(ServletRequest request) { if (request == null) { @@ -94,6 +96,8 @@ public ServletRequestWrapper(ServletRequest request) { /** * Return the wrapped request object. + + * @return the wrapped {@link ServletRequest} */ public ServletRequest getRequest() { return this.request; @@ -102,7 +106,13 @@ public ServletRequest getRequest() { /** * Sets the request object being wrapped. + + * @param request the {@link ServletRequest} to be installed + + + * @throws java.lang.IllegalArgumentException if the request is null. + * */ public void setRequest(ServletRequest request) { if (request == null) { diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java index 7e858626..85cd8a80 100644 --- a/src/main/java/javax/servlet/ServletResponse.java +++ b/src/main/java/javax/servlet/ServletResponse.java @@ -342,6 +342,9 @@ public interface ServletResponse { * @see #getBufferSize * @see #isCommitted * @see #reset + + * @throws IOException if the act of flushing the buffer cannot be + * completed. * */ public void flushBuffer() throws IOException; @@ -444,6 +447,8 @@ public interface ServletResponse { * setLocale after the response is committed * have no effect. If no locale has been specified, * the container's default locale is returned. + + * @return the Locale for this response. * * @see #setLocale */ diff --git a/src/main/java/javax/servlet/ServletResponseWrapper.java b/src/main/java/javax/servlet/ServletResponseWrapper.java index bba9f70f..a7245b17 100644 --- a/src/main/java/javax/servlet/ServletResponseWrapper.java +++ b/src/main/java/javax/servlet/ServletResponseWrapper.java @@ -81,6 +81,8 @@ public class ServletResponseWrapper implements ServletResponse { /** * Creates a ServletResponse adaptor wrapping the given response object. * @throws java.lang.IllegalArgumentException if the response is null. + * @param response the {@link ServletResponse} to be wrapped + */ @@ -93,6 +95,8 @@ public ServletResponseWrapper(ServletResponse response) { /** * Return the wrapped ServletResponse object. + * + * @return the wrapped {@link ServletResponse} */ public ServletResponse getResponse() { @@ -103,6 +107,8 @@ public ServletResponse getResponse() { /** * Sets the response being wrapped. * @throws java.lang.IllegalArgumentException if the response is null. + + * @param response the {@link ServletResponse} to be installed */ public void setResponse(ServletResponse response) { diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 28ba83e5..a5b81d26 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -578,6 +578,11 @@ public interface HttpServletRequest extends ServletRequest { * @deprecated As of Version 2.1 of the Java Servlet * API, use {@link #isRequestedSessionIdFromURL} * instead. + * + * @return true if the session ID + * came in as part of a URL; otherwise, + * false + */ public boolean isRequestedSessionIdFromUrl(); @@ -727,9 +732,12 @@ public void login(String username, String password) public Part getPart(String name) throws IOException, ServletException; /** - * Create an instance of HttpUpgradeHandler for a given + * Creates an instance of HttpUpgradeHandler for a given * class and uses it for the http protocol upgrade processing. * + * @param The {@code Class}, which extends {@link + * HttpUpgradeHandler}, of the {@code handlerClass}. + * @param handlerClass The HttpUpgradeHandler class used for the upgrade. * * @return an instance of the HttpUpgradeHandler diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index c67ff26c..f2fc269d 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -81,6 +81,8 @@ public class HttpServletRequestWrapper extends ServletRequestWrapper implements /** * Constructs a request object wrapping the given request. * @throws java.lang.IllegalArgumentException if the request is null + + * @param request the {@link HttpServletRequest} to be wrapped. */ public HttpServletRequestWrapper(HttpServletRequest request) { super(request); diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java index 21123474..0963a33b 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java @@ -80,6 +80,8 @@ public class HttpServletResponseWrapper extends ServletResponseWrapper implement /** * Constructs a response adaptor wrapping the given response. * @throws java.lang.IllegalArgumentException if the response is null + * + * @param response the {@link HttpServletResponse} to be wrapped. */ public HttpServletResponseWrapper(HttpServletResponse response) { super(response); diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java index b3249003..b59ee1dd 100644 --- a/src/main/java/javax/servlet/http/HttpSession.java +++ b/src/main/java/javax/servlet/http/HttpSession.java @@ -212,6 +212,7 @@ public interface HttpSession { * It will be removed in a future * version of the Java Servlet API. * + * @return the {@link HttpSessionContext} for this session. */ public HttpSessionContext getSessionContext(); diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index 4d0ead8a..a8f4a66b 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -71,9 +71,15 @@ public interface HttpSessionActivationListener extends EventListener { - /** Notification that the session is about to be passivated.*/ + /** Notification that the session is about to be passivated. + * @param se the {@link HttpSessionEvent} indicating the passivation + * of the session + */ public void sessionWillPassivate(HttpSessionEvent se); - /** Notification that the session has just been activated.*/ + /** Notification that the session has just been activated. + * @param se the {@link HttpSessionEvent} indicating the activation + * of the session + */ public void sessionDidActivate(HttpSessionEvent se); } diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java index 3ccd483d..134445e1 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -147,6 +147,9 @@ public String getName() { * attribute. If the attribute was removed (or unbound), this is the value * of the removed attribute. If the attribute was replaced, this is the old * value of the attribute. + + * @return the value of the attribute that has been added, removed + * or replaced * * @since Servlet 2.3 */ diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java index 3ed6fc45..6418b1a6 100644 --- a/src/main/java/javax/servlet/http/HttpSessionContext.java +++ b/src/main/java/javax/servlet/http/HttpSessionContext.java @@ -84,7 +84,10 @@ public interface HttpSessionContext { * no replacement. This method must * return null and will be removed in * a future version of this API. + + * @param sessionId the id of the session to be returned * + * @return null in all cases */ public HttpSession getSession(String sessionId); @@ -98,6 +101,8 @@ public interface HttpSessionContext { * no replacement. This method must return * an empty Enumeration and will be removed * in a future version of this API. + + * @return null * */ diff --git a/src/main/java/javax/servlet/http/HttpSessionEvent.java b/src/main/java/javax/servlet/http/HttpSessionEvent.java index 4c466226..6a9a800a 100644 --- a/src/main/java/javax/servlet/http/HttpSessionEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionEvent.java @@ -70,6 +70,8 @@ public class HttpSessionEvent extends java.util.EventObject { /** * Construct a session event from the given source. + * + * @param source the {@link HttpSession} corresponding to this event */ public HttpSessionEvent(HttpSession source) { super(source); @@ -77,6 +79,7 @@ public HttpSessionEvent(HttpSession source) { /** * Return the session that changed. + * @return the {@link HttpSession} for this event. */ public HttpSession getSession () { return (HttpSession) super.getSource(); From 9f8bd972f0f2328772afa2e182f1d7d115101063 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 6 Aug 2015 23:58:36 +0000 Subject: [PATCH 017/160] fix javadoc warnings svn path=/trunk/api/javaee-api/javax.servlet/; revision=64024 --- src/main/java/javax/servlet/Filter.java | 17 +++++++- src/main/java/javax/servlet/FilterChain.java | 41 ++++++++++--------- src/main/java/javax/servlet/FilterConfig.java | 4 +- .../java/javax/servlet/ServletContext.java | 18 ++++++++ 4 files changed, 57 insertions(+), 23 deletions(-) diff --git a/src/main/java/javax/servlet/Filter.java b/src/main/java/javax/servlet/Filter.java index 7b5f5506..293cf09b 100644 --- a/src/main/java/javax/servlet/Filter.java +++ b/src/main/java/javax/servlet/Filter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -106,6 +106,11 @@ public interface Filter { *

  • Throws a ServletException *
  • Does not return within a time period defined by the web container * + * + * @param filterConfig a FilterConfig object containing the + * filter's configuration and initialization parameters + * @throws ServletException if an exception has occurred that interferes with + * the filter's normal operation */ public void init(FilterConfig filterConfig) throws ServletException; @@ -137,6 +142,15 @@ public interface Filter { *
  • Directly set headers on the response after invocation of the * next entity in the filter chain. * + * + * @param request the ServletRequest object contains the client's request + * @param response the ServletResponse object contains the filter's response + * @param chain the FilterChain for invoking the next filter or the resource + * @throws IOException if an I/O related error has occurred during the processing + * @throws ServletException if an exception occurs that interferes with the + * filter's normal operation + * + * @see UnavailableException */ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) @@ -159,4 +173,3 @@ public void doFilter(ServletRequest request, ServletResponse response, */ public void destroy(); } - diff --git a/src/main/java/javax/servlet/FilterChain.java b/src/main/java/javax/servlet/FilterChain.java index 6f26435a..c81ff5b6 100644 --- a/src/main/java/javax/servlet/FilterChain.java +++ b/src/main/java/javax/servlet/FilterChain.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -61,26 +61,27 @@ import java.io.IOException; /** - * A FilterChain is an object provided by the servlet container to the developer - * giving a view into the invocation chain of a filtered request for a resource. Filters - * use the FilterChain to invoke the next filter in the chain, or if the calling filter - * is the last filter in the chain, to invoke the resource at the end of the chain. - * - * @see Filter - * @since Servlet 2.3 - **/ + * A FilterChain is an object provided by the servlet container to the developer + * giving a view into the invocation chain of a filtered request for a resource. Filters + * use the FilterChain to invoke the next filter in the chain, or if the calling filter + * is the last filter in the chain, to invoke the resource at the end of the chain. + * + * @see Filter + * @since Servlet 2.3 + */ public interface FilterChain { - - /** - * Causes the next filter in the chain to be invoked, or if the calling filter is the last filter - * in the chain, causes the resource at the end of the chain to be invoked. - * - * @param request the request to pass along the chain. - * @param response the response to pass along the chain. - */ - - public void doFilter ( ServletRequest request, ServletResponse response ) throws IOException, ServletException; -} + /** + * Causes the next filter in the chain to be invoked, or if the calling filter is the last filter + * in the chain, causes the resource at the end of the chain to be invoked. + * + * @param request the request to pass along the chain. + * @param response the response to pass along the chain. + * @throws IOException if an I/O related error has occurred during the processing + * @throws ServletException if an exception has occurred that interferes with the + * filterChain's normal operation + */ + public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException; +} diff --git a/src/main/java/javax/servlet/FilterConfig.java b/src/main/java/javax/servlet/FilterConfig.java index 3990b536..c4924758 100644 --- a/src/main/java/javax/servlet/FilterConfig.java +++ b/src/main/java/javax/servlet/FilterConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -72,6 +72,8 @@ public interface FilterConfig { /** * Returns the filter-name of this filter as defined in the deployment * descriptor. + * + * @return the filter name of this filter */ public String getFilterName(); diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 7f1b90eb..164943b5 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -452,6 +452,11 @@ public interface ServletContext { *

    In lieu of this method, servlets can share information using the * ServletContext class and can perform shared business logic * by invoking methods on common non-servlet classes. + * + * @param name the servlet name + * @return the {@code javax.servlet.Servlet Servlet} with the given name + * @throws ServletException if an exception has occurred that interfaces + * with servlet's normal operation */ public Servlet getServlet(String name) throws ServletException; @@ -466,6 +471,8 @@ public interface ServletContext { * remains only to preserve binary compatibility. This method * will be permanently removed in a future version of the Java * Servlet API. + * + * @return an Enumeration of {@code javax.servlet.Servlet Servlet} */ public Enumeration getServlets(); @@ -479,6 +486,8 @@ public interface ServletContext { * this method always returns an empty Enumeration and * remains only to preserve binary compatibility. This method will * be permanently removed in a future version of the Java Servlet API. + * + * @return an Enumeration of {@code javax.servlet.Servlet Servlet} names */ public Enumeration getServletNames(); @@ -503,6 +512,9 @@ public interface ServletContext { *

    This method was originally defined to write an * exception's stack trace and an explanatory error message * to the servlet log file. + * + * @param exception the Exception error + * @param msg a String that describes the exception */ public void log(Exception exception, String msg); @@ -902,6 +914,7 @@ public ServletRegistration.Dynamic addServlet(String servletName, * See the Java EE platform and JSR 299 specifications for additional * details about Managed Beans and resource injection. * + * @param the class of the Servlet to create * @param clazz the Servlet class to instantiate * * @return the new Servlet instance @@ -934,6 +947,7 @@ public T createServlet(Class clazz) * web.xml or web-fragment.xml, nor annotated * with {@link javax.servlet.annotation.WebListener} * + * @param servletName the name of a servlet * @since Servlet 3.0 */ public ServletRegistration getServletRegistration(String servletName); @@ -1113,6 +1127,7 @@ public FilterRegistration.Dynamic addFilter(String filterName, * See the Java EE platform and JSR 299 specifications for additional * details about Managed Beans and resource injection. * + * @param the class of the Filter to create * @param clazz the Filter class to instantiate * * @return the new Filter instance @@ -1136,6 +1151,7 @@ public T createFilter(Class clazz) * Gets the FilterRegistration corresponding to the filter with the * given filterName. * + * @param filterName the name of a filter * @return the (complete or preliminary) FilterRegistration for the * filter with the given filterName, or null if no * FilterRegistration exists under that name @@ -1362,6 +1378,7 @@ public T createFilter(Class clazz) * then the listener will be added to the end of the ordered list of * listeners of that interface. * + * @param the class of the EventListener to add * @param t the listener to be added * * @throws IllegalArgumentException if the given listener is not @@ -1462,6 +1479,7 @@ public T createFilter(Class clazz) * See the Java EE platform and JSR 299 specifications for additional * details about Managed Beans and resource injection. * + * @param the class of the EventListener to create * @param clazz the EventListener class to instantiate * * @return the new EventListener instance From e085a19dfd959b569633ed26bc93a7782e5b5e28 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 7 Aug 2015 12:38:38 +0000 Subject: [PATCH 018/160] M src/main/java/javax/servlet/http/HttpSessionBindingEvent.java - Fix last remaining javadoc warning svn path=/trunk/api/javaee-api/javax.servlet/; revision=64027 --- src/main/java/javax/servlet/http/HttpSessionBindingEvent.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java index 134445e1..617bf71f 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -114,6 +114,7 @@ public HttpSessionBindingEvent(HttpSession session, String name) { * * @param session the session to which the object is bound or unbound * @param name the name with which the object is bound or unbound + * @param value the object that is bound or unbound * * @see #getName * @see #getSession From 19246418814a0593069bcad2f125bd726b2649b2 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 11 Aug 2015 01:07:38 +0000 Subject: [PATCH 019/160] update findbugs plugin svn path=/trunk/api/javaee-api/javax.servlet/; revision=64031 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0a7b2267..6246ea69 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -64,7 +64,7 @@ Java Servlet 3.1 API Specification Oracle Corporation org.glassfish - 2.3.1 + 3.0.1 exclude.xml Low 1.33 @@ -227,7 +227,7 @@ -Oracle and/or its affiliates. All Rights Reserved. Use is subject to From a1a8da382072fbc5a1a18e03f529acb46c6cc5ef Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 11 Aug 2015 16:36:55 +0000 Subject: [PATCH 020/160] M src/main/java/javax/servlet/ServletRequest.java M src/main/java/javax/servlet/ServletRequestEvent.java M src/main/java/javax/servlet/ServletResponse.java M src/main/java/javax/servlet/ServletRequestWrapper.java M src/main/java/javax/servlet/http/HttpServletResponseWrapper.java M src/main/java/javax/servlet/http/HttpSessionActivationListener.java M src/main/java/javax/servlet/http/HttpSessionBindingEvent.java M src/main/java/javax/servlet/http/HttpSession.java M src/main/java/javax/servlet/http/HttpSessionEvent.java M src/main/java/javax/servlet/http/HttpSessionContext.java M src/main/java/javax/servlet/ServletResponseWrapper.java - Set copyright end date to 2015. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64032 --- src/main/java/javax/servlet/ServletRequest.java | 2 +- src/main/java/javax/servlet/ServletRequestEvent.java | 2 +- src/main/java/javax/servlet/ServletRequestWrapper.java | 2 +- src/main/java/javax/servlet/ServletResponse.java | 2 +- src/main/java/javax/servlet/ServletResponseWrapper.java | 2 +- .../java/javax/servlet/http/HttpServletResponseWrapper.java | 2 +- src/main/java/javax/servlet/http/HttpSession.java | 2 +- .../java/javax/servlet/http/HttpSessionActivationListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionBindingEvent.java | 2 +- src/main/java/javax/servlet/http/HttpSessionContext.java | 2 +- src/main/java/javax/servlet/http/HttpSessionEvent.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java index 93a8edc8..6aced53e 100644 --- a/src/main/java/javax/servlet/ServletRequest.java +++ b/src/main/java/javax/servlet/ServletRequest.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestEvent.java b/src/main/java/javax/servlet/ServletRequestEvent.java index 3c7a8610..62224482 100644 --- a/src/main/java/javax/servlet/ServletRequestEvent.java +++ b/src/main/java/javax/servlet/ServletRequestEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java index 7b457296..16cec8ca 100644 --- a/src/main/java/javax/servlet/ServletRequestWrapper.java +++ b/src/main/java/javax/servlet/ServletRequestWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java index 85cd8a80..49e09cdd 100644 --- a/src/main/java/javax/servlet/ServletResponse.java +++ b/src/main/java/javax/servlet/ServletResponse.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletResponseWrapper.java b/src/main/java/javax/servlet/ServletResponseWrapper.java index a7245b17..fe8b2868 100644 --- a/src/main/java/javax/servlet/ServletResponseWrapper.java +++ b/src/main/java/javax/servlet/ServletResponseWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java index 0963a33b..affac5da 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java index b59ee1dd..eb56e998 100644 --- a/src/main/java/javax/servlet/http/HttpSession.java +++ b/src/main/java/javax/servlet/http/HttpSession.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index a8f4a66b..6e72922a 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java index 617bf71f..5fbc0055 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java index 6418b1a6..d9fa5ac7 100644 --- a/src/main/java/javax/servlet/http/HttpSessionContext.java +++ b/src/main/java/javax/servlet/http/HttpSessionContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionEvent.java b/src/main/java/javax/servlet/http/HttpSessionEvent.java index 6a9a800a..96272149 100644 --- a/src/main/java/javax/servlet/http/HttpSessionEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From 3ca92aab218836dc10932a379ef24acff37492e3 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 11 Aug 2015 17:36:14 +0000 Subject: [PATCH 021/160] M src/main/java/javax/servlet/ServletRequestWrapper.java M src/main/java/javax/servlet/http/HttpSessionContext.java M src/main/java/javax/servlet/http/HttpSessionActivationListener.java M src/main/java/javax/servlet/http/HttpSessionBindingEvent.java M src/main/java/javax/servlet/ServletRequestEvent.java M src/main/java/javax/servlet/ServletResponse.java M src/main/java/javax/servlet/ServletResponseWrapper.java - Make is so there is no * text * more text javadoc in the files changed in the recent round of javadoc fixes svn path=/trunk/api/javaee-api/javax.servlet/; revision=64033 --- .../javax/servlet/ServletRequestEvent.java | 2 +- .../javax/servlet/ServletRequestWrapper.java | 8 +++----- .../java/javax/servlet/ServletResponse.java | 2 +- .../javax/servlet/ServletResponseWrapper.java | 4 ++-- .../http/HttpSessionActivationListener.java | 19 ++++++++++--------- .../servlet/http/HttpSessionBindingEvent.java | 2 +- .../servlet/http/HttpSessionContext.java | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/main/java/javax/servlet/ServletRequestEvent.java b/src/main/java/javax/servlet/ServletRequestEvent.java index 62224482..5717f9d8 100644 --- a/src/main/java/javax/servlet/ServletRequestEvent.java +++ b/src/main/java/javax/servlet/ServletRequestEvent.java @@ -92,7 +92,7 @@ public ServletRequest getServletRequest () { /** * Returns the ServletContext of this web application. - + * * @return the {@link ServletContext} for this web application. */ public ServletContext getServletContext () { diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java index 16cec8ca..124893d1 100644 --- a/src/main/java/javax/servlet/ServletRequestWrapper.java +++ b/src/main/java/javax/servlet/ServletRequestWrapper.java @@ -96,7 +96,7 @@ public ServletRequestWrapper(ServletRequest request) { /** * Return the wrapped request object. - + * * @return the wrapped {@link ServletRequest} */ public ServletRequest getRequest() { @@ -106,11 +106,9 @@ public ServletRequest getRequest() { /** * Sets the request object being wrapped. - + * * @param request the {@link ServletRequest} to be installed - - - + * * @throws java.lang.IllegalArgumentException if the request is null. * */ diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java index 49e09cdd..d438b5d2 100644 --- a/src/main/java/javax/servlet/ServletResponse.java +++ b/src/main/java/javax/servlet/ServletResponse.java @@ -447,7 +447,7 @@ public interface ServletResponse { * setLocale after the response is committed * have no effect. If no locale has been specified, * the container's default locale is returned. - + * * @return the Locale for this response. * * @see #setLocale diff --git a/src/main/java/javax/servlet/ServletResponseWrapper.java b/src/main/java/javax/servlet/ServletResponseWrapper.java index fe8b2868..c4111041 100644 --- a/src/main/java/javax/servlet/ServletResponseWrapper.java +++ b/src/main/java/javax/servlet/ServletResponseWrapper.java @@ -82,7 +82,7 @@ public class ServletResponseWrapper implements ServletResponse { * Creates a ServletResponse adaptor wrapping the given response object. * @throws java.lang.IllegalArgumentException if the response is null. * @param response the {@link ServletResponse} to be wrapped - + * */ @@ -107,7 +107,7 @@ public ServletResponse getResponse() { /** * Sets the response being wrapped. * @throws java.lang.IllegalArgumentException if the response is null. - + * * @param response the {@link ServletResponse} to be installed */ diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index 6e72922a..1e6e9135 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -60,15 +60,16 @@ import java.util.EventListener; - /** Objects that are bound to a session may listen to container - ** events notifying them that sessions will be passivated and that - ** session will be activated. A container that migrates session between VMs - ** or persists sessions is required to notify all attributes bound to sessions - ** implementing HttpSessionActivationListener. - ** - * @since Servlet 2.3 - */ - +/** Objects that are bound to a session may listen to container + * events notifying them that sessions will be passivated and that + * session will be activated. A container that migrates session + * between VMs or persists sessions is required to notify all + * attributes bound to sessions implementing + * HttpSessionActivationListener. + * + * @since Servlet 2.3 + */ + public interface HttpSessionActivationListener extends EventListener { /** Notification that the session is about to be passivated. diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java index 5fbc0055..5ce9752e 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -148,7 +148,7 @@ public String getName() { * attribute. If the attribute was removed (or unbound), this is the value * of the removed attribute. If the attribute was replaced, this is the old * value of the attribute. - + * * @return the value of the attribute that has been added, removed * or replaced * diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java index d9fa5ac7..ac47f36d 100644 --- a/src/main/java/javax/servlet/http/HttpSessionContext.java +++ b/src/main/java/javax/servlet/http/HttpSessionContext.java @@ -101,7 +101,7 @@ public interface HttpSessionContext { * no replacement. This method must return * an empty Enumeration and will be removed * in a future version of this API. - + * * @return null * */ From 62b2236caa6623e15edfdda097bcc7b5902b6672 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 12 Aug 2015 21:08:58 +0000 Subject: [PATCH 022/160] https://java.net/jira/browse/SERVLET_SPEC-83 M src/main/java/javax/servlet/ServletContext.java - Normative fix for getAttribute() and getInitParameter() If the parameter exists, but is value is null the literal String "null" without the quotes must be returned. A src/main/javadoc/doc-files/expert-draft-bg-non-blank.png A src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle A src/main/javadoc/doc-files/changed_modified_4_0.png A src/main/javadoc/doc-files/expert-draft-bg.png A src/main/javadoc/doc-files/changed_added_4_0.png A src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur A src/main/javadoc/doc-files/changed_added_4_0_cursor.cur A src/main/javadoc/doc-files/expert-draft-bg-blank.png A src/main/javadoc/doc-files/changed_deleted_4_0.png A src/main/javadoc/doc-files/expert-draft-bg-blank.graffle A src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur A src/main/javadoc/javax.servlet-api.css M pom.xml svn path=/trunk/api/javaee-api/javax.servlet/; revision=64034 --- pom.xml | 22 +- .../java/javax/servlet/ServletContext.java | 44 +- .../javadoc/doc-files/changed_added_4_0.png | Bin 0 -> 748 bytes .../doc-files/changed_added_4_0_cursor.cur | Bin 0 -> 2238 bytes .../javadoc/doc-files/changed_deleted_4_0.png | Bin 0 -> 748 bytes .../doc-files/changed_deleted_4_0_cursor.cur | Bin 0 -> 2238 bytes .../doc-files/changed_modified_4_0.png | Bin 0 -> 748 bytes .../doc-files/changed_modified_4_0_cursor.cur | Bin 0 -> 2238 bytes .../doc-files/expert-draft-bg-blank.graffle | 256 +++++++ .../doc-files/expert-draft-bg-blank.png | Bin 0 -> 164 bytes .../expert-draft-bg-non-blank.graffle | 542 +++++++++++++++ .../doc-files/expert-draft-bg-non-blank.png | Bin 0 -> 9811 bytes .../javadoc/doc-files/expert-draft-bg.png | Bin 0 -> 9811 bytes src/main/javadoc/javax.servlet-api.css | 640 ++++++++++++++++++ 14 files changed, 1479 insertions(+), 25 deletions(-) create mode 100644 src/main/javadoc/doc-files/changed_added_4_0.png create mode 100755 src/main/javadoc/doc-files/changed_added_4_0_cursor.cur create mode 100644 src/main/javadoc/doc-files/changed_deleted_4_0.png create mode 100755 src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur create mode 100644 src/main/javadoc/doc-files/changed_modified_4_0.png create mode 100755 src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur create mode 100644 src/main/javadoc/doc-files/expert-draft-bg-blank.graffle create mode 100644 src/main/javadoc/doc-files/expert-draft-bg-blank.png create mode 100644 src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle create mode 100644 src/main/javadoc/doc-files/expert-draft-bg-non-blank.png create mode 100644 src/main/javadoc/doc-files/expert-draft-bg.png create mode 100644 src/main/javadoc/javax.servlet-api.css diff --git a/pom.xml b/pom.xml index 6246ea69..a9dd4c54 100644 --- a/pom.xml +++ b/pom.xml @@ -53,15 +53,15 @@ javax.servlet javax.servlet-api jar - 3.1.1-b01-SNAPSHOT + 4.0.0-m01-SNAPSHOT - 3.1 + 4.0 javax.servlet javax.servlet-api - 3.1.0 - Java Servlet 3.1 - Java Servlet 3.1 API Specification + 4.0.0 + Java Servlet 4.0 + Java Servlet 4.0 API Specification Oracle Corporation org.glassfish 3.0.1 @@ -97,12 +97,12 @@ GlassFish Community - https://glassfish.dev.java.net + https://glassfish.java.net CDDL + GPLv2 with classpath exception - https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html + https://glassfish.java.net/nonav/public/CDDL+GPL.html repo A business-friendly OSS license @@ -129,8 +129,8 @@ maven-compiler-plugin 3.1 - 1.7 - 1.7 + 1.8 + 1.8 -Xlint:unchecked @@ -215,11 +215,13 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8 + 2.10.3 src ${doc.title} ${window.title} + javax.servlet-api.css + true Servlet API Documentation diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 164943b5..bddd1332 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -69,9 +69,10 @@ import javax.servlet.descriptor.JspConfigDescriptor; /** - * Defines a set of methods that a servlet uses to communicate with its - * servlet container, for example, to get the MIME type of a file, dispatch - * requests, or write to a log file. + * Defines a set of methods + * that a servlet uses to communicate with its servlet container, for + * example, to get the MIME type of a file, dispatch requests, or write + * to a log file. * *

    There is one context per "web application" per Java Virtual Machine. (A * "web application" is a collection of servlets and content installed under a @@ -590,9 +591,12 @@ public interface ServletContext { /** - * Returns a String containing the value of the named - * context-wide initialization parameter, or null if the - * parameter does not exist. + * Returns a + * String containing the value of the named + * context-wide initialization parameter, or null if + * the parameter does not exist. If + * the parameter exists, but is value is {@code null} the literal + * String "null" without the quotes must be returned. * *

    This method can make available configuration information useful * to an entire web application. For example, it can provide a @@ -602,9 +606,12 @@ public interface ServletContext { * @param name a String containing the name of the * parameter whose value is requested * - * @return a String containing the value - * of the context's initialization parameter, or null if - * the context's initialization parameter does not exist + * @return a String containing the value of the + * context's initialization parameter, or null if the + * context's initialization parameter does not exist. If the parameter exists, but is value + * is {@code null} the literal String "null" without the quotes must + * be returned. * * @see ServletConfig#getInitParameter */ @@ -653,8 +660,12 @@ public interface ServletContext { /** - * Returns the servlet container attribute with the given name, - * or null if there is no attribute by that name. + * Returns the servlet + * container attribute with the given name, or null if + * there is no attribute by that name. If the parameter exists, but is value + * is {@code null} the literal String "null" without the quotes must + * be returned. * *

    An attribute allows a servlet container to give the * servlet additional information not @@ -674,10 +685,13 @@ public interface ServletContext { * @param name a String specifying the name * of the attribute * - * @return an Object containing the value - * of the attribute, or null - * if no attribute exists matching the given - * name + * @return an Object containing the value of the + * attribute, or null if no attribute + * exists matching the given name If the parameter + * exists, but is value is {@code null} the literal + * String "null" without the quotes must be + * returned. * * @see ServletContext#getAttributeNames */ diff --git a/src/main/javadoc/doc-files/changed_added_4_0.png b/src/main/javadoc/doc-files/changed_added_4_0.png new file mode 100644 index 0000000000000000000000000000000000000000..c1f4b583d7260ab573457dc5de8d782df72a5663 GIT binary patch literal 748 zcmeAS@N?(olHy`uVBq!ia0vp^Aa)f88<1=hI8+0qI14-?iy0WWg+Z8+Vb&Z8pdd@S zqpu?a!^Xav-+_~Xe1&9>AYY(HRR)HJW(J0z|AF*N28L1t28LG&3=CE?7#PI!C&eFi zV_;xP@^onOFoaaxso78x0TwDTIeXC7k(NBmWyEV9I3hboFyt=akR{0ARzcPyhe` literal 0 HcmV?d00001 diff --git a/src/main/javadoc/doc-files/changed_added_4_0_cursor.cur b/src/main/javadoc/doc-files/changed_added_4_0_cursor.cur new file mode 100755 index 0000000000000000000000000000000000000000..873e552c6f2edc98517b0becfb75b4f4b6fcc4d3 GIT binary patch literal 2238 zcmeIzA#5697{>93ZAqt!TS851u9@XL?IfJSP&}5T6X!6ks)Xc3WizoX%ORFC4Go4= zaLq((PBkb<>Xu$=m+KSZ25H%L5nQ-+gfJcNe5rDrsj&`S|))ddJawvO_+Q zlK7Bu{3d^Ud?`I2A1j;G^Oxs?$z-C*Y@+o07i!0{d`f1RJdX#)2kB4K=TD!Mq^4+Y z>L;e|)KnjtoDi2Km`S}0sdFlMzT`HQEbuXYh#%m6d>h*$4SWq>#XI;4o^_)L-^X|H zb-aVslHi3GUU)UNz{mI@et`G!ZG4LhXy9x3D&E0Y@F{+dPw-Rx2p{4@e1PxaJ9rQ8 z;tg+j!yDf4hF>yg%nRlz(`PnwpW^5E1V6=(@Y(7iIzac(9khpbS$~0#@k9Io@8jF} z7QTV6;j4HDU%|6(6yf{$F20U;3cABKF7Ppah#%m6eA|(==w^d%*63!HZaQ?cf=}^t ze1f0iNB9sQ;sbmS-@$u$H@jExhBv(74R8D&wrj?AU9erJY?se=HJeh3pW_q!6hFd; z_=4L<3w(?p;s!xLiyD;J0w3dt_yL|yTbm1exj~7g_&Gko zPw^u>%_(S5!m|^RKIxJ=aY#{v9v&WacXy}T+gn{h*d$JUmpV)6v1ffjrOC-rk;E*VXRsuC}(ew7I#-GxC4@(;c{4bM;qiz||T+edP*S z{U#qT|B&DHm&AYY(HRR)HJW(J0z|AF*N28L1t28LG&3=CE?7#PI!C&eFi zV_;xP@^o9Z+Y+XzTT%=)$7XxJFxghsl=`zxm^fDh3fU$nkOZ+T%T+9ANJ&kD z=p_?iPLZlM!7W^{OZx7AM;L}H%k1`jdCH~l@4n;S@0ycdsibOE`S|))ddJZRQY9Zr zNqosTdXxWo_$WOcA1RyE^N**4>2#{;e5&;O7ivecd`f1RJP!xP7wJ#a=d&{d-xXK&7Kv!;SFzi!yEq(+cjsqF4(RUw##R`+HEPtFYpO|h9BcY ze8Jx)-=M@&`~sig zXZSIm<`gt2;kOf!0qKzjaY#{v?(gq)dwZ*!n;TtSUFq`jQs?LA3d2yRr>6>nK*z_& z>i7FPI5?2!dD`FKSF6?1?(VK!*VWF>j<&Y8w7I#-Z{+{@r#n!6;qD(_EJdvP0-(P3 z5?TFyKAykA@A~s)J)T}reykUjsb?22EI-tX%gRn)Q_kw^%6g%!^=GeL`cI0yyZ>q& w+K+h8?k3x$yedyNR(BI^e442IZK7?mcRkVJ9WO4k5_wHFNSSPtJ#t8X0oz0bo&W#< literal 0 HcmV?d00001 diff --git a/src/main/javadoc/doc-files/changed_modified_4_0.png b/src/main/javadoc/doc-files/changed_modified_4_0.png new file mode 100644 index 0000000000000000000000000000000000000000..93d9a62a26142fba7657693eb6e635e7688caab5 GIT binary patch literal 748 zcmeAS@N?(olHy`uVBq!ia0vp^Aa)f88<1=hI8+0qI14-?iy0WWg+Z8+Vb&Z8pdd@S zqpu?a!^Xav-+_~Xe1&9>AYY(HRR)HJW(J0z|AF*N28L1t28LG&3=CE?7#PI!C&eFi zV_;xP@^o9(wvbM7O2I72a-plYn{?EhT#UP`kPf%GBvVF(8#0CrrId3hw*-TW zWbmLvy4)mA3fW4ItOeix??Rd-7opIp{XQN&e1Cp=?{}xtE0wgnt9*QUE4}0BJ=rB6 zNJ+fNIC+ylJv@}2j!%?L>iNUd!DKSgWIj>)?K8C#Sw1B*OrD1WC?r9lGGF} zO#Q^voto++lM~{y1aql(C3Vgu&zIb$k|jRI5Ag%Mk8fjJq=B#Dt9S=r!Lx1@;rsY5 zzK(aWS`obP!V9mamiQPy#1HU3zKw5j0u6i(U&TB43O>az@Ckm3AK^oMh!5~Rd z-@-TWHGCEC;4666jUs#>-^JJQPC<9r#w9++5Ag%Mk8eA&7Ts*n%^KaT(oKhMR`4l) zflu&L{0JZ7Lwtbm;X8N_?`GEu-tdMuyy1=S!*9W_sIY8Pj_Hz&Dn3Q0b6ST^%qyj z>Xm#v|3!Y+pD*k2?FHq>dQq8r_Th!)hk9{Y+1pk$+mHCb s?#4T$yef}3R(E4pI%b*vq7@O`Y~JN~%LO5`=!AZ4;c4#+Y21##s8Y5)KL literal 0 HcmV?d00001 diff --git a/src/main/javadoc/doc-files/expert-draft-bg-blank.graffle b/src/main/javadoc/doc-files/expert-draft-bg-blank.graffle new file mode 100644 index 00000000..e998b135 --- /dev/null +++ b/src/main/javadoc/doc-files/expert-draft-bg-blank.graffle @@ -0,0 +1,256 @@ + + + + + ActiveLayerIndex + 0 + ApplicationVersion + + com.omnigroup.OmniGrafflePro + 139.16.0.171715 + + AutoAdjust + + BackgroundGraphic + + Bounds + {{0, 0}, {576, 753.9000244140625}} + Class + SolidGraphic + ID + 2 + Style + + shadow + + Draws + NO + + stroke + + Draws + NO + + + + BaseZoom + 0 + CanvasOrigin + {0, 0} + ColumnAlign + 1 + ColumnSpacing + 36 + CreationDate + 2006-07-19 19:53:09 +0000 + Creator + Edward Burns + DisplayScale + 1 0/72 in = 1.0000 in + GraphDocumentVersion + 8 + GraphicsList + + + Bounds + {{31, 54.125}, {13, 14}} + Class + ShapedGraphic + FitText + YES + Flow + Resize + ID + 3 + Rotation + 66 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510 +{\fonttbl\f0\fnil\fcharset0 AmericanTypewriter;} +{\colortbl;\red255\green255\blue255;\red255\green242\blue230;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc + +\f0\fs24 \cf2 } + VerticalPad + 0 + + Wrap + NO + + + GridInfo + + GuidesLocked + NO + GuidesVisible + YES + HPages + 1 + ImageCounter + 1 + KeepToScale + + Layers + + + Lock + NO + Name + Layer 1 + Print + YES + View + YES + + + LayoutInfo + + Animate + NO + circoMinDist + 18 + circoSeparation + 0.0 + layoutEngine + dot + neatoSeparation + 0.0 + twopiSeparation + 0.0 + + LinksVisible + NO + MagnetsVisible + NO + MasterSheets + + ModificationDate + 2012-12-05 21:20:18 +0000 + Modifier + Edward Burns + NotesVisible + NO + Orientation + 2 + OriginVisible + NO + PageBreaks + YES + PrintInfo + + NSBottomMargin + + float + 4.97998 + + NSHorizonalPagination + + coded + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG + + NSLeftMargin + + float + 18 + + NSPaperSize + + size + {612, 792} + + NSPrintAllPages + + int + 0 + + NSPrintReverseOrientation + + int + 0 + + NSRightMargin + + float + 18 + + NSTopMargin + + float + 33.12 + + + PrintOnePage + + ReadOnly + NO + RowAlign + 1 + RowSpacing + 36 + SheetTitle + Canvas 1 + SmartAlignmentGuidesActive + YES + SmartDistanceGuidesActive + YES + UniqueID + 1 + UseEntirePage + + VPages + 1 + WindowInfo + + CurrentSheet + 0 + ExpandedCanvases + + Frame + {{78, 0}, {591, 828}} + ListView + + OutlineWidth + 142 + RightSidebar + + Sidebar + + SidebarWidth + 138 + VisibleRegion + {{0.5, 1}, {219.5, 359.5}} + Zoom + 2 + ZoomValues + + + Canvas 1 + 2 + 1.5 + + + + + diff --git a/src/main/javadoc/doc-files/expert-draft-bg-blank.png b/src/main/javadoc/doc-files/expert-draft-bg-blank.png new file mode 100644 index 0000000000000000000000000000000000000000..346a7d8f42574ae3fcf05015d504ff405915029b GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^sz9v5!3HGx4t-t*q&N#aB8wRqxP?KOkzv*x37}w@ zr;B4q1n1jJ8wD8zL|7fa+&6Y(mFDuRIXM68vwitB->#*9-&1VmRj;~oNr=O4v#C?K zGOjP16vX)UR!ET6g4o$!UaVWPgFRO^l;vt^ie6aftGblwmTX-Ii^~q9&r^XmFnGH9 KxvX + + + + ActiveLayerIndex + 0 + ApplicationVersion + + com.omnigroup.OmniGrafflePro + 138.17.0.133677 + + AutoAdjust + + BackgroundGraphic + + Bounds + {{0, 0}, {576, 753.9}} + Class + SolidGraphic + ID + 2 + Style + + shadow + + Draws + NO + + stroke + + Draws + NO + + + + CanvasOrigin + {0, 0} + ColumnAlign + 1 + ColumnSpacing + 36 + CreationDate + 2006-07-19 15:53:09 -0400 + Creator + Edward Burns + DisplayScale + 1 0/72 in = 1.0000 in + GraphDocumentVersion + 6 + GraphicsList + + + Bounds + {{-28, 54.125}, {131, 14}} + Class + ShapedGraphic + FitText + YES + Flow + Resize + ID + 1 + Rotation + 66 + Shape + Rectangle + Style + + fill + + Draws + NO + + shadow + + Draws + NO + + stroke + + Draws + NO + + + Text + + Text + {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350 +{\fonttbl\f0\fnil\fcharset0 AmericanTypewriter;} +{\colortbl;\red255\green255\blue255;\red170\green162\blue153;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural + +\f0\fs24 \cf2 Expert Draft Version} + VerticalPad + 0 + + Wrap + NO + + + GridInfo + + GuidesLocked + NO + GuidesVisible + YES + HPages + 1 + ImageCounter + 1 + KeepToScale + + Layers + + + Lock + NO + Name + Layer 1 + Print + YES + View + YES + + + LayoutInfo + + Animate + NO + circoMinDist + 18 + circoSeparation + 0.0 + layoutEngine + dot + neatoSeparation + 0.0 + twopiSeparation + 0.0 + + LinksVisible + NO + MagnetsVisible + NO + MasterSheets + + ModificationDate + 2011-06-16 12:56:40 -0400 + Modifier + Edward Burns + NotesVisible + NO + Orientation + 2 + OriginVisible + NO + PageBreaks + YES + PrintInfo + + NSBottomMargin + + float + 4.97998 + + NSLeftMargin + + float + 18 + + NSPaperSize + + size + {612, 792} + + NSPrintAllPages + + int + 0 + + NSRightMargin + + float + 18 + + NSTopMargin + + float + 33.12 + + + PrintOnePage + + QuickLookPreview + + JVBERi0xLjMKJcTl8uXrp/Og0MTGCjUgMCBvYmoKPDwgL0xlbmd0aCA2IDAgUiAvRmls + dGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAG1kL1uwzAMhPc8xY3NYIWUKNFcm589 + gNDOhWEDLZC0sTv08UOnCAq0GRvcIIIi79PphD1OIFfWAs0JY49nHLFaT4xuAl80dWgo + ZFAQIooi1/Fg88LgF6W0om1aeJXEosa5R2zCBl93iO8WTaXMVsYpS86/yutAUmcVi0E1 + L7oDHivY/VyNn02hMNsI6gGrHQfyN9YBD9uvj35cor5hW79z/RsySjD7S/zEZnwZ7oJs + /UfNjG9Bn+5C9IyJ9VbMfpxe348/0P0ZFDx3mAplbmRzdHJlYW0KZW5kb2JqCjYgMCBv + YmoKMjA1CmVuZG9iagozIDAgb2JqCjw8IC9UeXBlIC9QYWdlIC9QYXJlbnQgNCAwIFIg + L1Jlc291cmNlcyA3IDAgUiAvQ29udGVudHMgNSAwIFIgL01lZGlhQm94IFswIDAgNTc2 + IDc1My45XQo+PgplbmRvYmoKNyAwIG9iago8PCAvUHJvY1NldCBbIC9QREYgL1RleHQg + XSAvQ29sb3JTcGFjZSA8PCAvQ3MxIDggMCBSID4+IC9Gb250IDw8IC9GMS4wIDkgMCBS + Cj4+ID4+CmVuZG9iagoxMCAwIG9iago8PCAvTGVuZ3RoIDExIDAgUiAvTiAzIC9BbHRl + cm5hdGUgL0RldmljZVJHQiAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAGF + VM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi + 0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWA + BOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoH + hP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhT + zSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHC + CxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJK + gnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQ + EEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8 + Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwa + P+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdW + m5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinS + bZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIv + bODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOW + ls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw + /bBS+fmsUtl+ThrWgZf6b8C8/UUKZW5kc3RyZWFtCmVuZG9iagoxMSAwIG9iago3MzcK + ZW5kb2JqCjggMCBvYmoKWyAvSUNDQmFzZWQgMTAgMCBSIF0KZW5kb2JqCjQgMCBvYmoK + PDwgL1R5cGUgL1BhZ2VzIC9NZWRpYUJveCBbMCAwIDYxMiA3OTJdIC9Db3VudCAxIC9L + aWRzIFsgMyAwIFIgXSA+PgplbmRvYmoKMTIgMCBvYmoKPDwgL1R5cGUgL0NhdGFsb2cg + L091dGxpbmVzIDIgMCBSIC9QYWdlcyA0IDAgUiA+PgplbmRvYmoKMiAwIG9iago8PCAv + TGFzdCAxMyAwIFIgL0ZpcnN0IDE0IDAgUiA+PgplbmRvYmoKMTQgMCBvYmoKPDwgL1Bh + cmVudCAxNSAwIFIgL0NvdW50IDAgL0Rlc3QgWyAzIDAgUiAvWFlaIDAgNzUzLjkgMCBd + IC9UaXRsZSAoQ2FudmFzIDEpCj4+CmVuZG9iagoxNSAwIG9iago8PCA+PgplbmRvYmoK + MTMgMCBvYmoKPDwgL1BhcmVudCAxNSAwIFIgL0NvdW50IDAgL0Rlc3QgWyAzIDAgUiAv + WFlaIDAgNzUzLjkgMCBdIC9UaXRsZSAoQ2FudmFzIDEpCj4+CmVuZG9iagoxNiAwIG9i + ago8PCAvTGVuZ3RoIDE3IDAgUiAvTGVuZ3RoMSA1ODUyIC9GaWx0ZXIgL0ZsYXRlRGVj + b2RlID4+CnN0cmVhbQp4AZ1Ye2wcx3mfmZ2d3Xvv3u29eORxb/eevCfveDy+b/kSSckU + KYm2RPlJSdTLoqTKsmwrtuUocupEtlGjsR2gLZK2/sPNP3ZqJYiBIjXaAHH9R9GHgwRo + kT/aoA3gBk5hxy1si+w3e0f6TAcF2rmbmZvHzs38vu/7fd/s5UsPryMPegoJaPno2sWT + yE7BbyKEZ45vrF1stcllqN85fuWy3mrjX0A9cvLiqY1Wm/B+7dS5x9rPCycQUn90en0N + ajt9CuXgaehoNfEA1MnTG5cfbbUJb1vnLhxvjwsWtI2NtUfb/4/+Gdr6+bWNdaghBc9B + Ubh44SG+L0jBLBQzFy+tt+fjI9C+iTCUCvo5YlhHEiJIRhZyQt/v4j9DFEb5OOTUn157 + 737f2G+wKfwSetDrf/23T/H6rcvv/Hoztvn7UpMuQFOAFVoJnhGe2WIISQc3Y1uH6Vl7 + pfagXSm3wuFQKHgrqGmBwC2/X1WVW4rP5/Xe8njcbtctl9PpcNySZUEgtwiG9V5Hz/0A + bz09e3rm//19Q6R7UP4NiUH5XUphne8yBiXa+g2+TV4l30PLaBpNoQaaR3X0Jl7BJn4N + v4Pewz50Ab+Ez+K/x2X8Cr7j6Bn+gfOKIBSMCldm9deF1Ky5djpinn5gpog/RE30MULk + ZyhA/hjyz7Y+AQnGiYIy+ChS8SBSyBOQDZQmR5ADv4d8+D9QHv8ekqBfAIRa2CPkRgz9 + BbR1tPoFDDvx/L/8JvY//O9P0N86DOe1EwNt4Um2S144QG9cULvBVrztXl+7nkAT6O/w + u+QY+VC4R/iUPi/eI77KltlH0jPSf8v/ArMI4IXw98lHsDMJ3WXpWJYtB5GoiBETRYGI + FP6SMUwwgIPRnivlRgQ1x8pjym3+xeWx29C4PYb6K3jh9JuwpLxweu116+CRIbXxJpK3 + 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 + gAJYvlbFIwSbZnf68LIRDehKMOjJqJmkfyOdO++d3fN1K1fayI/UUqu/DgZ93lDgVDr9 + oM9MBT86A/QE5xPAp12E9yRfQt+2lvDjj1tPzF29cOL+1cWpquE/dncz1YvD1FWgjUO0 + MXeGPqxINNPTTemY5BnuiwpwvXjk1J3CLFt46NyDB5b3sgVUD3o9tITxw20EwLPxAKoz + czWx74/2BaSDvHa05WH0eCcwj3NgmpibjA/bRgMY2ES1fRGBK0aoF4OWwBR7Qs3oGLef + 22nn2wt9FlXUB8pw2QgCnDYjtiZsvxwI1apfvnnTq8lUpc5ETsD9UVW1lFxalnyMEunu + +x0QMIRZso80QtHokLtgyHE50nf5D70ai0K3nFH0WCzpKqc8ESI6BeHC70hOIMx83puN + h/1RQ+lLsggLnPjWKwqmWDcoYYZOoJTPn3fyRkLkhVy58QOVcvsVoKQYXsrR69dlKlJT + p/DbSPA3Vu13f1tHkcZF/IXE70gCykDcP4xmIF5eAC49gA6iQ+hOdBc6jO62n8DID9rB + E0MQIi7tOTK5OJef3Fi/dOb42vmVxy6uP3LpzOX1S1yHttM8/FiBzN+l8vedNyB/A/Ir + kG9B/hHkdyH/AvKH8CCFrEFOQh7YaicYQzu/MdJ3tWd2tWd3te/a1V7b1bbfy3asf3LX + uG0WHePnd41f2NW23+N2zAdAPrf/h3a1L+9q2++V/weyTXcLCmVuZHN0cmVhbQplbmRv + YmoKMTcgMCBvYmoKMzg0NwplbmRvYmoKMTggMCBvYmoKPDwgL1R5cGUgL0ZvbnREZXNj + cmlwdG9yIC9Bc2NlbnQgOTA0IC9DYXBIZWlnaHQgNzU4IC9EZXNjZW50IC0yNTAgL0Zs + YWdzIDMyCi9Gb250QkJveCBbLTQ4NSAtMzY1IDE4NTUgMTA5N10gL0ZvbnROYW1lIC9P + RlhBTUcrQW1lcmljYW5UeXBld3JpdGVyIC9JdGFsaWNBbmdsZQowIC9TdGVtViAwIC9N + YXhXaWR0aCAxODc0IC9YSGVpZ2h0IDUxOSAvRm9udEZpbGUyIDE2IDAgUiA+PgplbmRv + YmoKMTkgMCBvYmoKWyAyNTAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAw + IDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMAowIDcyOCA2NzMgMCAwIDAg + MCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCA3MjggMCAwIDAgMCAwIDAgMCAwIDAgMCA1 + NjQgMCAwCjAgNTI4IDM0NiAwIDAgMzEwIDAgMCAwIDAgNjM3IDU0NiA2MDAgMCA0OTEg + NDkyIDQwMCAwIDAgMCA2MzcgXQplbmRvYmoKOSAwIG9iago8PCAvVHlwZSAvRm9udCAv + U3VidHlwZSAvVHJ1ZVR5cGUgL0Jhc2VGb250IC9PRlhBTUcrQW1lcmljYW5UeXBld3Jp + dGVyIC9Gb250RGVzY3JpcHRvcgoxOCAwIFIgL1dpZHRocyAxOSAwIFIgL0ZpcnN0Q2hh + ciAzMiAvTGFzdENoYXIgMTIwIC9FbmNvZGluZyAvTWFjUm9tYW5FbmNvZGluZwo+Pgpl + bmRvYmoKMjAgMCBvYmoKKE1hYyBPUyBYIDEwLjYuNyBRdWFydHogUERGQ29udGV4dCkK + ZW5kb2JqCjIxIDAgb2JqCihEOjIwMTEwNjE2MTY1NjQ2WjAwJzAwJykKZW5kb2JqCjEg + MCBvYmoKPDwgL1Byb2R1Y2VyIDIwIDAgUiAvQ3JlYXRpb25EYXRlIDIxIDAgUiAvTW9k + RGF0ZSAyMSAwIFIgPj4KZW5kb2JqCnhyZWYKMCAyMgowMDAwMDAwMDAwIDY1NTM1IGYg + CjAwMDAwMDY1MjYgMDAwMDAgbiAKMDAwMDAwMTU2OSAwMDAwMCBuIAowMDAwMDAwMzIw + IDAwMDAwIG4gCjAwMDAwMDE0MjAgMDAwMDAgbiAKMDAwMDAwMDAyMiAwMDAwMCBuIAow + MDAwMDAwMzAxIDAwMDAwIG4gCjAwMDAwMDA0MjYgMDAwMDAgbiAKMDAwMDAwMTM4NCAw + MDAwMCBuIAowMDAwMDA2MjQ5IDAwMDAwIG4gCjAwMDAwMDA1MjQgMDAwMDAgbiAKMDAw + MDAwMTM2NCAwMDAwMCBuIAowMDAwMDAxNTAzIDAwMDAwIG4gCjAwMDAwMDE3MzQgMDAw + MDAgbiAKMDAwMDAwMTYxNyAwMDAwMCBuIAowMDAwMDAxNzEyIDAwMDAwIG4gCjAwMDAw + MDE4MjkgMDAwMDAgbiAKMDAwMDAwNTc2NiAwMDAwMCBuIAowMDAwMDA1Nzg3IDAwMDAw + IG4gCjAwMDAwMDYwMjEgMDAwMDAgbiAKMDAwMDAwNjQzMiAwMDAwMCBuIAowMDAwMDA2 + NDg0IDAwMDAwIG4gCnRyYWlsZXIKPDwgL1NpemUgMjIgL1Jvb3QgMTIgMCBSIC9JbmZv + IDEgMCBSIC9JRCBbIDwzOWM3MzMwYmU0Mzk3ODRkMTY0NGQzNzdlMGMxMDhiZj4KPDM5 + YzczMzBiZTQzOTc4NGQxNjQ0ZDM3N2UwYzEwOGJmPiBdID4+CnN0YXJ0eHJlZgo2NjAx + CiUlRU9GCjEgMCBvYmoKPDwvQXV0aG9yIChFZHdhcmQgQnVybnMpL0NyZWF0aW9uRGF0 + ZSAoRDoyMDA2MDcxOTE5NTMwMFopL0NyZWF0b3IgKE9tbmlHcmFmZmxlIFByb2Zlc3Np + b25hbCA1LjIuMykvTW9kRGF0ZSAoRDoyMDExMDYxNjE2NTYwMFopL1Byb2R1Y2VyIDIw + IDAgUiAvVGl0bGUgKGV4cGVydC1kcmFmdC1iZy5ncmFmZmxlKT4+CmVuZG9iagp4cmVm + CjEgMQowMDAwMDA3MTk4IDAwMDAwIG4gCnRyYWlsZXIKPDwvSUQgWzwzOWM3MzMwYmU0 + Mzk3ODRkMTY0NGQzNzdlMGMxMDhiZj4gPDM5YzczMzBiZTQzOTc4NGQxNjQ0ZDM3N2Uw + YzEwOGJmPl0gL0luZm8gMSAwIFIgL1ByZXYgNjYwMSAvUm9vdCAxMiAwIFIgL1NpemUg + MjI+PgpzdGFydHhyZWYKNzM5MQolJUVPRgo= + + QuickLookThumbnail + + TU0AKgAAAUyAPeBPcAQWDQeEQmFQuDv+HP97OxwAB0vkHgAQhsIwyORyHv95OVugB5P+ + LhoOBQAAKOy2Gw8APp2gBxuR8AAJh4NgAFASXS6PwV7ABzt5ygABzkABYHgefx2gwd7u + gANxwPUABsSiEAAkCSynwiowl7O6qPR9gilhcIWGxTCFP57zN3PenA4HAoAAav26xwp9 + gB3OWjvcBRcNhmN2G/wt/PR0gByu4AgAMh4LACfT/Gx10t6RgoPCMAA3Ny3Oxx4OKRvJ + 9v4AA8PiXY6eFamOY+iOehhUN5nbbe4W6Cvx5TRvuucCPSAqwS+HcSDPx8gB0OFxAAFh + 3aA0DQncWF5upvyQBBWshQGW/o9KEP7juNuzMJiOuc6C+G3YF2zUAH6BgMKWCIEgA/Ti + OMyJ0HiyoNA6zMDuI3SRMiB4QtJCL3IWgIAADwEAAAMAAAABAAsAAAEBAAMAAAABABUA + AAECAAMAAAAEAAACBgEDAAMAAAABAAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES + AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABUAAAEXAAQAAAABAAABRAEcAAMA + AAABAAEAAAE9AAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAACDodzAAcAABns + AAACFgAAAAAACAAIAAgACAABAAEAAQABAAAZ7GFwcGwCEAAAbW50clJHQiBYWVogB9sA + AwAZABIAMgA3YWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPbWAAEAAAAA + 0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAARZGVzYwAAAVAAAABiZHNjbQAAAbQAAAJCY3BydAAAA/gAAADQd3RwdAAABMgAAAAU + clhZWgAABNwAAAAUZ1hZWgAABPAAAAAUYlhZWgAABQQAAAAUclRSQwAABRgAAAgMYWFy + ZwAADSQAAAAgdmNndAAADUQAAAYSbmRpbgAAE1gAAAY+Y2hhZAAAGZgAAAAsbW1vZAAA + GcQAAAAoYlRSQwAABRgAAAgMZ1RSQwAABRgAAAgMYWFiZwAADSQAAAAgYWFnZwAADSQA + AAAgZGVzYwAAAAAAAAAIRGlzcGxheQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AG1sdWMAAAAAAAAAEgAAAAxubE5MAAAAFgAAAOhuYk5PAAAAEgAAAP5kYURLAAAAHAAA + ARBlblVTAAAAEgAAASxwbFBMAAAAEgAAAT5mckZSAAAAFgAAAVBwdEJSAAAAGAAAAWZw + dFBUAAAAFgAAAX56aENOAAAADAAAAZRlc0VTAAAAEgAAAaBqYUpQAAAADgAAAbJydVJV + AAAAJAAAAcBzdlNFAAAAEAAAAeR6aFRXAAAADgAAAfRkZURFAAAAEAAAAgJpdElUAAAA + FAAAAhJmaUZJAAAAEAAAAiZrb0tSAAAADAAAAjYASwBsAGUAdQByAGUAbgAtAEwAQwBE + AEYAYQByAGcAZQAtAEwAQwBEAEwAQwBEAC0AZgBhAHIAdgBlAHMAawDmAHIAbQBDAG8A + bABvAHIAIABMAEMARABLAG8AbABvAHIAIABMAEMARABMAEMARAAgAGMAbwB1AGwAZQB1 + AHIATABDAEQAIABDAG8AbABvAHIAaQBkAG8ATABDAEQAIABhACAAQwBvAHIAZQBzX2mC + cgAgAEwAQwBEAEwAQwBEACAAYwBvAGwAbwByMKsw6TD8ACAATABDAEQEJgQyBDUEQgQ9 + BD4EOQAgBBYEGgAtBDQEOARBBD8EOwQ1BDkARgDkAHIAZwAtAEwAQwBEX2mCcm2yZnaY + b3k6VmgARgBhAHIAYgAtAEwAQwBEAEwAQwBEACAAYwBvAGwAbwByAGkAVgDkAHIAaQAt + AEwAQwBEzuy37AAgAEwAQwBEAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwg + MjAxMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNSAAEAAAABFs9YWVogAAAA + AAAAYZwAADaEAAAHTVhZWiAAAAAAAABtlgAAr/wAABiOWFlaIAAAAAAAACejAAAZgAAA + s1JjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADYAOwBAAEUASgBPAFQA + WQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8AowCoAK0AsgC3ALwAwQDGAMsA0ADV + ANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4B + dQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJB + AksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MD + TwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSM + BJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYG + FgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfS + B+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J + 5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwq + DEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO + 0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGq + EckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U + 8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhl + GIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCoc + Uhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBs + IJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNol + CSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQ + KgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4v + JC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSe + NNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6 + sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDn + QSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tH + wEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63 + TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9W + XFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4a + XmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1m + kmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8e + b3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4 + bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HN + gjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL + /IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0 + lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNih + R6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axc + rNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4 + WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRR + xM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrR + PNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c + 3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr + ++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH + +lf65/t3/Af8mP0p/br+S/7c/23//3BhcmEAAAAAAAMAAAACZmYAAPKnAAANWQAAE9AA + AAoOdmNndAAAAAAAAAAAAAMBAAACAAAABQAVADIAXwCbAOgBNQGJAewCXALaA2MD+QSk + BV4GJwb4B9gIyAnICtAL3Az2Dg0PNxBdEYUSrBPSFPUWEhclGDkZQBpFG0IcMB0XHgIe + 6h/UIL0hqiKYI4okfiVyJmknXyhXKVcqVytXLFstZS5tL3kwiTGaMqwzwzTfNfs3Fzg8 + OVs6fDuQPJ09qz64P8JAz0HfQu5D/EUNRh5HMUhBSVFKZ0t7TI9NpU64T8tQ41H6UxFU + J1U/VlhXdViYWcBa71wdXUpedl+jYNBiAGMyZGJlmGbTaAtpSWqMa9RtGm5pb7txEnJt + c8p1KnaOd9N47noAexB8JH00fkV/UIBegWeCaoNyhHCFaoZlh1mISok1ih+LBIvnjMmN + pY6Aj12QQZEqkhKS+pPjlMuVtJabl4OYbZlXmkObL5wbnQmd+Z7rn9+g1KHMosWjvaS6 + paWmhqdsqFOpOKogqwir76zYrcOurq+bsIaxcrJfs020O7Uqthm3BbfyuN+5y7qnu3+8 + Vr0vvgq+5b/CwJ7BfsJew0DEJcUNxfXG4cfPyL7JsMqly5zMk82IznfPZdBR0T3SKtMa + 1AfU9dXm1tbXydi82bHap9uf3Jfdk96N34vgiOGG4ozjkeSQ5Ynmfedz6GnpYeph62fs + eO2c7tLwIvGW8yr05PbW+Pv7b/4m//8AAAAHACEAUACWAPYBOgGIAeQCSAK4AzkDzARm + BQsFxQaJB1sIOQkgChYLGwwcDSsOQA9eEHkRmBK2E9QU7xYAFw4YGRkhGh4bFhwCHOcd + zx65H6EgiSFzImEjUiRFJTMmKCcdKA8pDSoIKwEsAS0FLgkvDTAVMRsyJjM2NEY1WjZq + N4I4lzmqOrI7sDyuPa0+qT+nQKlBqkKqQ6xErkWxRrNHtki6ScBKxUvJTM5N0U7YT99Q + 5FHqUvFT+VUFVhZXLlhLWWhahFugXL1d2176YBthO2JgY4tks2XfZxBoRWl4arNr8m01 + bnpvwXELclhzjHShda92u3fKeNd543rue/l9An4Hfw2AEYESghKDEIQNhQWF/Yb0h+iI + 3YnOir+LroyWjYKOaI9TkD6RKpIXkwST8pTlldiWzZfDmLuZs5qwm66crp2xnrWfvKDB + ociiu6OdpIelc6Zfp02oPKksqh6rEqwIrP6t867pr+Cw2LHMssWzu7SstZ62kLeDuHi5 + a7pdu1C8Q702vim/HMAQwQPB9sLrw+HE1MXMxsPHusizya3KqsumzKnNv87az/LRB9Ic + 0zHUQtVT1mXXdtiI2ZvasNvG3OHd+t8a4DvhYOKH46/k2eYK5zrobOmm6uTsI+1o7rLw + AvFW8qr0BPVk9sX4J/mO+vX8W/2+/xf//wAAAAYADgAhAD4AZgCYANUBFwFWAZ0B7gJL + ArEDIQOYBBoEpQU7BdsGfwcqB9wIkQlNCg8KyguLDE4NEA3NDoQPOg/vEJ0RSBHtEogT + JBO9FFcU8RWLFicWxBdjGAQYoxlFGekajhs1G90chh0yHeMekx9EH/kgrCFjIh8i2yOX + JFQlGCXYJpUnSyf0KKApTCn3KqQrUywDLLUtZy4cLtEvhzA/MPoxtTJxMzAz7DSqNWk2 + LDbrN6s4bjkxOfU6tzt7PEM9Cj3SPpo/YkArQPZBwUKNQ1xELkT9Rc9GpEd7SE9JKUoD + St9LvEyaTXhOWU8vT/5QzFGcUm5TQVQZVPBVy1aoV4ZYallNWjVbIFwNXPxd7F7eX9Ng + yGHAYrdjrmSkZZNmgmdvaGBpU2pGaztsL20mbiBvGnAXcRVyE3MSdBN1FnYadx54JXks + ejF7M3wZfPF9yH6ff3KAR4EZgemCu4OOhGGFNIYHhtuHsoiLiWKKP4sci/qM2Y27jpyP + cZBEkReR7pLJk6eUiJVrllaXRJg1mS+aLJstnDOdPp5Mn16gdKGPoqujvaTDpcSmxqfI + qM6p16rgq+ys/K4Lrx6wM7FIsl+zdrSNtae2vrfYuO+6CLtBvKO9+r9KwJ/B/sNoxODG + bcgSydvLv83S0CjSwtWp2Q7dDuIi6MDzHP//AABuZGluAAAAAAAABjYAAJkCAABWyAAA + VQQAAJGwAAAncwAAFwoAAFANAABUOQACCj0AAfrhAAEmZgADAQAAAgAAABMALABFAF8A + eACRAKsAxQDfAPkBFAEwAUwBagGHAaYBxgHnAgoCLgJUAnwCpwLTAwMDNQNqA6UD5AQk + BGcErATzBTsFhQXPBhwGaga6BwwHXQewCAUIWwiwCQgJYQm6ChQKcQrNCyoLhwvmDEcM + pg0JDWwN1Q5EDrUPJg+cEBQQixEEEX8R/RJ6EvoTexP/FIUVChWRFhsWpRcyF8IYUxji + GXYaCxqiGzob0xxsHQQdnB4xHscfYB/6IJchNCHUInQjFCO2JFok/SWdJkIm5yeLKC4o + zyl1KhkquyteLAAsoi1ELeYuiy8sL84wejFEMh0y+TPXNLM1mDZ7N2c4UTlDOj07Mzw2 + PT8+Sj9gQHtBokLMRAJFOUZ+R8hJEkpRS5BM1E4ZT2JQrVH+U09UoVX3V0pYo1n9W1Vc + rV4GX19gt2IPY2xkw2Y3Z8FpQmrIbFNt2m9pcPhyhXQVdaV3PHjRemp8A32gfzuA4YKJ + hDKF4IexiY+Lc41SjzORFJL7lNqWvZiemnicV54woAih36O0pYanVqkpqwes8q7jsNiy + 0rTEtsK4v7q5vLi+tcCywq/ErcaqyKnKocyjzpzQntKd1IrWh9iS2qzc0t7v4RnjM+VC + 50fpMOr/7LvuW+/h8UvypvPw9Sn2Svdi+G75aPpX+zb8EPze/aT+l///AAAADAAjADwA + VABuAIcAoQC7ANYA8QEMASkBRgFkAYIBogHDAeUCCQIuAlUCfwKrAtkDCQM9A3QDsAPw + BDEEdAS6BQIFSwWVBeAGLwZ+Bs8HIwd1B8oIIgh5CNEJKwmHCeMKQgqhCwALYQvCDCcM + igzwDVgNww44DrAPKA+kECMQoREhEaQSKBKuEzYTwBRMFNoVaBX5FowXIRe5GFMY6xmJ + GigayRtrHA4csR1SHfEekB8xH9QgeSEfIccicCMaI8UkciUeJcgmdickJ9IofSkqKdoq + hyszK+AsjC05LeUuli9BL/AwrTGBMl4zPjQfNQE16TbRN744qzmgOpg7kDyRPZM+mz+l + QLVBzkLkRAVFJEZMR3dIpknjSx5MYk2jTuZQK1FxUr1UAVVKVpFX2lkiWm5btFz8XkRf + jGDTYhljZWSsZhJnmWkUapBsEW2Mbw5wjnIMc4x1CXaPeBR5m3sjfLR+QH/TgXCDEISy + hlWH94mgi0+M/I6tkGCSGpPRlYyXTpkMmsyck55WoByh5KOspXSnOqkFqsKsY64Cr6ex + UrMCtK+2abglueG7n71kvyTA6MKqxG7GK8fvyajLY80dztLQi9JA0/fVptdX2Qzaudxg + 3gXfreFP4u3kiuYg57LpSurf7HDt+++I8RbypfQw9bj3R/jW+mT7/f2O//8AAAAdAEQA + agCRALgA3wEIATIBXgGLAbwB7gIkAl4CngLiAywDfwPcBD4EpgUSBYEF8wZqBuMHXwfe + CGAI4QlnCe4KeQsDC48MIAyvDUMN4Q6SD0UP/hC4EXQSMxL0E7cUfhVDFg0W2BeoGHoZ + TBolGv8b2xy6HZ8egh9oIFEhPiItIx0kESUFJfgm8SfpKN8p3SrXK9Qs0S3PLtIv0zDk + MgQzJzRINWs2izevOM458jsOPC89TT5pP4VAokHCQt1D/kUaRj1HYEiFSbhK7UwpTWFO + mk/VURBSUVOMVMlWCVdEWIVZxlsIXEldjF7QYBVhWmKgY+5lQmbRaHJqD2u8bWZvH3DZ + cpR0UnYUd9l5nHtcfSJ+3oChgmSEJIXmh8eJsIubjXuPWJEwkwaUzpaVmFaaB5u6nWef + DqCyolKj76WIpx6otKpZrBWt3q+osXSzPbUAtsm4j7pQvBK92L+UwVfDGMTaxp7IZcoo + y/TNu8+L0V7TItSU1gnXidkT2p7cJN2j3xvgi+Hx40zkneXj5xjoQOli6nvrg+yF7XLu + Xe838A/w1/Gf8lfzDvO79Fj09vWL9hf2o/co95z4D/iD+PH5Uvm0+hb6ePrK+xP7XPul + ++78N/x2/Kb81f0F/TT9ZP2T/cP98/4i/k/+ev6l/tD++/8n/1L/ff+o/9T//wAAc2Yz + MgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAAwGxtbW9kAAAAAAAA + BhAAAJxnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + ReadOnly + NO + RowAlign + 1 + RowSpacing + 36 + SheetTitle + Canvas 1 + SmartAlignmentGuidesActive + YES + SmartDistanceGuidesActive + YES + UniqueID + 1 + UseEntirePage + + VPages + 1 + WindowInfo + + CurrentSheet + 0 + ExpandedCanvases + + Frame + {{78, 0}, {591, 828}} + ListView + + OutlineWidth + 142 + RightSidebar + + Sidebar + + SidebarWidth + 138 + VisibleRegion + {{0.5, 1.5}, {219.5, 352}} + Zoom + 2 + ZoomValues + + + Canvas 1 + 2 + 1.5 + + + + saveQuickLookFiles + YES + + diff --git a/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png b/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png new file mode 100644 index 0000000000000000000000000000000000000000..497f46cbb29b6c3224e33cc393b577c9132aaa16 GIT binary patch literal 9811 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 Date: Wed, 12 Aug 2015 21:38:29 +0000 Subject: [PATCH 023/160] M pom.xml - Added necessary config for deployment, including javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64035 --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index a9dd4c54..8aa3b52b 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,18 @@ + + + jvnet-nexus-snapshots + Java.net Nexus Snapshots Repository + https://maven.java.net/content/repositories/snapshots/ + + + jvnet-nexus-staging + Java.net Nexus Staging Repository + https://maven.java.net/service/local/staging/deploy/maven2/ + + GlassFish Community @@ -245,6 +257,12 @@ javadoc + + attach-javadocs + + jar + + From c9b6666466c30fcc61eda44efe7d8054b6efc120 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 12 Aug 2015 22:53:33 +0000 Subject: [PATCH 024/160] https://java.net/jira/browse/SERVLET_SPEC-83 M src/main/java/javax/servlet/ServletContext.java - Specify that NPE should be thrown from getAttribute() and getInitParameter() if the arugment is null. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64036 --- src/main/java/javax/servlet/ServletContext.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index bddd1332..3da944df 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -613,6 +613,9 @@ public interface ServletContext { * is {@code null} the literal String "null" without the quotes must * be returned. * + * @throws NullPointerException if + * the argument {@code name} is {@code null} + * * @see ServletConfig#getInitParameter */ public String getInitParameter(String name); @@ -694,6 +697,10 @@ public interface ServletContext { * returned. * * @see ServletContext#getAttributeNames + * + * @throws NullPointerException if + * the argument {@code name} is {@code null} + * */ public Object getAttribute(String name); From 72b63a51cdff5c3b9e8350f3bf3e81bd3cd808e5 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 13:50:09 +0000 Subject: [PATCH 025/160] M src/main/javadoc/javax.servlet-api.css - Attempt to resolve the "Wrong copyright" warning by copying the copyright header from another java source file that doesn't produce the warning. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64037 --- src/main/javadoc/javax.servlet-api.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/javadoc/javax.servlet-api.css b/src/main/javadoc/javax.servlet-api.css index f608a877..ec16d8f1 100644 --- a/src/main/javadoc/javax.servlet-api.css +++ b/src/main/javadoc/javax.servlet-api.css @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From 2b7d932b4889eb9e909ded0da33c12ef09fb00cd Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 13:58:11 +0000 Subject: [PATCH 026/160] M copyright-exclude - Update to exclude binary files svn path=/trunk/api/javaee-api/javax.servlet/; revision=64038 --- copyright-exclude | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/copyright-exclude b/copyright-exclude index c1c82ee4..d63a6d06 100644 --- a/copyright-exclude +++ b/copyright-exclude @@ -1,2 +1,13 @@ javax.servlet/copyright-exclude +javax.servlet/src/main/javadoc/doc-files/changed_added_4_0.png +javax.servlet/src/main/javadoc/doc-files/changed_added_4_0_cursor.cur +javax.servlet/src/main/javadoc/doc-files/changed_deleted_4_0.png +javax.servlet/src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur +javax.servlet/src/main/javadoc/doc-files/changed_modified_4_0.png +javax.servlet/src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur +javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-blank.graffle +javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-blank.png +javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle +javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png +javax.servlet/src/main/javadoc/doc-files/expert-draft-bg.png javax.servlet/src/main/javadoc/doc-files/speclicense.html From 965111bebd7efc4f64efdfc9ee9d319a9122438d Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 14:48:36 +0000 Subject: [PATCH 027/160] M copyright-exclude - Can't get the CSS copyright correct so excluding it. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64039 --- copyright-exclude | 1 + 1 file changed, 1 insertion(+) diff --git a/copyright-exclude b/copyright-exclude index d63a6d06..b7dd755b 100644 --- a/copyright-exclude +++ b/copyright-exclude @@ -11,3 +11,4 @@ javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png javax.servlet/src/main/javadoc/doc-files/expert-draft-bg.png javax.servlet/src/main/javadoc/doc-files/speclicense.html +javax.servlet/src/main/javadoc/javax.servlet-api.css From d48625d917a6948cebbbabcfabc3b9a00c57a385 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 13 Aug 2015 18:54:07 +0000 Subject: [PATCH 028/160] remove duplicate javadoc generations svn path=/trunk/api/javaee-api/javax.servlet/; revision=64040 --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 8aa3b52b..eb35ea0e 100644 --- a/pom.xml +++ b/pom.xml @@ -252,13 +252,6 @@ - package - - javadoc - - - - attach-javadocs jar From 0cf1970d961f42e8c6ddaa3c8c06d7aa953d9c1e Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 19:04:39 +0000 Subject: [PATCH 029/160] M src/main/javadoc/doc-files/expert-draft-bg-non-blank.png M src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle - Increase spacing between Expert Draft Version watermark in background svn path=/trunk/api/javaee-api/javax.servlet/; revision=64041 --- .../expert-draft-bg-non-blank.graffle | 340 ++---------------- .../doc-files/expert-draft-bg-non-blank.png | Bin 9811 -> 8673 bytes 2 files changed, 27 insertions(+), 313 deletions(-) diff --git a/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle b/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle index 9b7b9d5d..7707a65f 100644 --- a/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle +++ b/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle @@ -7,14 +7,14 @@ ApplicationVersion com.omnigroup.OmniGrafflePro - 138.17.0.133677 + 139.18.0.187838 AutoAdjust BackgroundGraphic Bounds - {{0, 0}, {576, 753.9}} + {{0, 0}, {578.800048828125, 754.800048828125}} Class SolidGraphic ID @@ -33,6 +33,8 @@ + BaseZoom + 0 CanvasOrigin {0, 0} ColumnAlign @@ -40,13 +42,13 @@ ColumnSpacing 36 CreationDate - 2006-07-19 15:53:09 -0400 + 2006-07-19 19:53:09 +0000 Creator Edward Burns DisplayScale 1 0/72 in = 1.0000 in GraphDocumentVersion - 6 + 8 GraphicsList @@ -85,10 +87,10 @@ Text Text - {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350 -{\fonttbl\f0\fnil\fcharset0 AmericanTypewriter;} + {\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210 +\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset0 AmericanTypewriter;} {\colortbl;\red255\green255\blue255;\red170\green162\blue153;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc \f0\fs24 \cf2 Expert Draft Version} VerticalPad @@ -145,7 +147,7 @@ MasterSheets ModificationDate - 2011-06-16 12:56:40 -0400 + 2011-06-16 16:56:40 +0000 Modifier Edward Burns NotesVisible @@ -161,332 +163,46 @@ NSBottomMargin float - 4.97998 + 18.6 + + NSHorizonalPagination + + coded + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG NSLeftMargin float - 18 + 16.6 NSPaperSize size - {612, 792} + {612.00002479553223, 792} NSPrintAllPages int 0 + NSPrintReverseOrientation + + int + 0 + NSRightMargin float - 18 + 16.6 NSTopMargin float - 33.12 + 18.6 PrintOnePage - QuickLookPreview - - JVBERi0xLjMKJcTl8uXrp/Og0MTGCjUgMCBvYmoKPDwgL0xlbmd0aCA2IDAgUiAvRmls - dGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAG1kL1uwzAMhPc8xY3NYIWUKNFcm589 - gNDOhWEDLZC0sTv08UOnCAq0GRvcIIIi79PphD1OIFfWAs0JY49nHLFaT4xuAl80dWgo - ZFAQIooi1/Fg88LgF6W0om1aeJXEosa5R2zCBl93iO8WTaXMVsYpS86/yutAUmcVi0E1 - L7oDHivY/VyNn02hMNsI6gGrHQfyN9YBD9uvj35cor5hW79z/RsySjD7S/zEZnwZ7oJs - /UfNjG9Bn+5C9IyJ9VbMfpxe348/0P0ZFDx3mAplbmRzdHJlYW0KZW5kb2JqCjYgMCBv - YmoKMjA1CmVuZG9iagozIDAgb2JqCjw8IC9UeXBlIC9QYWdlIC9QYXJlbnQgNCAwIFIg - L1Jlc291cmNlcyA3IDAgUiAvQ29udGVudHMgNSAwIFIgL01lZGlhQm94IFswIDAgNTc2 - IDc1My45XQo+PgplbmRvYmoKNyAwIG9iago8PCAvUHJvY1NldCBbIC9QREYgL1RleHQg - XSAvQ29sb3JTcGFjZSA8PCAvQ3MxIDggMCBSID4+IC9Gb250IDw8IC9GMS4wIDkgMCBS - Cj4+ID4+CmVuZG9iagoxMCAwIG9iago8PCAvTGVuZ3RoIDExIDAgUiAvTiAzIC9BbHRl - cm5hdGUgL0RldmljZVJHQiAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAGF - VM9rE0EU/jZuqdAiCFprDrJ4kCJJWatoRdQ2/RFiawzbH7ZFkGQzSdZuNuvuJrWliOTi - 0SreRe2hB/+AHnrwZC9KhVpFKN6rKGKhFy3xzW5MtqXqwM5+8943731vdt8ADXLSNPWA - BOQNx1KiEWlsfEJq/IgAjqIJQTQlVdvsTiQGQYNz+Xvn2HoPgVtWw3v7d7J3rZrStpoH - hP1A4Eea2Sqw7xdxClkSAog836Epx3QI3+PY8uyPOU55eMG1Dys9xFkifEA1Lc5/TbhT - zSXTQINIOJT1cVI+nNeLlNcdB2luZsbIEL1PkKa7zO6rYqGcTvYOkL2d9H5Os94+wiHC - CxmtP0a4jZ71jNU/4mHhpObEhj0cGDX0+GAVtxqp+DXCFF8QTSeiVHHZLg3xmK79VvJK - gnCQOMpkYYBzWkhP10xu+LqHBX0m1xOv4ndWUeF5jxNn3tTd70XaAq8wDh0MGgyaDUhQ - EEUEYZiwUECGPBoxNLJyPyOrBhuTezJ1JGq7dGJEsUF7Ntw9t1Gk3Tz+KCJxlEO1CJL8 - Qf4qr8lP5Xn5y1yw2Fb3lK2bmrry4DvF5Zm5Gh7X08jjc01efJXUdpNXR5aseXq8muwa - P+xXlzHmgjWPxHOw+/EtX5XMlymMFMXjVfPqS4R1WjE3359sfzs94i7PLrXWc62JizdW - m5dn/WpI++6qvJPmVflPXvXx/GfNxGPiKTEmdornIYmXxS7xkthLqwviYG3HCJ2VhinS - bZH6JNVgYJq89S9dP1t4vUZ/DPVRlBnM0lSJ93/CKmQ0nbkOb/qP28f8F+T3iuefKAIv - bODImbptU3HvEKFlpW5zrgIXv9F98LZua6N+OPwEWDyrFq1SNZ8gvAEcdod6HugpmNOW - ls05Uocsn5O66cpiUsxQ20NSUtcl12VLFrOZVWLpdtiZ0x1uHKE5QvfEp0plk/qv8RGw - /bBS+fmsUtl+ThrWgZf6b8C8/UUKZW5kc3RyZWFtCmVuZG9iagoxMSAwIG9iago3MzcK - ZW5kb2JqCjggMCBvYmoKWyAvSUNDQmFzZWQgMTAgMCBSIF0KZW5kb2JqCjQgMCBvYmoK - PDwgL1R5cGUgL1BhZ2VzIC9NZWRpYUJveCBbMCAwIDYxMiA3OTJdIC9Db3VudCAxIC9L - aWRzIFsgMyAwIFIgXSA+PgplbmRvYmoKMTIgMCBvYmoKPDwgL1R5cGUgL0NhdGFsb2cg - L091dGxpbmVzIDIgMCBSIC9QYWdlcyA0IDAgUiA+PgplbmRvYmoKMiAwIG9iago8PCAv - TGFzdCAxMyAwIFIgL0ZpcnN0IDE0IDAgUiA+PgplbmRvYmoKMTQgMCBvYmoKPDwgL1Bh - cmVudCAxNSAwIFIgL0NvdW50IDAgL0Rlc3QgWyAzIDAgUiAvWFlaIDAgNzUzLjkgMCBd - IC9UaXRsZSAoQ2FudmFzIDEpCj4+CmVuZG9iagoxNSAwIG9iago8PCA+PgplbmRvYmoK - MTMgMCBvYmoKPDwgL1BhcmVudCAxNSAwIFIgL0NvdW50IDAgL0Rlc3QgWyAzIDAgUiAv - WFlaIDAgNzUzLjkgMCBdIC9UaXRsZSAoQ2FudmFzIDEpCj4+CmVuZG9iagoxNiAwIG9i - ago8PCAvTGVuZ3RoIDE3IDAgUiAvTGVuZ3RoMSA1ODUyIC9GaWx0ZXIgL0ZsYXRlRGVj - b2RlID4+CnN0cmVhbQp4AZ1Ye2wcx3mfmZ2d3Xvv3u29eORxb/eevCfveDy+b/kSSckU - KYm2RPlJSdTLoqTKsmwrtuUocupEtlGjsR2gLZK2/sPNP3ZqJYiBIjXaAHH9R9GHgwRo - kT/aoA3gBk5hxy1si+w3e0f6TAcF2rmbmZvHzs38vu/7fd/s5UsPryMPegoJaPno2sWT - yE7BbyKEZ45vrF1stcllqN85fuWy3mrjX0A9cvLiqY1Wm/B+7dS5x9rPCycQUn90en0N - ajt9CuXgaehoNfEA1MnTG5cfbbUJb1vnLhxvjwsWtI2NtUfb/4/+Gdr6+bWNdaghBc9B - Ubh44SG+L0jBLBQzFy+tt+fjI9C+iTCUCvo5YlhHEiJIRhZyQt/v4j9DFEb5OOTUn157 - 737f2G+wKfwSetDrf/23T/H6rcvv/Hoztvn7UpMuQFOAFVoJnhGe2WIISQc3Y1uH6Vl7 - pfagXSm3wuFQKHgrqGmBwC2/X1WVW4rP5/Xe8njcbtctl9PpcNySZUEgtwiG9V5Hz/0A - bz09e3rm//19Q6R7UP4NiUH5XUphne8yBiXa+g2+TV4l30PLaBpNoQaaR3X0Jl7BJn4N - v4Pewz50Ab+Ez+K/x2X8Cr7j6Bn+gfOKIBSMCldm9deF1Ky5djpinn5gpog/RE30MULk - ZyhA/hjyz7Y+AQnGiYIy+ChS8SBSyBOQDZQmR5ADv4d8+D9QHv8ekqBfAIRa2CPkRgz9 - BbR1tPoFDDvx/L/8JvY//O9P0N86DOe1EwNt4Um2S144QG9cULvBVrztXl+7nkAT6O/w - u+QY+VC4R/iUPi/eI77KltlH0jPSf8v/ArMI4IXw98lHsDMJ3WXpWJYtB5GoiBETRYGI - FP6SMUwwgIPRnivlRgQ1x8pjym3+xeWx29C4PYb6K3jh9JuwpLxweu116+CRIbXxJpK3 - 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 - gAJYvlbFIwSbZnf68LIRDehKMOjJqJmkfyOdO++d3fN1K1fayI/UUqu/DgZ93lDgVDr9 - oM9MBT86A/QE5xPAp12E9yRfQt+2lvDjj1tPzF29cOL+1cWpquE/dncz1YvD1FWgjUO0 - MXeGPqxINNPTTemY5BnuiwpwvXjk1J3CLFt46NyDB5b3sgVUD3o9tITxw20EwLPxAKoz - czWx74/2BaSDvHa05WH0eCcwj3NgmpibjA/bRgMY2ES1fRGBK0aoF4OWwBR7Qs3oGLef - 22nn2wt9FlXUB8pw2QgCnDYjtiZsvxwI1apfvnnTq8lUpc5ETsD9UVW1lFxalnyMEunu - +x0QMIRZso80QtHokLtgyHE50nf5D70ai0K3nFH0WCzpKqc8ESI6BeHC70hOIMx83puN - h/1RQ+lLsggLnPjWKwqmWDcoYYZOoJTPn3fyRkLkhVy58QOVcvsVoKQYXsrR69dlKlJT - p/DbSPA3Vu13f1tHkcZF/IXE70gCykDcP4xmIF5eAC49gA6iQ+hOdBc6jO62n8DID9rB - E0MQIi7tOTK5OJef3Fi/dOb42vmVxy6uP3LpzOX1S1yHttM8/FiBzN+l8vedNyB/A/Ir - kG9B/hHkdyH/AvKH8CCFrEFOQh7YaicYQzu/MdJ3tWd2tWd3te/a1V7b1bbfy3asf3LX - uG0WHePnd41f2NW23+N2zAdAPrf/h3a1L+9q2++V/weyTXcLCmVuZHN0cmVhbQplbmRv - YmoKMTcgMCBvYmoKMzg0NwplbmRvYmoKMTggMCBvYmoKPDwgL1R5cGUgL0ZvbnREZXNj - cmlwdG9yIC9Bc2NlbnQgOTA0IC9DYXBIZWlnaHQgNzU4IC9EZXNjZW50IC0yNTAgL0Zs - YWdzIDMyCi9Gb250QkJveCBbLTQ4NSAtMzY1IDE4NTUgMTA5N10gL0ZvbnROYW1lIC9P - RlhBTUcrQW1lcmljYW5UeXBld3JpdGVyIC9JdGFsaWNBbmdsZQowIC9TdGVtViAwIC9N - YXhXaWR0aCAxODc0IC9YSGVpZ2h0IDUxOSAvRm9udEZpbGUyIDE2IDAgUiA+PgplbmRv - YmoKMTkgMCBvYmoKWyAyNTAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAw - IDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMAowIDcyOCA2NzMgMCAwIDAg - MCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCA3MjggMCAwIDAgMCAwIDAgMCAwIDAgMCA1 - NjQgMCAwCjAgNTI4IDM0NiAwIDAgMzEwIDAgMCAwIDAgNjM3IDU0NiA2MDAgMCA0OTEg - NDkyIDQwMCAwIDAgMCA2MzcgXQplbmRvYmoKOSAwIG9iago8PCAvVHlwZSAvRm9udCAv - U3VidHlwZSAvVHJ1ZVR5cGUgL0Jhc2VGb250IC9PRlhBTUcrQW1lcmljYW5UeXBld3Jp - dGVyIC9Gb250RGVzY3JpcHRvcgoxOCAwIFIgL1dpZHRocyAxOSAwIFIgL0ZpcnN0Q2hh - ciAzMiAvTGFzdENoYXIgMTIwIC9FbmNvZGluZyAvTWFjUm9tYW5FbmNvZGluZwo+Pgpl - bmRvYmoKMjAgMCBvYmoKKE1hYyBPUyBYIDEwLjYuNyBRdWFydHogUERGQ29udGV4dCkK - ZW5kb2JqCjIxIDAgb2JqCihEOjIwMTEwNjE2MTY1NjQ2WjAwJzAwJykKZW5kb2JqCjEg - MCBvYmoKPDwgL1Byb2R1Y2VyIDIwIDAgUiAvQ3JlYXRpb25EYXRlIDIxIDAgUiAvTW9k - RGF0ZSAyMSAwIFIgPj4KZW5kb2JqCnhyZWYKMCAyMgowMDAwMDAwMDAwIDY1NTM1IGYg - CjAwMDAwMDY1MjYgMDAwMDAgbiAKMDAwMDAwMTU2OSAwMDAwMCBuIAowMDAwMDAwMzIw - IDAwMDAwIG4gCjAwMDAwMDE0MjAgMDAwMDAgbiAKMDAwMDAwMDAyMiAwMDAwMCBuIAow - MDAwMDAwMzAxIDAwMDAwIG4gCjAwMDAwMDA0MjYgMDAwMDAgbiAKMDAwMDAwMTM4NCAw - MDAwMCBuIAowMDAwMDA2MjQ5IDAwMDAwIG4gCjAwMDAwMDA1MjQgMDAwMDAgbiAKMDAw - MDAwMTM2NCAwMDAwMCBuIAowMDAwMDAxNTAzIDAwMDAwIG4gCjAwMDAwMDE3MzQgMDAw - MDAgbiAKMDAwMDAwMTYxNyAwMDAwMCBuIAowMDAwMDAxNzEyIDAwMDAwIG4gCjAwMDAw - MDE4MjkgMDAwMDAgbiAKMDAwMDAwNTc2NiAwMDAwMCBuIAowMDAwMDA1Nzg3IDAwMDAw - IG4gCjAwMDAwMDYwMjEgMDAwMDAgbiAKMDAwMDAwNjQzMiAwMDAwMCBuIAowMDAwMDA2 - NDg0IDAwMDAwIG4gCnRyYWlsZXIKPDwgL1NpemUgMjIgL1Jvb3QgMTIgMCBSIC9JbmZv - IDEgMCBSIC9JRCBbIDwzOWM3MzMwYmU0Mzk3ODRkMTY0NGQzNzdlMGMxMDhiZj4KPDM5 - YzczMzBiZTQzOTc4NGQxNjQ0ZDM3N2UwYzEwOGJmPiBdID4+CnN0YXJ0eHJlZgo2NjAx - CiUlRU9GCjEgMCBvYmoKPDwvQXV0aG9yIChFZHdhcmQgQnVybnMpL0NyZWF0aW9uRGF0 - ZSAoRDoyMDA2MDcxOTE5NTMwMFopL0NyZWF0b3IgKE9tbmlHcmFmZmxlIFByb2Zlc3Np - b25hbCA1LjIuMykvTW9kRGF0ZSAoRDoyMDExMDYxNjE2NTYwMFopL1Byb2R1Y2VyIDIw - IDAgUiAvVGl0bGUgKGV4cGVydC1kcmFmdC1iZy5ncmFmZmxlKT4+CmVuZG9iagp4cmVm - CjEgMQowMDAwMDA3MTk4IDAwMDAwIG4gCnRyYWlsZXIKPDwvSUQgWzwzOWM3MzMwYmU0 - Mzk3ODRkMTY0NGQzNzdlMGMxMDhiZj4gPDM5YzczMzBiZTQzOTc4NGQxNjQ0ZDM3N2Uw - YzEwOGJmPl0gL0luZm8gMSAwIFIgL1ByZXYgNjYwMSAvUm9vdCAxMiAwIFIgL1NpemUg - MjI+PgpzdGFydHhyZWYKNzM5MQolJUVPRgo= - - QuickLookThumbnail - - TU0AKgAAAUyAPeBPcAQWDQeEQmFQuDv+HP97OxwAB0vkHgAQhsIwyORyHv95OVugB5P+ - LhoOBQAAKOy2Gw8APp2gBxuR8AAJh4NgAFASXS6PwV7ABzt5ygABzkABYHgefx2gwd7u - gANxwPUABsSiEAAkCSynwiowl7O6qPR9gilhcIWGxTCFP57zN3PenA4HAoAAav26xwp9 - gB3OWjvcBRcNhmN2G/wt/PR0gByu4AgAMh4LACfT/Gx10t6RgoPCMAA3Ny3Oxx4OKRvJ - 9v4AA8PiXY6eFamOY+iOehhUN5nbbe4W6Cvx5TRvuucCPSAqwS+HcSDPx8gB0OFxAAFh - 3aA0DQncWF5upvyQBBWshQGW/o9KEP7juNuzMJiOuc6C+G3YF2zUAH6BgMKWCIEgA/Ti - OMyJ0HiyoNA6zMDuI3SRMiB4QtJCL3IWgIAADwEAAAMAAAABAAsAAAEBAAMAAAABABUA - AAECAAMAAAAEAAACBgEDAAMAAAABAAUAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES - AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABUAAAEXAAQAAAABAAABRAEcAAMA - AAABAAEAAAE9AAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAAEAAACDodzAAcAABns - AAACFgAAAAAACAAIAAgACAABAAEAAQABAAAZ7GFwcGwCEAAAbW50clJHQiBYWVogB9sA - AwAZABIAMgA3YWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPbWAAEAAAAA - 0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAARZGVzYwAAAVAAAABiZHNjbQAAAbQAAAJCY3BydAAAA/gAAADQd3RwdAAABMgAAAAU - clhZWgAABNwAAAAUZ1hZWgAABPAAAAAUYlhZWgAABQQAAAAUclRSQwAABRgAAAgMYWFy - ZwAADSQAAAAgdmNndAAADUQAAAYSbmRpbgAAE1gAAAY+Y2hhZAAAGZgAAAAsbW1vZAAA - GcQAAAAoYlRSQwAABRgAAAgMZ1RSQwAABRgAAAgMYWFiZwAADSQAAAAgYWFnZwAADSQA - AAAgZGVzYwAAAAAAAAAIRGlzcGxheQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AG1sdWMAAAAAAAAAEgAAAAxubE5MAAAAFgAAAOhuYk5PAAAAEgAAAP5kYURLAAAAHAAA - ARBlblVTAAAAEgAAASxwbFBMAAAAEgAAAT5mckZSAAAAFgAAAVBwdEJSAAAAGAAAAWZw - dFBUAAAAFgAAAX56aENOAAAADAAAAZRlc0VTAAAAEgAAAaBqYUpQAAAADgAAAbJydVJV - AAAAJAAAAcBzdlNFAAAAEAAAAeR6aFRXAAAADgAAAfRkZURFAAAAEAAAAgJpdElUAAAA - FAAAAhJmaUZJAAAAEAAAAiZrb0tSAAAADAAAAjYASwBsAGUAdQByAGUAbgAtAEwAQwBE - AEYAYQByAGcAZQAtAEwAQwBEAEwAQwBEAC0AZgBhAHIAdgBlAHMAawDmAHIAbQBDAG8A - bABvAHIAIABMAEMARABLAG8AbABvAHIAIABMAEMARABMAEMARAAgAGMAbwB1AGwAZQB1 - AHIATABDAEQAIABDAG8AbABvAHIAaQBkAG8ATABDAEQAIABhACAAQwBvAHIAZQBzX2mC - cgAgAEwAQwBEAEwAQwBEACAAYwBvAGwAbwByMKsw6TD8ACAATABDAEQEJgQyBDUEQgQ9 - BD4EOQAgBBYEGgAtBDQEOARBBD8EOwQ1BDkARgDkAHIAZwAtAEwAQwBEX2mCcm2yZnaY - b3k6VmgARgBhAHIAYgAtAEwAQwBEAEwAQwBEACAAYwBvAGwAbwByAGkAVgDkAHIAaQAt - AEwAQwBEzuy37AAgAEwAQwBEAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwg - MjAxMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNSAAEAAAABFs9YWVogAAAA - AAAAYZwAADaEAAAHTVhZWiAAAAAAAABtlgAAr/wAABiOWFlaIAAAAAAAACejAAAZgAAA - s1JjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADYAOwBAAEUASgBPAFQA - WQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8AowCoAK0AsgC3ALwAwQDGAMsA0ADV - ANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4B - dQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJB - AksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MD - TwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSM - BJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYG - FgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfS - B+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J - 5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwq - DEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO - 0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGq - EckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U - 8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhl - GIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCoc - Uhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBs - IJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNol - CSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQ - KgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4v - JC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSe - NNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6 - sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDn - QSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tH - wEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63 - TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9W - XFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4a - XmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1m - kmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8e - b3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4 - bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HN - gjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL - /IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0 - lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNih - R6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axc - rNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4 - WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRR - xM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrR - PNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c - 3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr - ++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH - +lf65/t3/Af8mP0p/br+S/7c/23//3BhcmEAAAAAAAMAAAACZmYAAPKnAAANWQAAE9AA - AAoOdmNndAAAAAAAAAAAAAMBAAACAAAABQAVADIAXwCbAOgBNQGJAewCXALaA2MD+QSk - BV4GJwb4B9gIyAnICtAL3Az2Dg0PNxBdEYUSrBPSFPUWEhclGDkZQBpFG0IcMB0XHgIe - 6h/UIL0hqiKYI4okfiVyJmknXyhXKVcqVytXLFstZS5tL3kwiTGaMqwzwzTfNfs3Fzg8 - OVs6fDuQPJ09qz64P8JAz0HfQu5D/EUNRh5HMUhBSVFKZ0t7TI9NpU64T8tQ41H6UxFU - J1U/VlhXdViYWcBa71wdXUpedl+jYNBiAGMyZGJlmGbTaAtpSWqMa9RtGm5pb7txEnJt - c8p1KnaOd9N47noAexB8JH00fkV/UIBegWeCaoNyhHCFaoZlh1mISok1ih+LBIvnjMmN - pY6Aj12QQZEqkhKS+pPjlMuVtJabl4OYbZlXmkObL5wbnQmd+Z7rn9+g1KHMosWjvaS6 - paWmhqdsqFOpOKogqwir76zYrcOurq+bsIaxcrJfs020O7Uqthm3BbfyuN+5y7qnu3+8 - Vr0vvgq+5b/CwJ7BfsJew0DEJcUNxfXG4cfPyL7JsMqly5zMk82IznfPZdBR0T3SKtMa - 1AfU9dXm1tbXydi82bHap9uf3Jfdk96N34vgiOGG4ozjkeSQ5Ynmfedz6GnpYeph62fs - eO2c7tLwIvGW8yr05PbW+Pv7b/4m//8AAAAHACEAUACWAPYBOgGIAeQCSAK4AzkDzARm - BQsFxQaJB1sIOQkgChYLGwwcDSsOQA9eEHkRmBK2E9QU7xYAFw4YGRkhGh4bFhwCHOcd - zx65H6EgiSFzImEjUiRFJTMmKCcdKA8pDSoIKwEsAS0FLgkvDTAVMRsyJjM2NEY1WjZq - N4I4lzmqOrI7sDyuPa0+qT+nQKlBqkKqQ6xErkWxRrNHtki6ScBKxUvJTM5N0U7YT99Q - 5FHqUvFT+VUFVhZXLlhLWWhahFugXL1d2176YBthO2JgY4tks2XfZxBoRWl4arNr8m01 - bnpvwXELclhzjHShda92u3fKeNd543rue/l9An4Hfw2AEYESghKDEIQNhQWF/Yb0h+iI - 3YnOir+LroyWjYKOaI9TkD6RKpIXkwST8pTlldiWzZfDmLuZs5qwm66crp2xnrWfvKDB - ociiu6OdpIelc6Zfp02oPKksqh6rEqwIrP6t867pr+Cw2LHMssWzu7SstZ62kLeDuHi5 - a7pdu1C8Q702vim/HMAQwQPB9sLrw+HE1MXMxsPHusizya3KqsumzKnNv87az/LRB9Ic - 0zHUQtVT1mXXdtiI2ZvasNvG3OHd+t8a4DvhYOKH46/k2eYK5zrobOmm6uTsI+1o7rLw - AvFW8qr0BPVk9sX4J/mO+vX8W/2+/xf//wAAAAYADgAhAD4AZgCYANUBFwFWAZ0B7gJL - ArEDIQOYBBoEpQU7BdsGfwcqB9wIkQlNCg8KyguLDE4NEA3NDoQPOg/vEJ0RSBHtEogT - JBO9FFcU8RWLFicWxBdjGAQYoxlFGekajhs1G90chh0yHeMekx9EH/kgrCFjIh8i2yOX - JFQlGCXYJpUnSyf0KKApTCn3KqQrUywDLLUtZy4cLtEvhzA/MPoxtTJxMzAz7DSqNWk2 - LDbrN6s4bjkxOfU6tzt7PEM9Cj3SPpo/YkArQPZBwUKNQ1xELkT9Rc9GpEd7SE9JKUoD - St9LvEyaTXhOWU8vT/5QzFGcUm5TQVQZVPBVy1aoV4ZYallNWjVbIFwNXPxd7F7eX9Ng - yGHAYrdjrmSkZZNmgmdvaGBpU2pGaztsL20mbiBvGnAXcRVyE3MSdBN1FnYadx54JXks - ejF7M3wZfPF9yH6ff3KAR4EZgemCu4OOhGGFNIYHhtuHsoiLiWKKP4sci/qM2Y27jpyP - cZBEkReR7pLJk6eUiJVrllaXRJg1mS+aLJstnDOdPp5Mn16gdKGPoqujvaTDpcSmxqfI - qM6p16rgq+ys/K4Lrx6wM7FIsl+zdrSNtae2vrfYuO+6CLtBvKO9+r9KwJ/B/sNoxODG - bcgSydvLv83S0CjSwtWp2Q7dDuIi6MDzHP//AABuZGluAAAAAAAABjYAAJkCAABWyAAA - VQQAAJGwAAAncwAAFwoAAFANAABUOQACCj0AAfrhAAEmZgADAQAAAgAAABMALABFAF8A - eACRAKsAxQDfAPkBFAEwAUwBagGHAaYBxgHnAgoCLgJUAnwCpwLTAwMDNQNqA6UD5AQk - BGcErATzBTsFhQXPBhwGaga6BwwHXQewCAUIWwiwCQgJYQm6ChQKcQrNCyoLhwvmDEcM - pg0JDWwN1Q5EDrUPJg+cEBQQixEEEX8R/RJ6EvoTexP/FIUVChWRFhsWpRcyF8IYUxji - GXYaCxqiGzob0xxsHQQdnB4xHscfYB/6IJchNCHUInQjFCO2JFok/SWdJkIm5yeLKC4o - zyl1KhkquyteLAAsoi1ELeYuiy8sL84wejFEMh0y+TPXNLM1mDZ7N2c4UTlDOj07Mzw2 - PT8+Sj9gQHtBokLMRAJFOUZ+R8hJEkpRS5BM1E4ZT2JQrVH+U09UoVX3V0pYo1n9W1Vc - rV4GX19gt2IPY2xkw2Y3Z8FpQmrIbFNt2m9pcPhyhXQVdaV3PHjRemp8A32gfzuA4YKJ - hDKF4IexiY+Lc41SjzORFJL7lNqWvZiemnicV54woAih36O0pYanVqkpqwes8q7jsNiy - 0rTEtsK4v7q5vLi+tcCywq/ErcaqyKnKocyjzpzQntKd1IrWh9iS2qzc0t7v4RnjM+VC - 50fpMOr/7LvuW+/h8UvypvPw9Sn2Svdi+G75aPpX+zb8EPze/aT+l///AAAADAAjADwA - VABuAIcAoQC7ANYA8QEMASkBRgFkAYIBogHDAeUCCQIuAlUCfwKrAtkDCQM9A3QDsAPw - BDEEdAS6BQIFSwWVBeAGLwZ+Bs8HIwd1B8oIIgh5CNEJKwmHCeMKQgqhCwALYQvCDCcM - igzwDVgNww44DrAPKA+kECMQoREhEaQSKBKuEzYTwBRMFNoVaBX5FowXIRe5GFMY6xmJ - GigayRtrHA4csR1SHfEekB8xH9QgeSEfIccicCMaI8UkciUeJcgmdickJ9IofSkqKdoq - hyszK+AsjC05LeUuli9BL/AwrTGBMl4zPjQfNQE16TbRN744qzmgOpg7kDyRPZM+mz+l - QLVBzkLkRAVFJEZMR3dIpknjSx5MYk2jTuZQK1FxUr1UAVVKVpFX2lkiWm5btFz8XkRf - jGDTYhljZWSsZhJnmWkUapBsEW2Mbw5wjnIMc4x1CXaPeBR5m3sjfLR+QH/TgXCDEISy - hlWH94mgi0+M/I6tkGCSGpPRlYyXTpkMmsyck55WoByh5KOspXSnOqkFqsKsY64Cr6ex - UrMCtK+2abglueG7n71kvyTA6MKqxG7GK8fvyajLY80dztLQi9JA0/fVptdX2Qzaudxg - 3gXfreFP4u3kiuYg57LpSurf7HDt+++I8RbypfQw9bj3R/jW+mT7/f2O//8AAAAdAEQA - agCRALgA3wEIATIBXgGLAbwB7gIkAl4CngLiAywDfwPcBD4EpgUSBYEF8wZqBuMHXwfe - CGAI4QlnCe4KeQsDC48MIAyvDUMN4Q6SD0UP/hC4EXQSMxL0E7cUfhVDFg0W2BeoGHoZ - TBolGv8b2xy6HZ8egh9oIFEhPiItIx0kESUFJfgm8SfpKN8p3SrXK9Qs0S3PLtIv0zDk - MgQzJzRINWs2izevOM458jsOPC89TT5pP4VAokHCQt1D/kUaRj1HYEiFSbhK7UwpTWFO - mk/VURBSUVOMVMlWCVdEWIVZxlsIXEldjF7QYBVhWmKgY+5lQmbRaHJqD2u8bWZvH3DZ - cpR0UnYUd9l5nHtcfSJ+3oChgmSEJIXmh8eJsIubjXuPWJEwkwaUzpaVmFaaB5u6nWef - DqCyolKj76WIpx6otKpZrBWt3q+osXSzPbUAtsm4j7pQvBK92L+UwVfDGMTaxp7IZcoo - y/TNu8+L0V7TItSU1gnXidkT2p7cJN2j3xvgi+Hx40zkneXj5xjoQOli6nvrg+yF7XLu - Xe838A/w1/Gf8lfzDvO79Fj09vWL9hf2o/co95z4D/iD+PH5Uvm0+hb6ePrK+xP7XPul - ++78N/x2/Kb81f0F/TT9ZP2T/cP98/4i/k/+ev6l/tD++/8n/1L/ff+o/9T//wAAc2Yz - MgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAAwGxtbW9kAAAAAAAA - BhAAAJxnAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - ReadOnly NO RowAlign @@ -512,7 +228,7 @@ ExpandedCanvases Frame - {{78, 0}, {591, 828}} + {{244, 0}, {591, 828}} ListView OutlineWidth @@ -524,7 +240,7 @@ SidebarWidth 138 VisibleRegion - {{0.5, 1.5}, {219.5, 352}} + {{0.5, 2}, {219.5, 351.5}} Zoom 2 ZoomValues @@ -536,7 +252,5 @@ - saveQuickLookFiles - YES diff --git a/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png b/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png index 497f46cbb29b6c3224e33cc393b577c9132aaa16..714e00cbec089c6f44f6a3b9a84d472bc9d660c2 100644 GIT binary patch literal 8673 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 Lo%AA*|u%tg!g`b!t>$6Pq+}Rsw{_! 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 Date: Thu, 13 Aug 2015 20:11:24 +0000 Subject: [PATCH 030/160] M src/main/java/javax/servlet/package.html - State that something in this package changed in Servlet 4.0 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64042 --- src/main/java/javax/servlet/package.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/javax/servlet/package.html b/src/main/java/javax/servlet/package.html index bb385fd6..d2eace94 100644 --- a/src/main/java/javax/servlet/package.html +++ b/src/main/java/javax/servlet/package.html @@ -66,10 +66,10 @@ -The javax.servlet package contains a number of classes and interfaces that -describe and define the contracts between a servlet class and the -runtime environment provided for an instance of such a class by a -conforming servlet container. +The javax.servlet package +contains a number of classes and interfaces that describe and define the +contracts between a servlet class and the runtime environment provided +for an instance of such a class by a conforming servlet container. From 57b5ef13d67b5832a23ce69b36d3f62bdc1c1db4 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 13 Aug 2015 20:27:54 +0000 Subject: [PATCH 031/160] fix a version in javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64043 --- src/main/java/javax/servlet/ServletContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 3da944df..e04cfaff 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -187,7 +187,7 @@ public interface ServletContext { /** * Returns the minor version of the Servlet API that this * servlet container supports. All implementations that comply - * with Version 3.0 must have this method return the integer 0. + * with Version 4.0 must have this method return the integer 0. * * @return 0 */ From 3b74bbb0d0887664feb3f9b68c212852adb746d8 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 20:43:30 +0000 Subject: [PATCH 032/160] M src/main/java/javax/servlet/package.html - State that something in this package changed in Servlet 4.0 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64044 --- src/main/java/javax/servlet/package.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/package.html b/src/main/java/javax/servlet/package.html index d2eace94..accb8577 100644 --- a/src/main/java/javax/servlet/package.html +++ b/src/main/java/javax/servlet/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development From f7423455e4ad912033dd50a3bc5a6b297da7a09c Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 21:39:07 +0000 Subject: [PATCH 033/160] M src/main/java/javax/servlet/ServletContext.java D src/main/javadoc/doc-files/changed_modified_4_0.png D src/main/javadoc/doc-files/changed_added_4_0.png D src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur D src/main/javadoc/doc-files/changed_added_4_0_cursor.cur D src/main/javadoc/doc-files/changed_deleted_4_0.png D src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur M src/main/javadoc/javax.servlet-api.css - At Shing-wai's request, remove color coded changebars svn path=/trunk/api/javaee-api/javax.servlet/; revision=64045 --- .../java/javax/servlet/ServletContext.java | 46 ++++++++---------- .../javadoc/doc-files/changed_added_4_0.png | Bin 748 -> 0 bytes .../doc-files/changed_added_4_0_cursor.cur | Bin 2238 -> 0 bytes .../javadoc/doc-files/changed_deleted_4_0.png | Bin 748 -> 0 bytes .../doc-files/changed_deleted_4_0_cursor.cur | Bin 2238 -> 0 bytes .../doc-files/changed_modified_4_0.png | Bin 748 -> 0 bytes .../doc-files/changed_modified_4_0_cursor.cur | Bin 2238 -> 0 bytes src/main/javadoc/javax.servlet-api.css | 4 +- 8 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 src/main/javadoc/doc-files/changed_added_4_0.png delete mode 100755 src/main/javadoc/doc-files/changed_added_4_0_cursor.cur delete mode 100644 src/main/javadoc/doc-files/changed_deleted_4_0.png delete mode 100755 src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur delete mode 100644 src/main/javadoc/doc-files/changed_modified_4_0.png delete mode 100755 src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index e04cfaff..26f4802f 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -69,10 +69,9 @@ import javax.servlet.descriptor.JspConfigDescriptor; /** - * Defines a set of methods - * that a servlet uses to communicate with its servlet container, for - * example, to get the MIME type of a file, dispatch requests, or write - * to a log file. + * Defines a set of methods that a servlet uses to communicate with its + * servlet container, for example, to get the MIME type of a file, + * dispatch requests, or write to a log file. * *

    There is one context per "web application" per Java Virtual Machine. (A * "web application" is a collection of servlets and content installed under a @@ -591,12 +590,11 @@ public interface ServletContext { /** - * Returns a - * String containing the value of the named + * Returns a String containing the value of the named * context-wide initialization parameter, or null if - * the parameter does not exist. If - * the parameter exists, but is value is {@code null} the literal - * String "null" without the quotes must be returned. + * the parameter does not exist. If the parameter exists, but is + * value is {@code null} the literal String "null" without the + * quotes must be returned. * *

    This method can make available configuration information useful * to an entire web application. For example, it can provide a @@ -608,13 +606,12 @@ public interface ServletContext { * * @return a String containing the value of the * context's initialization parameter, or null if the - * context's initialization parameter does not exist. If the parameter exists, but is value - * is {@code null} the literal String "null" without the quotes must - * be returned. + * context's initialization parameter does not exist. If the + * parameter exists, but is value is {@code null} the literal String + * "null" without the quotes must be returned. * - * @throws NullPointerException if - * the argument {@code name} is {@code null} + * @throws NullPointerException if the argument {@code name} is + * {@code null} * * @see ServletConfig#getInitParameter */ @@ -663,12 +660,10 @@ public interface ServletContext { /** - * Returns the servlet - * container attribute with the given name, or null if - * there is no attribute by that name. If the parameter exists, but is value - * is {@code null} the literal String "null" without the quotes must - * be returned. + * Returns the servlet container attribute with the given name, or + * null if there is no attribute by that name. If the + * parameter exists, but is value is {@code null} the literal String + * "null" without the quotes must be returned. * *

    An attribute allows a servlet container to give the * servlet additional information not @@ -690,16 +685,15 @@ public interface ServletContext { * * @return an Object containing the value of the * attribute, or null if no attribute - * exists matching the given name If the parameter + * exists matching the given name If the parameter * exists, but is value is {@code null} the literal * String "null" without the quotes must be - * returned. + * returned. * * @see ServletContext#getAttributeNames * - * @throws NullPointerException if - * the argument {@code name} is {@code null} + * @throws NullPointerException if the argument {@code name} is + * {@code null} * */ public Object getAttribute(String name); diff --git a/src/main/javadoc/doc-files/changed_added_4_0.png b/src/main/javadoc/doc-files/changed_added_4_0.png deleted file mode 100644 index c1f4b583d7260ab573457dc5de8d782df72a5663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 748 zcmeAS@N?(olHy`uVBq!ia0vp^Aa)f88<1=hI8+0qI14-?iy0WWg+Z8+Vb&Z8pdd@S zqpu?a!^Xav-+_~Xe1&9>AYY(HRR)HJW(J0z|AF*N28L1t28LG&3=CE?7#PI!C&eFi zV_;xP@^onOFoaaxso78x0TwDTIeXC7k(NBmWyEV9I3hboFyt=akR{0ARzcPyhe` diff --git a/src/main/javadoc/doc-files/changed_added_4_0_cursor.cur b/src/main/javadoc/doc-files/changed_added_4_0_cursor.cur deleted file mode 100755 index 873e552c6f2edc98517b0becfb75b4f4b6fcc4d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmeIzA#5697{>93ZAqt!TS851u9@XL?IfJSP&}5T6X!6ks)Xc3WizoX%ORFC4Go4= zaLq((PBkb<>Xu$=m+KSZ25H%L5nQ-+gfJcNe5rDrsj&`S|))ddJawvO_+Q zlK7Bu{3d^Ud?`I2A1j;G^Oxs?$z-C*Y@+o07i!0{d`f1RJdX#)2kB4K=TD!Mq^4+Y z>L;e|)KnjtoDi2Km`S}0sdFlMzT`HQEbuXYh#%m6d>h*$4SWq>#XI;4o^_)L-^X|H zb-aVslHi3GUU)UNz{mI@et`G!ZG4LhXy9x3D&E0Y@F{+dPw-Rx2p{4@e1PxaJ9rQ8 z;tg+j!yDf4hF>yg%nRlz(`PnwpW^5E1V6=(@Y(7iIzac(9khpbS$~0#@k9Io@8jF} z7QTV6;j4HDU%|6(6yf{$F20U;3cABKF7Ppah#%m6eA|(==w^d%*63!HZaQ?cf=}^t ze1f0iNB9sQ;sbmS-@$u$H@jExhBv(74R8D&wrj?AU9erJY?se=HJeh3pW_q!6hFd; z_=4L<3w(?p;s!xLiyD;J0w3dt_yL|yTbm1exj~7g_&Gko zPw^u>%_(S5!m|^RKIxJ=aY#{v9v&WacXy}T+gn{h*d$JUmpV)6v1ffjrOC-rk;E*VXRsuC}(ew7I#-GxC4@(;c{4bM;qiz||T+edP*S z{U#qT|B&DHm&AYY(HRR)HJW(J0z|AF*N28L1t28LG&3=CE?7#PI!C&eFi zV_;xP@^o9Z+Y+XzTT%=)$7XxJFxghsl=`zxm^fDh3fU$nkOZ+T%T+9ANJ&kD z=p_?iPLZlM!7W^{OZx7AM;L}H%k1`jdCH~l@4n;S@0ycdsibOE`S|))ddJZRQY9Zr zNqosTdXxWo_$WOcA1RyE^N**4>2#{;e5&;O7ivecd`f1RJP!xP7wJ#a=d&{d-xXK&7Kv!;SFzi!yEq(+cjsqF4(RUw##R`+HEPtFYpO|h9BcY ze8Jx)-=M@&`~sig zXZSIm<`gt2;kOf!0qKzjaY#{v?(gq)dwZ*!n;TtSUFq`jQs?LA3d2yRr>6>nK*z_& z>i7FPI5?2!dD`FKSF6?1?(VK!*VWF>j<&Y8w7I#-Z{+{@r#n!6;qD(_EJdvP0-(P3 z5?TFyKAykA@A~s)J)T}reykUjsb?22EI-tX%gRn)Q_kw^%6g%!^=GeL`cI0yyZ>q& w+K+h8?k3x$yedyNR(BI^e442IZK7?mcRkVJ9WO4k5_wHFNSSPtJ#t8X0oz0bo&W#< diff --git a/src/main/javadoc/doc-files/changed_modified_4_0.png b/src/main/javadoc/doc-files/changed_modified_4_0.png deleted file mode 100644 index 93d9a62a26142fba7657693eb6e635e7688caab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 748 zcmeAS@N?(olHy`uVBq!ia0vp^Aa)f88<1=hI8+0qI14-?iy0WWg+Z8+Vb&Z8pdd@S zqpu?a!^Xav-+_~Xe1&9>AYY(HRR)HJW(J0z|AF*N28L1t28LG&3=CE?7#PI!C&eFi zV_;xP@^o9(wvbM7O2I72a-plYn{?EhT#UP`kPf%GBvVF(8#0CrrId3hw*-TW zWbmLvy4)mA3fW4ItOeix??Rd-7opIp{XQN&e1Cp=?{}xtE0wgnt9*QUE4}0BJ=rB6 zNJ+fNIC+ylJv@}2j!%?L>iNUd!DKSgWIj>)?K8C#Sw1B*OrD1WC?r9lGGF} zO#Q^voto++lM~{y1aql(C3Vgu&zIb$k|jRI5Ag%Mk8fjJq=B#Dt9S=r!Lx1@;rsY5 zzK(aWS`obP!V9mamiQPy#1HU3zKw5j0u6i(U&TB43O>az@Ckm3AK^oMh!5~Rd z-@-TWHGCEC;4666jUs#>-^JJQPC<9r#w9++5Ag%Mk8eA&7Ts*n%^KaT(oKhMR`4l) zflu&L{0JZ7Lwtbm;X8N_?`GEu-tdMuyy1=S!*9W_sIY8Pj_Hz&Dn3Q0b6ST^%qyj z>Xm#v|3!Y+pD*k2?FHq>dQq8r_Th!)hk9{Y+1pk$+mHCb s?#4T$yef}3R(E4pI%b*vq7@O`Y~JN~%LO5`=!AZ4;c4#+Y21##s8Y5)KL diff --git a/src/main/javadoc/javax.servlet-api.css b/src/main/javadoc/javax.servlet-api.css index ec16d8f1..ec5b99d0 100644 --- a/src/main/javadoc/javax.servlet-api.css +++ b/src/main/javadoc/javax.servlet-api.css @@ -617,8 +617,7 @@ div.contentContainer ul.blockList li.blockList h2{ /* Change bars from http://www.geocities.com/hentaihelper/2atimlin.htm */ -/* put a red "change" bar in the left margin */ - +/* .changed_added_4_0 { cursor: url(doc-files/changed_added_4_0_cursor.cur), auto; background: url(doc-files/changed_added_4_0.png); padding-left:0.2em; border-left:solid; @@ -638,3 +637,4 @@ div.contentContainer ul.blockList li.blockList h2{ border-top:none; border-bottom:none; border-color:red; text-decoration: line-through; } +*/ From 0addb393e76cbf80943ed585d753857a7c40bdf5 Mon Sep 17 00:00:00 2001 From: Romain Grecourt Date: Thu, 13 Aug 2015 22:02:31 +0000 Subject: [PATCH 034/160] empty checkin svn path=/trunk/api/javaee-api/javax.servlet/; revision=64046 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb35ea0e..a4740e14 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 1.33 Java Servlet API - + http://servlet-spec.java.net From bc850cb1204d9da7e4b1bb6a8c472fced684860b Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 13 Aug 2015 22:11:52 +0000 Subject: [PATCH 035/160] https://java.net/jira/browse/SERVLET_SPEC-83 M src/main/java/javax/servlet/ServletContext.java - Rework this. Remove the business about returning "null" without the quotes. Leave that case unspecified. GlassFish and Tomcat both return the empty string in that case anyway. - At Mark Thomas's suggestion, throw NPE if the "value" param to setInitParameter() or setAttribute() is null. - Declare that NPE should be thrown if a null value is passed to getInitParameter() or getAttribute(). svn path=/trunk/api/javaee-api/javax.servlet/; revision=64047 --- .../java/javax/servlet/ServletContext.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 26f4802f..9bbfbe38 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -592,9 +592,7 @@ public interface ServletContext { /** * Returns a String containing the value of the named * context-wide initialization parameter, or null if - * the parameter does not exist. If the parameter exists, but is - * value is {@code null} the literal String "null" without the - * quotes must be returned. + * the parameter does not exist. * *

    This method can make available configuration information useful * to an entire web application. For example, it can provide a @@ -606,9 +604,7 @@ public interface ServletContext { * * @return a String containing the value of the * context's initialization parameter, or null if the - * context's initialization parameter does not exist. If the - * parameter exists, but is value is {@code null} the literal String - * "null" without the quotes must be returned. + * context's initialization parameter does not exist. * * @throws NullPointerException if the argument {@code name} is * {@code null} @@ -648,6 +644,8 @@ public interface ServletContext { * @throws IllegalStateException if this ServletContext has already * been initialized * + * @throws NullPointerException if the argument value is {@code null} + * * @throws UnsupportedOperationException if this ServletContext was * passed to the {@link ServletContextListener#contextInitialized} method * of a {@link ServletContextListener} that was neither declared in @@ -661,9 +659,7 @@ public interface ServletContext { /** * Returns the servlet container attribute with the given name, or - * null if there is no attribute by that name. If the - * parameter exists, but is value is {@code null} the literal String - * "null" without the quotes must be returned. + * null if there is no attribute by that name. * *

    An attribute allows a servlet container to give the * servlet additional information not @@ -685,10 +681,7 @@ public interface ServletContext { * * @return an Object containing the value of the * attribute, or null if no attribute - * exists matching the given name If the parameter - * exists, but is value is {@code null} the literal - * String "null" without the quotes must be - * returned. + * exists matching the given name. * * @see ServletContext#getAttributeNames * @@ -734,6 +727,9 @@ public interface ServletContext { * * @param object an Object representing the * attribute to be bound + * + * @throws NullPointerException if the argument value is {@code null} + * */ public void setAttribute(String name, Object object); From 6487def74d142ad71435fbbd52023699b939c1fc Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 14 Aug 2015 16:17:46 +0000 Subject: [PATCH 036/160] https://java.net/jira/browse/SERVLET_SPEC-83 M src/main/java/javax/servlet/ServletContext.java - Thanks to Mark Thomas, clarify that the NPE is thrown if the name, not value, parameter is null. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64048 --- src/main/java/javax/servlet/ServletContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 9bbfbe38..30a125b7 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -644,7 +644,7 @@ public interface ServletContext { * @throws IllegalStateException if this ServletContext has already * been initialized * - * @throws NullPointerException if the argument value is {@code null} + * @throws NullPointerException if the name parameter is {@code null} * * @throws UnsupportedOperationException if this ServletContext was * passed to the {@link ServletContextListener#contextInitialized} method @@ -728,7 +728,7 @@ public interface ServletContext { * @param object an Object representing the * attribute to be bound * - * @throws NullPointerException if the argument value is {@code null} + * @throws NullPointerException if the name parameter is {@code null} * */ public void setAttribute(String name, Object object); From 6dd645df17e8cc9e4e6e7a7ad8ce251fb427c6ec Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 14 Aug 2015 17:17:48 +0000 Subject: [PATCH 037/160] M pom.xml - Revert to version that conforms to . svn path=/trunk/api/javaee-api/javax.servlet/; revision=64049 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4740e14..924666b3 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-m01-SNAPSHOT + 4.0.0-b01-SNAPSHOT 4.0 From 37cf2348cd87fb6b72ed0b620bad57b1cc578298 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 14 Aug 2015 21:42:16 +0000 Subject: [PATCH 038/160] M src/main/java/javax/servlet/package.html - Remove color coded changebar svn path=/trunk/api/javaee-api/javax.servlet/; revision=64051 --- src/main/java/javax/servlet/package.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/javax/servlet/package.html b/src/main/java/javax/servlet/package.html index accb8577..c1d2d223 100644 --- a/src/main/java/javax/servlet/package.html +++ b/src/main/java/javax/servlet/package.html @@ -66,10 +66,10 @@ -The javax.servlet package -contains a number of classes and interfaces that describe and define the -contracts between a servlet class and the runtime environment provided -for an instance of such a class by a conforming servlet container. +The javax.servlet package contains a number of classes and interfaces that +describe and define the contracts between a servlet class and the +runtime environment provided for an instance of such a class by a +conforming servlet container. From 54ea68450106a25d3814af1c4782752138e18a4b Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 18 Aug 2015 18:27:27 +0000 Subject: [PATCH 039/160] fix issues https://java.net/jira/browse/SERVLET_SPEC-135 ("Adding @Deprecated for those with @deprecated in javadoc") https://java.net/jira/browse/SERVLET_SPEC-136 ("Deprecated HttpServletRequestWrapper#isRequestedSessionIdFromUrl()") svn path=/trunk/api/javaee-api/javax.servlet/; revision=64060 --- src/main/java/javax/servlet/ServletContext.java | 4 ++++ src/main/java/javax/servlet/ServletRequestWrapper.java | 1 + src/main/java/javax/servlet/SingleThreadModel.java | 4 ++-- src/main/java/javax/servlet/UnavailableException.java | 8 ++++---- src/main/java/javax/servlet/http/HttpServletRequest.java | 2 +- .../javax/servlet/http/HttpServletRequestWrapper.java | 4 ++++ src/main/java/javax/servlet/http/HttpServletResponse.java | 5 ++++- .../javax/servlet/http/HttpServletResponseWrapper.java | 3 +++ src/main/java/javax/servlet/http/HttpSession.java | 5 +++++ src/main/java/javax/servlet/http/HttpSessionContext.java | 7 +++---- src/main/java/javax/servlet/http/HttpUtils.java | 3 ++- 11 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 30a125b7..e487ba50 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -458,6 +458,7 @@ public interface ServletContext { * @throws ServletException if an exception has occurred that interfaces * with servlet's normal operation */ + @Deprecated public Servlet getServlet(String name) throws ServletException; @@ -474,6 +475,7 @@ public interface ServletContext { * * @return an Enumeration of {@code javax.servlet.Servlet Servlet} */ + @Deprecated public Enumeration getServlets(); @@ -489,6 +491,7 @@ public interface ServletContext { * * @return an Enumeration of {@code javax.servlet.Servlet Servlet} names */ + @Deprecated public Enumeration getServletNames(); @@ -516,6 +519,7 @@ public interface ServletContext { * @param exception the Exception error * @param msg a String that describes the exception */ + @Deprecated public void log(Exception exception, String msg); diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java index 124893d1..f7948a7b 100644 --- a/src/main/java/javax/servlet/ServletRequestWrapper.java +++ b/src/main/java/javax/servlet/ServletRequestWrapper.java @@ -354,6 +354,7 @@ public RequestDispatcher getRequestDispatcher(String path) { * @deprecated As of Version 2.1 of the Java Servlet API, * use {@link ServletContext#getRealPath} instead */ + @Deprecated public String getRealPath(String path) { return this.request.getRealPath(path); } diff --git a/src/main/java/javax/servlet/SingleThreadModel.java b/src/main/java/javax/servlet/SingleThreadModel.java index 16cf1283..97bd767c 100644 --- a/src/main/java/javax/servlet/SingleThreadModel.java +++ b/src/main/java/javax/servlet/SingleThreadModel.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -85,6 +85,6 @@ * @deprecated As of Java Servlet API 2.4, with no direct * replacement. */ - +@Deprecated public interface SingleThreadModel { } diff --git a/src/main/java/javax/servlet/UnavailableException.java b/src/main/java/javax/servlet/UnavailableException.java index 13c288c8..5588dcc7 100644 --- a/src/main/java/javax/servlet/UnavailableException.java +++ b/src/main/java/javax/servlet/UnavailableException.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -107,7 +107,7 @@ public class UnavailableException * descriptive message * */ - + @Deprecated public UnavailableException(Servlet servlet, String msg) { super(msg); this.servlet = servlet; @@ -130,7 +130,7 @@ public UnavailableException(Servlet servlet, String msg) { * displayed for the user. * */ - + @Deprecated public UnavailableException(int seconds, Servlet servlet, String msg) { super(msg); this.servlet = servlet; @@ -218,7 +218,7 @@ public boolean isPermanent() { * throwing the UnavailableException * */ - + @Deprecated public Servlet getServlet() { return servlet; } diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index a5b81d26..7b09f955 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -582,8 +582,8 @@ public interface HttpServletRequest extends ServletRequest { * @return true if the session ID * came in as part of a URL; otherwise, * false - */ + @Deprecated public boolean isRequestedSessionIdFromUrl(); /** diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index f2fc269d..25bd2efd 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -322,7 +322,11 @@ public boolean isRequestedSessionIdFromURL() { /** * The default behavior of this method is to return isRequestedSessionIdFromUrl() * on the wrapped request object. + * + * @deprecated As of Version 4.0 of the Java Servlet API, + * use {@link #isRequestedSessionIdFromURL} instead. */ + @Deprecated @Override public boolean isRequestedSessionIdFromUrl() { return this._getHttpServletRequest().isRequestedSessionIdFromUrl(); diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java index e47ca909..8e67ce83 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponse.java +++ b/src/main/java/javax/servlet/http/HttpServletResponse.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -161,6 +161,7 @@ public interface HttpServletResponse extends ServletResponse { * the unchanged URL otherwise. * @exception IllegalArgumentException if the url is not valid */ + @Deprecated public String encodeUrl(String url); /** @@ -172,6 +173,7 @@ public interface HttpServletResponse extends ServletResponse { * the unchanged URL otherwise. * @exception IllegalArgumentException if the url is not valid */ + @Deprecated public String encodeRedirectUrl(String url); /** @@ -376,6 +378,7 @@ public interface HttpServletResponse extends ServletResponse { * @param sc the status code * @param sm the status message */ + @Deprecated public void setStatus(int sc, String sm); /** diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java index affac5da..fd7b63de 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java @@ -134,6 +134,7 @@ public String encodeRedirectURL(String url) { * @deprecated As of version 2.1, use {@link #encodeURL(String url)} * instead */ + @Deprecated @Override public String encodeUrl(String url) { return this._getHttpServletResponse().encodeUrl(url); @@ -146,6 +147,7 @@ public String encodeUrl(String url) { * @deprecated As of version 2.1, use * {@link #encodeRedirectURL(String url)} instead */ + @Deprecated @Override public String encodeRedirectUrl(String url) { return this._getHttpServletResponse().encodeRedirectUrl(url); @@ -250,6 +252,7 @@ public void setStatus(int sc) { * use {@link #setStatus(int)}, to send an error with a description * use {@link #sendError(int, String)} */ + @Deprecated @Override public void setStatus(int sc, String sm) { this._getHttpServletResponse().setStatus(sc, sm); diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java index eb56e998..992afbf8 100644 --- a/src/main/java/javax/servlet/http/HttpSession.java +++ b/src/main/java/javax/servlet/http/HttpSession.java @@ -214,6 +214,7 @@ public interface HttpSession { * * @return the {@link HttpSessionContext} for this session. */ + @Deprecated public HttpSessionContext getSessionContext(); @@ -242,6 +243,7 @@ public interface HttpSession { * @exception IllegalStateException if this method is called on an * invalidated session */ + @Deprecated public Object getValue(String name); @@ -272,6 +274,7 @@ public interface HttpSession { * @exception IllegalStateException if this method is called on an * invalidated session */ + @Deprecated public String[] getValueNames(); @@ -318,6 +321,7 @@ public interface HttpSession { * @exception IllegalStateException if this method is called on an * invalidated session */ + @Deprecated public void putValue(String name, Object value); @@ -352,6 +356,7 @@ public interface HttpSession { * @exception IllegalStateException if this method is called on an * invalidated session */ + @Deprecated public void removeValue(String name); diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java index ac47f36d..b984c913 100644 --- a/src/main/java/javax/servlet/http/HttpSessionContext.java +++ b/src/main/java/javax/servlet/http/HttpSessionContext.java @@ -75,7 +75,7 @@ * */ - +@Deprecated public interface HttpSessionContext { /** @@ -84,12 +84,11 @@ public interface HttpSessionContext { * no replacement. This method must * return null and will be removed in * a future version of this API. - * @param sessionId the id of the session to be returned * * @return null in all cases */ - + @Deprecated public HttpSession getSession(String sessionId); @@ -105,7 +104,7 @@ public interface HttpSessionContext { * @return null * */ - + @Deprecated public Enumeration getIds(); } diff --git a/src/main/java/javax/servlet/http/HttpUtils.java b/src/main/java/javax/servlet/http/HttpUtils.java index 552ec125..a850bb11 100644 --- a/src/main/java/javax/servlet/http/HttpUtils.java +++ b/src/main/java/javax/servlet/http/HttpUtils.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -71,6 +71,7 @@ * to the request interfaces. * */ +@Deprecated public class HttpUtils { private static final String LSTRING_FILE = From f441eb8a0249de5eb4cbebf939590c0a8af17b59 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 18 Aug 2015 18:28:25 +0000 Subject: [PATCH 040/160] print all warnings svn path=/trunk/api/javaee-api/javax.servlet/; revision=64061 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 924666b3..d8f87c15 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 1.8 1.8 - -Xlint:unchecked + -Xlint:all From ce58cbde18261725f545d46f8daba663c94fd73e Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Mon, 28 Sep 2015 22:52:30 +0000 Subject: [PATCH 041/160] https://java.net/jira/browse/SERVLET_SPEC-143 SECTION: Modified Files M src/main/java/javax/servlet/http/HttpServlet.java + * @throws ServletException if the HTTP request cannot + * be handled or if either parameter is not + * an instance of its respective {@link HttpServletRequest} + * or {@link HttpServletResponse} counterparts. * * @see javax.servlet.Servlet#service */ - Added text to the @throws ServletException of HttpServlet.service(HttpServletRequest, HttpServletResponse). svn path=/trunk/api/javaee-api/javax.servlet/; revision=64145 --- .../java/javax/servlet/http/HttpServlet.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index eb0e483f..f91f4483 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/src/main/java/javax/servlet/http/HttpServlet.java @@ -196,11 +196,11 @@ public HttpServlet() { } * contains the response the servlet sends * to the client * - * @exception IOException if an input or output error is + * @throws IOException if an input or output error is * detected when the servlet handles * the GET request * - * @exception ServletException if the request for the GET + * @throws ServletException if the request for the GET * could not be handled * * @see javax.servlet.ServletResponse#setContentType @@ -275,9 +275,9 @@ protected long getLastModified(HttpServletRequest req) { * @param resp the response object that the servlet * uses to return the headers to the clien * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * - * @exception ServletException if the request for the HEAD + * @throws ServletException if the request for the HEAD * could not be handled */ protected void doHead(HttpServletRequest req, HttpServletResponse resp) @@ -338,11 +338,11 @@ protected void doHead(HttpServletRequest req, HttpServletResponse resp) * contains the response the servlet sends * to the client * - * @exception IOException if an input or output error is + * @throws IOException if an input or output error is * detected when the servlet handles * the request * - * @exception ServletException if the request for the POST + * @throws ServletException if the request for the POST * could not be handled * * @see javax.servlet.ServletOutputStream @@ -396,11 +396,11 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * PUT request * - * @exception ServletException if the request for the PUT + * @throws ServletException if the request for the PUT * cannot be handled */ protected void doPut(HttpServletRequest req, HttpServletResponse resp) @@ -442,11 +442,11 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * DELETE request * - * @exception ServletException if the request for the + * @throws ServletException if the request for the * DELETE cannot be handled */ protected void doDelete(HttpServletRequest req, @@ -513,11 +513,11 @@ private Method[] getAllDeclaredMethods(Class c) { * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * OPTIONS request * - * @exception ServletException if the request for the + * @throws ServletException if the request for the * OPTIONS cannot be handled */ protected void doOptions(HttpServletRequest req, HttpServletResponse resp) @@ -613,11 +613,11 @@ protected void doOptions(HttpServletRequest req, HttpServletResponse resp) * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * TRACE request * - * @exception ServletException if the request for the + * @throws ServletException if the request for the * TRACE cannot be handled */ protected void doTrace(HttpServletRequest req, HttpServletResponse resp) @@ -665,11 +665,11 @@ protected void doTrace(HttpServletRequest req, HttpServletResponse resp) * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * HTTP request * - * @exception ServletException if the HTTP request + * @throws ServletException if the HTTP request * cannot be handled * * @see javax.servlet.Servlet#service @@ -763,12 +763,14 @@ private void maybeSetLastModified(HttpServletResponse resp, * contains the response the servlet returns * to the client * - * @exception IOException if an input or output error occurs + * @throws IOException if an input or output error occurs * while the servlet is handling the * HTTP request * - * @exception ServletException if the HTTP request cannot - * be handled + * @throws ServletException if the HTTP request cannot + * be handled or if either parameter is not + * an instance of its respective {@link HttpServletRequest} + * or {@link HttpServletResponse} counterparts. * * @see javax.servlet.Servlet#service */ From a5a8d7c3fbbec9da808f74247930edc245e9e8a4 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 29 Sep 2015 17:44:28 +0000 Subject: [PATCH 042/160] M src/main/java/javax/servlet/http/HttpServlet.java - Fix copyright year. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64146 --- src/main/java/javax/servlet/http/HttpServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index f91f4483..81e53215 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/src/main/java/javax/servlet/http/HttpServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From 53a97b6fdff206112c49fc84c3921a4c70220f33 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 2 Oct 2015 20:41:33 +0000 Subject: [PATCH 043/160] https://java.net/jira/browse/SERVLET_SPEC-134 SECTION: Modified Files A src/main/java/javax/servlet/http/PushBuilder.java M src/main/java/javax/servlet/http/HttpServletRequest.java - Merge topic branch to trunk svn path=/trunk/api/javaee-api/javax.servlet/; revision=64148 --- .../servlet/http/HttpServletRequest.java | 39 ++- .../java/javax/servlet/http/PushBuilder.java | 298 ++++++++++++++++++ 2 files changed, 335 insertions(+), 2 deletions(-) create mode 100644 src/main/java/javax/servlet/http/PushBuilder.java diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 7b09f955..ac1e53fb 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -65,8 +65,8 @@ /** * - * Extends the {@link javax.servlet.ServletRequest} interface - * to provide request information for HTTP servlets. + * Extends the {@link javax.servlet.ServletRequest} interface to provide + * request information for HTTP servlets. * *

    The servlet container creates an HttpServletRequest * object and passes it as an argument to the servlet's service @@ -304,6 +304,41 @@ public interface HttpServletRequest extends ServletRequest { */ public String getPathTranslated(); + /** + * Returns a {@link PushBuilder} for issuing server push responses + * from the current request. If the current connection does not + * support server push, a valid {@code PushBuilder} must still be + * returned, but calling any of the methods on it will have no + * effect. + * + * @return a {@link PushBuilder} for issuing server push responses + * from the current request. + */ + default public PushBuilder getPushBuilder() { + return new PushBuilder() { + public PushBuilder method(String method) { return this; } + public PushBuilder queryString(String queryString) { return this; } + public PushBuilder sessionId(String sessionId) { return this; } + public PushBuilder conditional(boolean conditional) { return this; } + public PushBuilder setHeader(String name, String value) { return this; } + public PushBuilder addHeader(String name, String value) { return this; } + public PushBuilder removeHeader(String name) { return this; } + public PushBuilder path(String path) { return this; } + public PushBuilder etag(String etag) { return this; } + public PushBuilder lastModified(String lastModified) { return this; } + public void push() {} + public String getMethod() { return ""; } + public String getQueryString() { return ""; } + public String getSessionId() { return ""; } + public boolean isConditional() { return false; } + public Set getHeaderNames() { return Collections.emptySet(); } + public String getHeader(String name) { return ""; } + public String getPath() { return ""; } + public String getEtag() { return ""; } + public String getLastModified() { return ""; } + }; + } + /** * Returns the portion of the request URI that indicates the context * of the request. The context path always comes first in a request diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java new file mode 100644 index 00000000..aaae4845 --- /dev/null +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -0,0 +1,298 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + * + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright 2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.servlet.http; + +import java.util.Set; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +/** Build a request to be pushed. + * + *

    A PushBuilder is obtained by calling {@link + * HttpServletRequest#getPushBuilder()}. Each call to this method will + * return a new instance of a PushBuilder based off the current {@code + * HttpServletRequest}. Any mutations to the returned PushBuilder are + * not reflected on future returns.

    + * + *

    The instance is initialized as follows:

    + * + *
      + * + *
    • The method is initialized to "GET"
      • + * + *
    • The existing headers of the current {@link HttpServletRequest} + * are added to the builder, except for: + * + *
        + *
      • Conditional headers (eg. If-Modified-Since) + *
      • Range headers + *
      • Expect headers + *
      • Authorization headers + *
      • Referrer headers + *
      + * + *
      • + * + *
    • If the request was authenticated, an Authorization header will + * be set with a container generated token that will result in equivalent + * Authorization for the pushed request.
      • + * + *
    • The {@link HttpServletRequest#getRequestedSessionId()} value, + * unless at the time of the call {@link + * HttpServletRequest#getSession(boolean)} has previously been called to + * create a new {@link HttpSession}, in which case the new session ID + * will be used as the PushBuilder's requested session ID. The source of + * the requested session id will be the same as for the request
      • + * + *
    • The Referer(sic) header will be set to {@link + * HttpServletRequest#getRequestURL()} plus any {@link + * HttpServletRequest#getQueryString()}
      • + * + *
    • If {@link HttpServletResponse#addCookie(Cookie)} has been called + * on the associated response, then a corresponding Cookie header will be added + * to the PushBuilder, unless the {@link Cookie#getMaxAge()} is <=0, in which + * case the Cookie will be removed from the builder.
      • + * + *
    • If this request has has the conditional headers If-Modified-Since + * or If-None-Match, then the {@link #isConditional()} header is set to + * true.
      • + * + *
    + * + *

    The {@link #path} method must be called on the {@code PushBuilder} + * instance before the call to {@link #push}. Failure to do so must + * cause an exception to be thrown from {@link + * #push}, as specified in that method.

    + * + *

    A PushBuilder can be customized by chained calls to mutator + * methods before the {@link #push()} method is called to initiate an + * asynchronous push request with the current state of the builder. + * After the call to {@link #push()}, the builder may be reused for + * another push, however the implementation must make it so the {@link + * #path(String)}, {@link #etag(String)} and {@link + * #lastModified(String)} values are cleared before returning from + * {@link #push}. All other values are retained over calls to {@link + * #push()}. + * + * @since 4.0 + */ +public interface PushBuilder +{ + /** + *

    Set the method to be used for the push.

    + * + *

    Any non-empty String may be used for the method.

    + * + * @throws NullPointerException if the argument is {@code null} + * + * @throws IllegalArgumentException if the argument is the empty String + * + * @param method the method to be used for the push. + * @return this builder. + */ + public abstract PushBuilder method(String method); + + /** Set the query string to be used for the push. + * + * Will be appended to any query String included in a call to {@link + * #path(String)}. Any duplicate parameters must be preserved. This + * method should be used instead of a query in {@link #path(String)} + * when multiple {@link #push()} calls are to be made with the same + * query string. + * @param queryString the query string to be used for the push. + * @return this builder. + */ + public abstract PushBuilder queryString(String queryString); + + /** Set the SessionID to be used for the push. + * The session ID will be set in the same way it was on the associated request (ie + * as a cookie if the associated request used a cookie, or as a url parameter if + * the associated request used a url parameter). + * Defaults to the requested session ID or any newly assigned session id from + * a newly created session. + * @param sessionId the SessionID to be used for the push. + * @return this builder. + */ + public abstract PushBuilder sessionId(String sessionId); + + /** Set if the request is to be conditional. + * If the request is conditional, any available values from {@link #etag(String)} or + * {@link #lastModified(String)} will be set in the appropriate headers. If the request + * is not conditional, then etag and lastModified values are ignored. + * Defaults to true if the associated request was conditional. + * @param conditional true if the push request is conditional + * @return this builder. + */ + public abstract PushBuilder conditional(boolean conditional); + + /** + *

    Set a header to be used for the push. If the builder has an + * existing header with the same name, its value is overwritten.

    + * + * @param name The header name to set + * @param value The header value to set + * @return this builder. + */ + public abstract PushBuilder setHeader(String name, String value); + + + /** + *

    Add a header to be used for the push.

    + * @param name The header name to add + * @param value The header value to add + * @return this builder. + */ + public abstract PushBuilder addHeader(String name, String value); + + + /** + *

    Remove the named header. If the header does not exist, take + * no action.

    + * + * @param name The name of the header to remove + * @return this builder. + */ + public abstract PushBuilder removeHeader(String name); + + + + /** + * Set the URI path to be used for the push. The path may start + * with "/" in which case it is treated as an absolute path, + * otherwise it is relative to the context path of the associated + * request. There is no path default and {@link #path(String)} must + * be called before every call to {@link #push()}. If a query + * string is present in the argument {@code path}, its contents must + * be merged with the contents previously passed to {@link + * #queryString}, preserving duplicates. + * + * @param path the URI path to be used for the push, which may include a + * query string. + * @return this builder. + */ + public abstract PushBuilder path(String path); + + /** + * Set the etag to be used for conditional pushes. + * The etag will be used only if {@link #isConditional()} is true. + * Defaults to no etag. The value is nulled after every call to + * {@link #push()} + * @param etag the etag to be used for the push. + * @return this builder. + */ + public abstract PushBuilder etag(String etag); + + /** + * Set the last modified date to be used for conditional pushes. + * The last modified date will be used only if {@link + * #isConditional()} is true. Defaults to no date. The value is + * nulled after every call to {@link #push()} + * @param lastModified the last modified date to be used for the push. + * @return this builder. + * */ + public abstract PushBuilder lastModified(String lastModified); + + + /** Push a resource given the current state of the builder, + * returning immediately without blocking. + * + *

    Push a resource based on the current state of the PushBuilder. + * If {@link #isConditional()} is true and an etag or lastModified + * value is provided, then an appropriate conditional header will be + * generated. If both an etag and lastModified value are provided + * only an If-None-Match header will be generated. If the builder + * has a session ID, then the pushed request will include the + * session ID either as a Cookie or as a URI parameter as + * appropriate. The builders query string is merged with any passed + * query string.

    + * + *

    Before returning from this method, the builder has its path, + * etag and lastModified fields nulled. All other fields are left as + * is for possible reuse in another push.

    + * + * @throws IllegalArgumentException if the method set expects a + * request body (eg POST) + * + * @throws IllegalStateException if there was no call to {@link + * #path} on this instance either between its instantiation or the + * last call to {@code push()} that did not throw an + * IllegalStateException. + */ + public abstract void push(); + + + + + + public abstract String getMethod(); + public abstract String getQueryString(); + public abstract String getSessionId(); + public abstract boolean isConditional(); + public abstract Set getHeaderNames(); + public abstract String getHeader(String name); + public abstract String getPath(); + public abstract String getEtag(); + public abstract String getLastModified(); + + + +} From 756353d2373dacbb00e8f024c6d85608df24277f Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Mon, 5 Oct 2015 18:24:28 +0000 Subject: [PATCH 044/160] https://java.net/jira/browse/SERVLET_SPEC-134 SECTION: Modified Files M src/main/java/javax/servlet/http/HttpServlet.java - Remove unused import. M src/main/java/javax/servlet/http/HttpServletRequest.java - Fix findbugs error. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64149 --- .../java/javax/servlet/http/HttpServlet.java | 1 - .../servlet/http/HttpServletRequest.java | 27 +++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index 81e53215..e4841927 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/src/main/java/javax/servlet/http/HttpServlet.java @@ -65,7 +65,6 @@ import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.Enumeration; -import java.util.Locale; import java.util.ResourceBundle; import javax.servlet.*; diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index ac1e53fb..57ed796c 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -315,28 +315,51 @@ public interface HttpServletRequest extends ServletRequest { * from the current request. */ default public PushBuilder getPushBuilder() { - return new PushBuilder() { + return new NoOpPushBuilder(); + } + + static class NoOpPushBuilder implements PushBuilder { + @Override public PushBuilder method(String method) { return this; } + @Override public PushBuilder queryString(String queryString) { return this; } + @Override public PushBuilder sessionId(String sessionId) { return this; } + @Override public PushBuilder conditional(boolean conditional) { return this; } + @Override public PushBuilder setHeader(String name, String value) { return this; } + @Override public PushBuilder addHeader(String name, String value) { return this; } + @Override public PushBuilder removeHeader(String name) { return this; } + @Override public PushBuilder path(String path) { return this; } + @Override public PushBuilder etag(String etag) { return this; } + @Override public PushBuilder lastModified(String lastModified) { return this; } + @Override public void push() {} + @Override public String getMethod() { return ""; } + @Override public String getQueryString() { return ""; } + @Override public String getSessionId() { return ""; } + @Override public boolean isConditional() { return false; } + @Override public Set getHeaderNames() { return Collections.emptySet(); } + @Override public String getHeader(String name) { return ""; } + @Override public String getPath() { return ""; } + @Override public String getEtag() { return ""; } + @Override public String getLastModified() { return ""; } - }; + } /** From c138ccef7011d9e65a0b6f544ce6b7add68752e3 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 6 Oct 2015 00:26:06 +0000 Subject: [PATCH 045/160] remove Apache header as the code is new and not derived from Tomcat svn path=/trunk/api/javaee-api/javax.servlet/; revision=64151 --- .../java/javax/servlet/http/PushBuilder.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index aaae4845..f626af25 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -36,24 +36,6 @@ * and therefore, elected the GPL Version 2 license, then the option applies * only if the new code is made subject to such option by the copyright * holder. - * - * - * This file incorporates work covered by the following copyright and - * permission notice: - * - * Copyright 2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. */ package javax.servlet.http; From 40b82e7355f56301dc72092740f17f3730f78027 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 6 Oct 2015 14:23:15 +0000 Subject: [PATCH 046/160] https://java.net/jira/browse/SERVLET_SPEC-141 SECTION: Modified Files M src/main/java/javax/servlet/http/HttpServlet.java A src/main/java/javax/servlet/http/HttpFilter.java M src/main/java/javax/servlet/GenericServlet.java A src/main/java/javax/servlet/GenericFilter.java M src/main/java/javax/servlet/Filter.java - Merge topic branch to trunk. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64154 --- src/main/java/javax/servlet/Filter.java | 33 +- .../java/javax/servlet/GenericFilter.java | 318 ++++++++++++++++++ .../java/javax/servlet/GenericServlet.java | 2 +- .../java/javax/servlet/http/HttpFilter.java | 177 ++++++++++ .../java/javax/servlet/http/HttpServlet.java | 2 +- 5 files changed, 517 insertions(+), 15 deletions(-) create mode 100644 src/main/java/javax/servlet/GenericFilter.java create mode 100644 src/main/java/javax/servlet/http/HttpFilter.java diff --git a/src/main/java/javax/servlet/Filter.java b/src/main/java/javax/servlet/Filter.java index 293cf09b..01168c4a 100644 --- a/src/main/java/javax/servlet/Filter.java +++ b/src/main/java/javax/servlet/Filter.java @@ -61,9 +61,9 @@ import java.io.IOException; /** - * A filter is an object that performs filtering tasks on either the - * request to a resource (a servlet or static content), or on the response - * from a resource, or both. + *

    A filter is an object that performs + * filtering tasks on either the request to a resource (a servlet or static content), or on the response + * from a resource, or both.

    * *

    Filters perform filtering in the doFilter method. * Every Filter has access to a FilterConfig object from which it can obtain @@ -92,27 +92,30 @@ public interface Filter { /** - * Called by the web container to indicate to a filter that it is - * being placed into service. + *

    Called by the web container + * to indicate to a filter that it is being placed into service. * *

    The servlet container calls the init * method exactly once after instantiating the filter. The init * method must complete successfully before the filter is asked to do any - * filtering work. + * filtering work.

    * *

    The web container cannot place the filter into service if the init - * method either + * method either

    *
      *
    1. Throws a ServletException *
    2. Does not return within a time period defined by the web container *
    + * + *

    In version 4.0, a default implementation + * has been added that takes no action.

    * * @param filterConfig a FilterConfig object containing the * filter's configuration and initialization parameters * @throws ServletException if an exception has occurred that interferes with * the filter's normal operation */ - public void init(FilterConfig filterConfig) throws ServletException; + default public void init(FilterConfig filterConfig) throws ServletException {} /** @@ -158,18 +161,22 @@ public void doFilter(ServletRequest request, ServletResponse response, /** - * Called by the web container to indicate to a filter that it is being - * taken out of service. + *

    Called by the web container + * to indicate to a filter that it is being + * taken out of service.

    * *

    This method is only called once all threads within the filter's * doFilter method have exited or after a timeout period has passed. * After the web container calls this method, it will not call the - * doFilter method again on this instance of the filter. + * doFilter method again on this instance of the filter.

    * *

    This method gives the filter an opportunity to clean up any * resources that are being held (for example, memory, file handles, * threads) and make sure that any persistent state is synchronized - * with the filter's current state in memory. + * with the filter's current state in memory.

    + * + *

    In version 4.0, a default implementation + * has been added that takes no action.

    */ - public void destroy(); + default public void destroy() {} } diff --git a/src/main/java/javax/servlet/GenericFilter.java b/src/main/java/javax/servlet/GenericFilter.java new file mode 100644 index 00000000..7ee13ddd --- /dev/null +++ b/src/main/java/javax/servlet/GenericFilter.java @@ -0,0 +1,318 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + * + */ + +package javax.servlet; + +import java.io.IOException; +import java.util.Enumeration; +import java.util.ResourceBundle; + +/** + * + *

    Defines a generic, protocol-independent + * filter. To write an HTTP filter for use on the + * Web, extend {@link javax.servlet.http.HttpFilter} instead.

    + * + *
    + * + *

    GenericFilter implements the Filter + * and FilterConfig interfaces. GenericFilter + * may be directly extended by a filter, although it's more common to extend + * a protocol-specific subclass such as HttpFilter. + * + *

    GenericFilter makes writing filters + * easier. It provides simple versions of the lifecycle methods + * init and destroy and of the methods + * in the FilterConfig interface. + * + *

    To write a generic filter, you need only + * override the abstract doFilter method. + * + *

    + * + * @author Various + * + * @since 4.0 + */ + + +public abstract class GenericFilter + implements Filter, FilterConfig, java.io.Serializable +{ + private static final String LSTRING_FILE = "javax.servlet.LocalStrings"; + private static final ResourceBundle lStrings = + ResourceBundle.getBundle(LSTRING_FILE); + + private transient FilterConfig config; + + + /** + * + *

    Does nothing. All of the filter initialization + * is done by one of the init methods.

    + * + * @since 4.0 + */ + public GenericFilter() { } + + + /** + *

    Called by the servlet container to indicate to a filter that the + * filter is being taken out of service. See {@link Filter#destroy}.

    + * + * + * @since 4.0 + * + */ + @Override + public void destroy() { + } + + + /** + *

    Returns a String containing the value of the named + * initialization parameter, or null if the parameter does + * not exist. See {@link FilterConfig#getInitParameter}.

    + * + *

    This method is supplied for convenience. It gets the + * value of the named parameter from the servlet's + * ServletConfig object. + * + * @param name a String specifying the name + * of the initialization parameter + * + * @return String a String containing the value + * of the initialization parameter + * + * @since 4.0 + * + */ + @Override + public String getInitParameter(String name) { + FilterConfig fc = getFilterConfig(); + if (fc == null) { + throw new IllegalStateException( + lStrings.getString("err.filter_config_not_initialized")); + } + + return fc.getInitParameter(name); + } + + + /** + *

    Returns the names of the filter's initialization parameters + * as an Enumeration of String objects, + * or an empty Enumeration if the filter has no + * initialization parameters. See {@link + * FilterConfig#getInitParameterNames}.

    + * + *
    + * + *

    This method is supplied for convenience. It gets the + * parameter names from the filter's FilterConfig object. + * + *

    + * + * @return Enumeration an enumeration of String + * objects containing the names of + * the filter's initialization parameters + * + * @since 4.0 + */ + @Override + public Enumeration getInitParameterNames() { + FilterConfig fc = getFilterConfig(); + if (fc == null) { + throw new IllegalStateException( + lStrings.getString("err.filter_config_not_initialized")); + } + + return fc.getInitParameterNames(); + } + + + /** + *

    Returns this servlet's {@link ServletConfig} object.

    + * + * @return FilterConfig the FilterConfig object + * that initialized this filter + * + * @since 4.0 + */ + public FilterConfig getFilterConfig() { + return config; + } + + + /** + *

    Returns a reference to the {@link ServletContext} in which this filter + * is running. See {@link FilterConfig#getServletContext}.

    + * + *
    + * + *

    This method is supplied for convenience. It gets the + * context from the filter's FilterConfig object. + * + *

    + * + * @return ServletContext the ServletContext object + * passed to this filter by the init + * method + * + * @since 4.0 + */ + @Override + public ServletContext getServletContext() { + FilterConfig sc = getFilterConfig(); + if (sc == null) { + throw new IllegalStateException( + lStrings.getString("err.filter_config_not_initialized")); + } + + return sc.getServletContext(); + } + + + /** + *

    Called by the servlet container to indicate to a filter that + * it is being placed into service. See {@link Filter#init}.

    + * + *
    + * + *

    This implementation stores the {@link FilterConfig} + * object it receives from the servlet container for later use. + * When overriding this form of the method, call + * super.init(config). + * + *

    + * + * @param config the FilterConfig object + * that contains configuration + * information for this filter + * + * @exception ServletException if an exception occurs that + * interrupts the servlet's normal + * operation + * + * @see UnavailableException + * + * @since 4.0 + */ + @Override + public void init(FilterConfig config) throws ServletException { + this.config = config; + this.init(); + } + + /** + *

    A convenience method which can be overridden so that there's no need + * to call super.init(config).

    + * + *
    + * + *

    Instead of overriding {@link #init(FilterConfig)}, simply override + * this method and it will be called by + * GenericFilter.init(FilterConfig config). + * The FilterConfig object can still be retrieved via {@link + * #getFilterConfig}. + * + *

    + * + * @exception ServletException if an exception occurs that + * interrupts the servlet's + * normal operation + * + * @since 4.0 + */ + public void init() throws ServletException { + + } + + /** + * Called by the servlet container to allow the filter to respond to + * a request. See {@link Filter#doFilter}. + * + *

    This method is declared abstract so subclasses, such as + * HttpFilter, must override it. + * + * @param req the ServletRequest object + * that contains the client's request + * + * @param res the ServletResponse object + * that will contain the servlet's response + * + * @param chain the FilterChain for invoking the next filter or the resource + * + * @exception ServletException if an exception occurs that + * interferes with the servlet's + * normal operation occurred + * + * @exception IOException if an input or output + * exception occurs + * + * @since 4.0 + */ + @Override + public abstract void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException; + + + + + + /** + *

    Returns the name of this filter instance. + * See {@link FilterConfig#getFilterName}.

    + * + * @return the name of this filter instance + * + * @since 4.0 + */ + @Override + public String getFilterName() { + FilterConfig sc = getFilterConfig(); + if (sc == null) { + throw new IllegalStateException( + lStrings.getString("err.servlet_config_not_initialized")); + } + + return sc.getFilterName(); + } +} diff --git a/src/main/java/javax/servlet/GenericServlet.java b/src/main/java/javax/servlet/GenericServlet.java index 686fb940..50888e48 100644 --- a/src/main/java/javax/servlet/GenericServlet.java +++ b/src/main/java/javax/servlet/GenericServlet.java @@ -230,7 +230,7 @@ public String getServletInfo() { * super.init(config). * * @param config the ServletConfig object - * that contains configutation + * that contains configuration * information for this servlet * * @exception ServletException if an exception occurs that diff --git a/src/main/java/javax/servlet/http/HttpFilter.java b/src/main/java/javax/servlet/http/HttpFilter.java new file mode 100644 index 00000000..d6d63898 --- /dev/null +++ b/src/main/java/javax/servlet/http/HttpFilter.java @@ -0,0 +1,177 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + * + */ + +package javax.servlet.http; + +import java.io.IOException; +import javax.servlet.FilterChain; +import javax.servlet.GenericFilter; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + + +/** + * + *

    Provides an abstract class to be subclassed to create + * an HTTP filter suitable for a Web site. A subclass of + * HttpFilter should override {@link #doFilter(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain) }.

    + * + *
    + * + *

    Filters typically run on multithreaded servers, + * so be aware that a filter must handle concurrent + * requests and be careful to synchronize access to shared resources. + * Shared resources include in-memory data such as + * instance or class variables and external objects + * such as files, database connections, and network + * connections. + * See the + * + * Java Tutorial on Multithreaded Programming for more + * information on handling multiple threads in a Java program. + * + *

    + * + * @author Various + * + * @since 4.0 + */ + +public abstract class HttpFilter extends GenericFilter +{ + + /** + *

    Does nothing, because this is an abstract class.

    + * + * @since 4.0 + */ + + public HttpFilter() { } + + /** + * + *

    The doFilter method of the Filter is called by the + * container each time a request/response pair is passed through the + * chain due to a client request for a resource at the end of the chain. + * The FilterChain passed in to this method allows the Filter to pass + * on the request and response to the next entity in the chain. There's no need to + * override this method.

    + * + *
    + * + *

    The default implementation inspects the incoming {@code req} and {@code res} + * objects to determine if they are instances of {@link HttpServletRequest} + * and {@link HttpServletResponse}, respectively. If not, a {@link ServletException} is thrown. + * Otherwise, the protected {@link #doFilter(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain)} + * method is called.

    + * + *
    + * + * @param req a {@link ServletRequest} object that + * contains the request the client has made + * of the filter + * + * @param res a {@link ServletResponse} object that + * contains the response the filter sends + * to the client + * + * @param chain the FilterChain for invoking the next filter or the resource + * + * @throws IOException if an input or output error is + * detected when the filter handles + * the request + * + * @throws ServletException if the request for the could not be handled or + * either parameter is not an instance of the respective {@link HttpServletRequest} + * or {@link HttpServletResponse}. + * + * @since 4.0 + */ + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { + if (!(req instanceof HttpServletRequest && + res instanceof HttpServletResponse)) { + throw new ServletException("non-HTTP request or response"); + } + + this.doFilter((HttpServletRequest)req, (HttpServletResponse)res, chain); + } + + /** + * + *

    The doFilter method of the Filter is called by the + * container each time a request/response pair is passed through the + * chain due to a client request for a resource at the end of the chain. + * The FilterChain passed in to this method allows the Filter to pass + * on the request and response to the next entity in the chain.

    + * + *
    + * + *

    The default implementation simply calls {@link FilterChain#doFilter} + * + *

    + * + * @param req a {@link HttpServletRequest} object that + * contains the request the client has made + * of the filter + * + * @param res a {@link HttpServletResponse} object that + * contains the response the filter sends + * to the client + * + * @param chain the FilterChain for invoking the next filter or the resource + * + * @throws IOException if an input or output error is + * detected when the filter handles + * the request + * + * @throws ServletException if the request for the could not be handled + * + * @since 4.0 + */ + protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain) throws IOException, ServletException { + chain.doFilter(req, res); + } + +} + + diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index e4841927..bbc57795 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/src/main/java/javax/servlet/http/HttpServlet.java @@ -105,7 +105,7 @@ * such as files, database connections, and network * connections. * See the - * + * * Java Tutorial on Multithreaded Programming for more * information on handling multiple threads in a Java program. * From f6f9eef7576e4b67d58581c1b520bd562515a29b Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 6 Oct 2015 18:06:04 +0000 Subject: [PATCH 047/160] M src/main/java/javax/servlet/GenericServlet.java - Fix copyright year. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64155 --- src/main/java/javax/servlet/GenericServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/GenericServlet.java b/src/main/java/javax/servlet/GenericServlet.java index 50888e48..bbf31769 100644 --- a/src/main/java/javax/servlet/GenericServlet.java +++ b/src/main/java/javax/servlet/GenericServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From d9ff3d96f6b7871a51a0c04bf0bacb7434a5f914 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 6 Oct 2015 18:27:05 +0000 Subject: [PATCH 048/160] fix issue https://java.net/jira/browse/SERVLET_SPEC-142 ("Use Java SE 8 default methods for listeners") svn path=/trunk/api/javaee-api/javax.servlet/; revision=64156 --- .../servlet/ServletContextAttributeListener.java | 8 ++++---- .../javax/servlet/ServletContextListener.java | 6 +++--- .../servlet/ServletRequestAttributeListener.java | 8 ++++---- .../javax/servlet/ServletRequestListener.java | 6 +++--- .../http/HttpSessionActivationListener.java | 5 +++-- .../http/HttpSessionAttributeListener.java | 8 ++++---- .../servlet/http/HttpSessionBindingListener.java | 15 +++------------ .../javax/servlet/http/HttpSessionListener.java | 7 +++---- 8 files changed, 27 insertions(+), 36 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContextAttributeListener.java b/src/main/java/javax/servlet/ServletContextAttributeListener.java index 55414b51..61922740 100644 --- a/src/main/java/javax/servlet/ServletContextAttributeListener.java +++ b/src/main/java/javax/servlet/ServletContextAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -88,7 +88,7 @@ public interface ServletContextAttributeListener extends EventListener { * ServletContext to which the attribute was added, along with the * attribute name and value */ - public void attributeAdded(ServletContextAttributeEvent event); + default public void attributeAdded(ServletContextAttributeEvent event) {} /** * Receives notification that an attribute has been removed @@ -98,7 +98,7 @@ public interface ServletContextAttributeListener extends EventListener { * ServletContext from which the attribute was removed, along with * the attribute name and value */ - public void attributeRemoved(ServletContextAttributeEvent event); + default public void attributeRemoved(ServletContextAttributeEvent event) {} /* * Receives notification that an attribute has been replaced @@ -108,6 +108,6 @@ public interface ServletContextAttributeListener extends EventListener { * ServletContext in which the attribute was replaced, along with * the attribute name and its old value */ - public void attributeReplaced(ServletContextAttributeEvent event); + default public void attributeReplaced(ServletContextAttributeEvent event) {} } diff --git a/src/main/java/javax/servlet/ServletContextListener.java b/src/main/java/javax/servlet/ServletContextListener.java index 58320417..c5f19d4b 100644 --- a/src/main/java/javax/servlet/ServletContextListener.java +++ b/src/main/java/javax/servlet/ServletContextListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -92,7 +92,7 @@ public interface ServletContextListener extends EventListener { * @param sce the ServletContextEvent containing the ServletContext * that is being initialized */ - public void contextInitialized(ServletContextEvent sce); + default public void contextInitialized(ServletContextEvent sce) {} /** * Receives notification that the ServletContext is about to be @@ -105,6 +105,6 @@ public interface ServletContextListener extends EventListener { * @param sce the ServletContextEvent containing the ServletContext * that is being destroyed */ - public void contextDestroyed(ServletContextEvent sce); + default public void contextDestroyed(ServletContextEvent sce) {} } diff --git a/src/main/java/javax/servlet/ServletRequestAttributeListener.java b/src/main/java/javax/servlet/ServletRequestAttributeListener.java index 70bf5123..cff3e38c 100644 --- a/src/main/java/javax/servlet/ServletRequestAttributeListener.java +++ b/src/main/java/javax/servlet/ServletRequestAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -93,7 +93,7 @@ public interface ServletRequestAttributeListener extends EventListener { * ServletRequest and the name and value of the attribute that was * added */ - public void attributeAdded(ServletRequestAttributeEvent srae); + default public void attributeAdded(ServletRequestAttributeEvent srae) {} /** * Receives notification that an attribute has been removed from the @@ -103,7 +103,7 @@ public interface ServletRequestAttributeListener extends EventListener { * ServletRequest and the name and value of the attribute that was * removed */ - public void attributeRemoved(ServletRequestAttributeEvent srae); + default public void attributeRemoved(ServletRequestAttributeEvent srae) {} /** * Receives notification that an attribute has been replaced on the @@ -113,6 +113,6 @@ public interface ServletRequestAttributeListener extends EventListener { * ServletRequest and the name and (old) value of the attribute * that was replaced */ - public void attributeReplaced(ServletRequestAttributeEvent srae); + default public void attributeReplaced(ServletRequestAttributeEvent srae) {} } diff --git a/src/main/java/javax/servlet/ServletRequestListener.java b/src/main/java/javax/servlet/ServletRequestListener.java index 677140c6..2cb45ebe 100644 --- a/src/main/java/javax/servlet/ServletRequestListener.java +++ b/src/main/java/javax/servlet/ServletRequestListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -92,7 +92,7 @@ public interface ServletRequestListener extends EventListener { * @param sre the ServletRequestEvent containing the ServletRequest * and the ServletContext representing the web application */ - public void requestDestroyed(ServletRequestEvent sre); + default public void requestDestroyed(ServletRequestEvent sre) {} /** * Receives notification that a ServletRequest is about to come @@ -101,5 +101,5 @@ public interface ServletRequestListener extends EventListener { * @param sre the ServletRequestEvent containing the ServletRequest * and the ServletContext representing the web application */ - public void requestInitialized(ServletRequestEvent sre); + default public void requestInitialized(ServletRequestEvent sre) {} } diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index 1e6e9135..e011373a 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -76,11 +76,12 @@ public interface HttpSessionActivationListener extends EventListener { * @param se the {@link HttpSessionEvent} indicating the passivation * of the session */ - public void sessionWillPassivate(HttpSessionEvent se); + default public void sessionWillPassivate(HttpSessionEvent se) {} + /** Notification that the session has just been activated. * @param se the {@link HttpSessionEvent} indicating the activation * of the session */ - public void sessionDidActivate(HttpSessionEvent se); + default public void sessionDidActivate(HttpSessionEvent se) {} } diff --git a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java index 9eb17e3b..e67b544f 100644 --- a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -85,7 +85,7 @@ public interface HttpSessionAttributeListener extends EventListener { * @param event the HttpSessionBindingEvent containing the session * and the name and value of the attribute that was added */ - public void attributeAdded(HttpSessionBindingEvent event); + default public void attributeAdded(HttpSessionBindingEvent event) {} /** * Receives notification that an attribute has been removed from a @@ -94,7 +94,7 @@ public interface HttpSessionAttributeListener extends EventListener { * @param event the HttpSessionBindingEvent containing the session * and the name and value of the attribute that was removed */ - public void attributeRemoved(HttpSessionBindingEvent event); + default public void attributeRemoved(HttpSessionBindingEvent event) {} /** * Receives notification that an attribute has been replaced in a @@ -103,7 +103,7 @@ public interface HttpSessionAttributeListener extends EventListener { * @param event the HttpSessionBindingEvent containing the session * and the name and (old) value of the attribute that was replaced */ - public void attributeReplaced(HttpSessionBindingEvent event); + default public void attributeReplaced(HttpSessionBindingEvent event) {} } diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java index c15fe829..49234d7b 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -81,8 +81,6 @@ public interface HttpSessionBindingListener extends EventListener { - - /** * * Notifies the object that it is being bound to @@ -94,10 +92,7 @@ public interface HttpSessionBindingListener extends EventListener { * @see #valueUnbound * */ - - public void valueBound(HttpSessionBindingEvent event); - - + default public void valueBound(HttpSessionBindingEvent event) {} /** * @@ -110,9 +105,5 @@ public interface HttpSessionBindingListener extends EventListener { * @see #valueBound * */ - - public void valueUnbound(HttpSessionBindingEvent event); - - + default public void valueUnbound(HttpSessionBindingEvent event) {} } - diff --git a/src/main/java/javax/servlet/http/HttpSessionListener.java b/src/main/java/javax/servlet/http/HttpSessionListener.java index 507e49d0..51daf50e 100644 --- a/src/main/java/javax/servlet/http/HttpSessionListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -86,14 +86,13 @@ public interface HttpSessionListener extends EventListener { * * @param se the HttpSessionEvent containing the session */ - public void sessionCreated(HttpSessionEvent se); + default public void sessionCreated(HttpSessionEvent se) {} /** * Receives notification that a session is about to be invalidated. * * @param se the HttpSessionEvent containing the session */ - public void sessionDestroyed(HttpSessionEvent se); - + default public void sessionDestroyed(HttpSessionEvent se) {} } From 02ad2b3cb687bec23ca5fc79a07b65e5232ad370 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 6 Oct 2015 21:11:48 +0000 Subject: [PATCH 049/160] https://java.net/jira/browse/SERVLET_SPEC-134 SECTION: Modified Files M src/main/java/javax/servlet/http/HttpServletRequest.java - Modify getPushBuilder() to explicitly call out SETTINGS_ENABLE_PUSH 0. /** * Returns a {@link PushBuilder} for issuing server push responses * from the current request. If the current connection does not - * support server push, a valid {@code PushBuilder} must still be + * support server push, or server push has been disabled by the + * client via a {@code SETTINGS_ENABLE_PUSH} settings frame value of + * {@code 0} (zero), a valid {@code PushBuilder} must still be * returned, but calling any of the methods on it will have no * effect. * svn path=/trunk/api/javaee-api/javax.servlet/; revision=64157 --- src/main/java/javax/servlet/http/HttpServletRequest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 57ed796c..9f68bbed 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -307,7 +307,9 @@ public interface HttpServletRequest extends ServletRequest { /** * Returns a {@link PushBuilder} for issuing server push responses * from the current request. If the current connection does not - * support server push, a valid {@code PushBuilder} must still be + * support server push, or server push has been disabled by the + * client via a {@code SETTINGS_ENABLE_PUSH} settings frame value of + * {@code 0} (zero), a valid {@code PushBuilder} must still be * returned, but calling any of the methods on it will have no * effect. * From f17a9bc249c80d6fdb02539c6cca69d44aef35c7 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 9 Oct 2015 00:20:26 +0000 Subject: [PATCH 050/160] [maven-release-plugin] prepare release javax.servlet-api-4.0.0-b01 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64178 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d8f87c15..50ab87f4 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b01-SNAPSHOT + 4.0.0-b01 4.0 @@ -130,9 +130,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b01 + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b01 + http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b01 From 4776c4224a70db4485e778385eb73b36a14c7787 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 9 Oct 2015 00:20:30 +0000 Subject: [PATCH 051/160] [maven-release-plugin] prepare for next development iteration svn path=/trunk/api/javaee-api/javax.servlet/; revision=64180 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 50ab87f4..18fa97ef 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b01 + 4.0.0-b02-SNAPSHOT 4.0 @@ -130,9 +130,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b01 - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b01 - http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b01 + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet From e2e500a7ef68568419472f159cd4e615d83bfe2f Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Mon, 12 Oct 2015 17:59:31 +0000 Subject: [PATCH 052/160] SECTION: Modified Files M src/main/java/javax/servlet/GenericFilter.java - Apply Mark Thomas's suggestions. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64186 --- .../java/javax/servlet/GenericFilter.java | 81 +++---------------- 1 file changed, 9 insertions(+), 72 deletions(-) diff --git a/src/main/java/javax/servlet/GenericFilter.java b/src/main/java/javax/servlet/GenericFilter.java index 7ee13ddd..fb732c77 100644 --- a/src/main/java/javax/servlet/GenericFilter.java +++ b/src/main/java/javax/servlet/GenericFilter.java @@ -47,12 +47,10 @@ /** * - *

    Defines a generic, protocol-independent + *

    Defines a generic, protocol-independent * filter. To write an HTTP filter for use on the * Web, extend {@link javax.servlet.http.HttpFilter} instead.

    * - *
    - * *

    GenericFilter implements the Filter * and FilterConfig interfaces. GenericFilter * may be directly extended by a filter, although it's more common to extend @@ -66,8 +64,6 @@ *

    To write a generic filter, you need only * override the abstract doFilter method. * - *

    - * * @author Various * * @since 4.0 @@ -86,7 +82,7 @@ public abstract class GenericFilter /** * - *

    Does nothing. All of the filter initialization + *

    Does nothing. All of the filter initialization * is done by one of the init methods.

    * * @since 4.0 @@ -95,20 +91,7 @@ public GenericFilter() { } /** - *

    Called by the servlet container to indicate to a filter that the - * filter is being taken out of service. See {@link Filter#destroy}.

    - * - * - * @since 4.0 - * - */ - @Override - public void destroy() { - } - - - /** - *

    Returns a String containing the value of the named + *

    Returns a String containing the value of the named * initialization parameter, or null if the parameter does * not exist. See {@link FilterConfig#getInitParameter}.

    * @@ -138,19 +121,15 @@ public String getInitParameter(String name) { /** - *

    Returns the names of the filter's initialization parameters + *

    Returns the names of the filter's initialization parameters * as an Enumeration of String objects, * or an empty Enumeration if the filter has no * initialization parameters. See {@link * FilterConfig#getInitParameterNames}.

    * - *
    - * *

    This method is supplied for convenience. It gets the * parameter names from the filter's FilterConfig object. * - *

    - * * @return Enumeration an enumeration of String * objects containing the names of * the filter's initialization parameters @@ -170,7 +149,7 @@ public Enumeration getInitParameterNames() { /** - *

    Returns this servlet's {@link ServletConfig} object.

    + *

    Returns this servlet's {@link ServletConfig} object.

    * * @return FilterConfig the FilterConfig object * that initialized this filter @@ -183,16 +162,12 @@ public FilterConfig getFilterConfig() { /** - *

    Returns a reference to the {@link ServletContext} in which this filter + *

    Returns a reference to the {@link ServletContext} in which this filter * is running. See {@link FilterConfig#getServletContext}.

    * - *
    - * *

    This method is supplied for convenience. It gets the * context from the filter's FilterConfig object. * - *

    - * * @return ServletContext the ServletContext object * passed to this filter by the init * method @@ -212,18 +187,14 @@ public ServletContext getServletContext() { /** - *

    Called by the servlet container to indicate to a filter that + *

    Called by the servlet container to indicate to a filter that * it is being placed into service. See {@link Filter#init}.

    * - *
    - * *

    This implementation stores the {@link FilterConfig} * object it receives from the servlet container for later use. * When overriding this form of the method, call * super.init(config). * - *

    - * * @param config the FilterConfig object * that contains configuration * information for this filter @@ -243,19 +214,15 @@ public void init(FilterConfig config) throws ServletException { } /** - *

    A convenience method which can be overridden so that there's no need + *

    A convenience method which can be overridden so that there's no need * to call super.init(config).

    * - *
    - * *

    Instead of overriding {@link #init(FilterConfig)}, simply override * this method and it will be called by * GenericFilter.init(FilterConfig config). * The FilterConfig object can still be retrieved via {@link * #getFilterConfig}. * - *

    - * * @exception ServletException if an exception occurs that * interrupts the servlet's * normal operation @@ -266,39 +233,9 @@ public void init() throws ServletException { } - /** - * Called by the servlet container to allow the filter to respond to - * a request. See {@link Filter#doFilter}. - * - *

    This method is declared abstract so subclasses, such as - * HttpFilter, must override it. - * - * @param req the ServletRequest object - * that contains the client's request - * - * @param res the ServletResponse object - * that will contain the servlet's response - * - * @param chain the FilterChain for invoking the next filter or the resource - * - * @exception ServletException if an exception occurs that - * interferes with the servlet's - * normal operation occurred - * - * @exception IOException if an input or output - * exception occurs - * - * @since 4.0 - */ - @Override - public abstract void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException; - - - - /** - *

    Returns the name of this filter instance. + *

    Returns the name of this filter instance. * See {@link FilterConfig#getFilterName}.

    * * @return the name of this filter instance From 8ecba441375046b0b6b331862a5cf4dd39ff0038 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 30 Oct 2015 01:29:30 +0000 Subject: [PATCH 053/160] https://java.net/jira/browse/SERVLET_SPEC-134 SECTION: Modified Files A src/main/java/javax/servlet/http/NoOpPushBuilder.java M src/main/java/javax/servlet/http/HttpServletRequest.java - Correct incorrectly public implementation detail class. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64223 --- .../servlet/http/HttpServletRequest.java | 44 --------- .../javax/servlet/http/NoOpPushBuilder.java | 89 +++++++++++++++++++ 2 files changed, 89 insertions(+), 44 deletions(-) create mode 100644 src/main/java/javax/servlet/http/NoOpPushBuilder.java diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 9f68bbed..74cd673b 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -320,50 +320,6 @@ default public PushBuilder getPushBuilder() { return new NoOpPushBuilder(); } - static class NoOpPushBuilder implements PushBuilder { - @Override - public PushBuilder method(String method) { return this; } - @Override - public PushBuilder queryString(String queryString) { return this; } - @Override - public PushBuilder sessionId(String sessionId) { return this; } - @Override - public PushBuilder conditional(boolean conditional) { return this; } - @Override - public PushBuilder setHeader(String name, String value) { return this; } - @Override - public PushBuilder addHeader(String name, String value) { return this; } - @Override - public PushBuilder removeHeader(String name) { return this; } - @Override - public PushBuilder path(String path) { return this; } - @Override - public PushBuilder etag(String etag) { return this; } - @Override - public PushBuilder lastModified(String lastModified) { return this; } - @Override - public void push() {} - @Override - public String getMethod() { return ""; } - @Override - public String getQueryString() { return ""; } - @Override - public String getSessionId() { return ""; } - @Override - public boolean isConditional() { return false; } - @Override - public Set getHeaderNames() { return Collections.emptySet(); } - @Override - public String getHeader(String name) { return ""; } - @Override - public String getPath() { return ""; } - @Override - public String getEtag() { return ""; } - @Override - public String getLastModified() { return ""; } - - } - /** * Returns the portion of the request URI that indicates the context * of the request. The context path always comes first in a request diff --git a/src/main/java/javax/servlet/http/NoOpPushBuilder.java b/src/main/java/javax/servlet/http/NoOpPushBuilder.java new file mode 100644 index 00000000..d149a254 --- /dev/null +++ b/src/main/java/javax/servlet/http/NoOpPushBuilder.java @@ -0,0 +1,89 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + * + */ + +package javax.servlet.http; + +import java.util.Set; +import java.util.Collections; + + +class NoOpPushBuilder implements PushBuilder { + @Override + public PushBuilder method(String method) { return this; } + @Override + public PushBuilder queryString(String queryString) { return this; } + @Override + public PushBuilder sessionId(String sessionId) { return this; } + @Override + public PushBuilder conditional(boolean conditional) { return this; } + @Override + public PushBuilder setHeader(String name, String value) { return this; } + @Override + public PushBuilder addHeader(String name, String value) { return this; } + @Override + public PushBuilder removeHeader(String name) { return this; } + @Override + public PushBuilder path(String path) { return this; } + @Override + public PushBuilder etag(String etag) { return this; } + @Override + public PushBuilder lastModified(String lastModified) { return this; } + @Override + public void push() {} + @Override + public String getMethod() { return ""; } + @Override + public String getQueryString() { return ""; } + @Override + public String getSessionId() { return ""; } + @Override + public boolean isConditional() { return false; } + @Override + public Set getHeaderNames() { return Collections.emptySet(); } + @Override + public String getHeader(String name) { return ""; } + @Override + public String getPath() { return ""; } + @Override + public String getEtag() { return ""; } + @Override + public String getLastModified() { return ""; } +} From 2d226580c029966015ed9e55dd2f37d766209ea0 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 5 Jan 2016 22:44:04 +0000 Subject: [PATCH 054/160] additional fix https://java.net/jira/browse/SERVLET_SPEC-127 ("Minor mistakes in the specification (Servlet 3.1 Final Release for Evaluation) svn path=/trunk/api/javaee-api/javax.servlet/; revision=64232 --- src/main/java/javax/servlet/ReadListener.java | 3 ++- src/main/java/javax/servlet/WriteListener.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java index 19355de6..a8993524 100644 --- a/src/main/java/javax/servlet/ReadListener.java +++ b/src/main/java/javax/servlet/ReadListener.java @@ -59,7 +59,8 @@ public interface ReadListener extends EventListener { * this method will be invoked by the container the first time when it is possible * to read data. Subsequently the container will invoke this method if and only * if {@link javax.servlet.ServletInputStream#isReady()} method - * has been called and has returned false. + * has been called and returned a value of false and data has subsequently + * become available to read. * * @throws IOException if an I/O related error has occurred during processing */ diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java index 74a45731..861078da 100644 --- a/src/main/java/javax/servlet/WriteListener.java +++ b/src/main/java/javax/servlet/WriteListener.java @@ -58,7 +58,8 @@ public interface WriteListener extends EventListener { * this method will be invoked by the container the first time when it is possible * to write data. Subsequently the container will invoke this method if and only * if {@link javax.servlet.ServletOutputStream#isReady()} method - * has been called and has returned false. + * has been called and has returned a value of false and a write + * operation has subsequently become possible. * * @throws IOException if an I/O related error has occurred during processing */ From b2bf9c2de9829ef0d108053a82bd40bb8794fa66 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 5 Jan 2016 22:58:26 +0000 Subject: [PATCH 055/160] fix copyright year svn path=/trunk/api/javaee-api/javax.servlet/; revision=64233 --- src/main/java/javax/servlet/ReadListener.java | 2 +- src/main/java/javax/servlet/WriteListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java index a8993524..c3101737 100644 --- a/src/main/java/javax/servlet/ReadListener.java +++ b/src/main/java/javax/servlet/ReadListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java index 861078da..3fcc5e07 100644 --- a/src/main/java/javax/servlet/WriteListener.java +++ b/src/main/java/javax/servlet/WriteListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From 7a4a3457be23be18597d589b56da949350930d8b Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 11 Mar 2016 16:34:32 +0000 Subject: [PATCH 056/160] Clarify that calling push is not a guarantee that the resource will actually be pushed. M src/main/java/javax/servlet/http/PushBuilder.java svn path=/trunk/api/javaee-api/javax.servlet/; revision=64253 --- .../java/javax/servlet/http/PushBuilder.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index f626af25..254fb6e1 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -236,17 +236,21 @@ public interface PushBuilder /** Push a resource given the current state of the builder, * returning immediately without blocking. - * + *

    Push a resource based on the current state of the PushBuilder. - * If {@link #isConditional()} is true and an etag or lastModified - * value is provided, then an appropriate conditional header will be - * generated. If both an etag and lastModified value are provided - * only an If-None-Match header will be generated. If the builder - * has a session ID, then the pushed request will include the - * session ID either as a Cookie or as a URI parameter as - * appropriate. The builders query string is merged with any passed - * query string.

    - * + * Calling this method does not guarantee the resource will actually + * be pushed, since it is possible the client can decline acceptance + * of the pushed resource using the underlying HTTP/2 protocol.

    + + *

    If {@link #isConditional()} is true and an etag or + * lastModified value is provided, then an appropriate conditional + * header will be generated. If both an etag and lastModified value + * are provided only an If-None-Match header will be generated. If + * the builder has a session ID, then the pushed request will + * include the session ID either as a Cookie or as a URI parameter + * as appropriate. The builders query string is merged with any + * passed query string.

    + *

    Before returning from this method, the builder has its path, * etag and lastModified fields nulled. All other fields are left as * is for possible reuse in another push.

    From e7ab28992adda37ea38c1708d48133661185b8f0 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 25 Mar 2016 17:17:01 +0000 Subject: [PATCH 057/160] M src/main/java/javax/servlet/http/PushBuilder.java - Set copyright end range to be current year. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64257 --- src/main/java/javax/servlet/http/PushBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 254fb6e1..abeb60a3 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From 595ff0286010bc9c0d61baf96f6509397ca56594 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 7 Apr 2016 18:52:32 +0000 Subject: [PATCH 058/160] M src/main/java/javax/servlet/ReadListener.java M src/main/java/javax/servlet/WriteListener.java - Minor grammar tweaks. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64260 --- src/main/java/javax/servlet/ReadListener.java | 6 +++--- src/main/java/javax/servlet/WriteListener.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java index c3101737..0aa820c1 100644 --- a/src/main/java/javax/servlet/ReadListener.java +++ b/src/main/java/javax/servlet/ReadListener.java @@ -58,9 +58,9 @@ public interface ReadListener extends EventListener { * When an instance of the ReadListener is registered with a {@link ServletInputStream}, * this method will be invoked by the container the first time when it is possible * to read data. Subsequently the container will invoke this method if and only - * if {@link javax.servlet.ServletInputStream#isReady()} method - * has been called and returned a value of false and data has subsequently - * become available to read. + * if the {@link javax.servlet.ServletInputStream#isReady()} method + * has been called and has returned a value of false and + * data has subsequently become available to read. * * @throws IOException if an I/O related error has occurred during processing */ diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java index 3fcc5e07..45d15977 100644 --- a/src/main/java/javax/servlet/WriteListener.java +++ b/src/main/java/javax/servlet/WriteListener.java @@ -57,7 +57,7 @@ public interface WriteListener extends EventListener { * When an instance of the WriteListener is registered with a {@link ServletOutputStream}, * this method will be invoked by the container the first time when it is possible * to write data. Subsequently the container will invoke this method if and only - * if {@link javax.servlet.ServletOutputStream#isReady()} method + * if the {@link javax.servlet.ServletOutputStream#isReady()} method * has been called and has returned a value of false and a write * operation has subsequently become possible. * From 62b77e6bcc668b61ef72666dd641f2d96d12fda5 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 7 Apr 2016 20:21:27 +0000 Subject: [PATCH 059/160] Update copyrights M src/main/java/javax/servlet/ServletContextListener.java M src/main/java/javax/servlet/http/HttpUtils.java M src/main/java/javax/servlet/http/HttpServletResponse.java M src/main/java/javax/servlet/http/HttpServletResponseWrapper.java M src/main/java/javax/servlet/http/Part.java M src/main/java/javax/servlet/http/HttpSessionIdListener.java M src/main/java/javax/servlet/http/Cookie.java M src/main/java/javax/servlet/http/HttpSessionActivationListener.java M src/main/java/javax/servlet/http/HttpSessionAttributeListener.java M src/main/java/javax/servlet/http/HttpSessionBindingEvent.java M src/main/java/javax/servlet/http/NoOpPushBuilder.java M src/main/java/javax/servlet/http/HttpSession.java M src/main/java/javax/servlet/http/HttpSessionBindingListener.java M src/main/java/javax/servlet/http/HttpServlet.java M src/main/java/javax/servlet/http/HttpSessionEvent.java M src/main/java/javax/servlet/http/HttpFilter.java M src/main/java/javax/servlet/http/HttpUpgradeHandler.java M src/main/java/javax/servlet/http/HttpSessionContext.java M src/main/java/javax/servlet/http/HttpSessionListener.java M src/main/java/javax/servlet/http/WebConnection.java M src/main/java/javax/servlet/http/HttpServletRequest.java M src/main/java/javax/servlet/http/HttpServletRequestWrapper.java M src/main/java/javax/servlet/UnavailableException.java M src/main/java/javax/servlet/ServletRequestListener.java M src/main/java/javax/servlet/ServletException.java M src/main/java/javax/servlet/ServletResponseWrapper.java M src/main/java/javax/servlet/Registration.java M src/main/java/javax/servlet/ServletRegistration.java M src/main/java/javax/servlet/ServletContextAttributeEvent.java M src/main/java/javax/servlet/FilterRegistration.java M src/main/java/javax/servlet/ServletInputStream.java M src/main/java/javax/servlet/ReadListener.java M src/main/java/javax/servlet/GenericFilter.java M src/main/java/javax/servlet/AsyncContext.java M src/main/java/javax/servlet/ServletRequestAttributeEvent.java M src/main/java/javax/servlet/AsyncListener.java M src/main/java/javax/servlet/Servlet.java M src/main/java/javax/servlet/Filter.java M src/main/java/javax/servlet/DispatcherType.java M src/main/java/javax/servlet/ServletContext.java M src/main/java/javax/servlet/SingleThreadModel.java M src/main/java/javax/servlet/ServletContextEvent.java M src/main/java/javax/servlet/ServletRequest.java M src/main/java/javax/servlet/RequestDispatcher.java M src/main/java/javax/servlet/HttpMethodConstraintElement.java M src/main/java/javax/servlet/ServletRequestEvent.java M src/main/java/javax/servlet/WriteListener.java M src/main/java/javax/servlet/SessionCookieConfig.java M src/main/java/javax/servlet/ServletResponse.java M src/main/java/javax/servlet/ServletConfig.java M src/main/java/javax/servlet/SessionTrackingMode.java M src/main/java/javax/servlet/FilterConfig.java M src/main/java/javax/servlet/AsyncEvent.java M src/main/java/javax/servlet/GenericServlet.java M src/main/java/javax/servlet/MultipartConfigElement.java M src/main/java/javax/servlet/ServletOutputStream.java M src/main/java/javax/servlet/ServletContextAttributeListener.java M src/main/java/javax/servlet/ServletSecurityElement.java M src/main/java/javax/servlet/ServletRequestAttributeListener.java M src/main/java/javax/servlet/FilterChain.java M src/main/java/javax/servlet/annotation/WebInitParam.java M src/main/java/javax/servlet/annotation/WebServlet.java M src/main/java/javax/servlet/annotation/HandlesTypes.java M src/main/java/javax/servlet/annotation/WebFilter.java M src/main/java/javax/servlet/annotation/WebListener.java M src/main/java/javax/servlet/annotation/HttpConstraint.java M src/main/java/javax/servlet/annotation/HttpMethodConstraint.java M src/main/java/javax/servlet/annotation/MultipartConfig.java M src/main/java/javax/servlet/annotation/ServletSecurity.java M src/main/java/javax/servlet/ServletContainerInitializer.java M src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java M src/main/java/javax/servlet/descriptor/TaglibDescriptor.java M src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java M src/main/java/javax/servlet/HttpConstraintElement.java M src/main/java/javax/servlet/ServletRequestWrapper.java M exclude.xml M release.sh M pom.xml svn path=/trunk/api/javaee-api/javax.servlet/; revision=64261 --- exclude.xml | 2 +- pom.xml | 2 +- release.sh | 2 +- src/main/java/javax/servlet/AsyncContext.java | 2 +- src/main/java/javax/servlet/AsyncEvent.java | 2 +- src/main/java/javax/servlet/AsyncListener.java | 2 +- src/main/java/javax/servlet/DispatcherType.java | 2 +- src/main/java/javax/servlet/Filter.java | 2 +- src/main/java/javax/servlet/FilterChain.java | 2 +- src/main/java/javax/servlet/FilterConfig.java | 2 +- src/main/java/javax/servlet/FilterRegistration.java | 2 +- src/main/java/javax/servlet/GenericFilter.java | 2 +- src/main/java/javax/servlet/GenericServlet.java | 2 +- src/main/java/javax/servlet/HttpConstraintElement.java | 2 +- src/main/java/javax/servlet/HttpMethodConstraintElement.java | 2 +- src/main/java/javax/servlet/MultipartConfigElement.java | 2 +- src/main/java/javax/servlet/ReadListener.java | 2 +- src/main/java/javax/servlet/Registration.java | 2 +- src/main/java/javax/servlet/RequestDispatcher.java | 2 +- src/main/java/javax/servlet/Servlet.java | 2 +- src/main/java/javax/servlet/ServletConfig.java | 2 +- src/main/java/javax/servlet/ServletContainerInitializer.java | 2 +- src/main/java/javax/servlet/ServletContext.java | 2 +- src/main/java/javax/servlet/ServletContextAttributeEvent.java | 2 +- .../java/javax/servlet/ServletContextAttributeListener.java | 2 +- src/main/java/javax/servlet/ServletContextEvent.java | 2 +- src/main/java/javax/servlet/ServletContextListener.java | 2 +- src/main/java/javax/servlet/ServletException.java | 2 +- src/main/java/javax/servlet/ServletInputStream.java | 2 +- src/main/java/javax/servlet/ServletOutputStream.java | 2 +- src/main/java/javax/servlet/ServletRegistration.java | 2 +- src/main/java/javax/servlet/ServletRequest.java | 2 +- src/main/java/javax/servlet/ServletRequestAttributeEvent.java | 2 +- .../java/javax/servlet/ServletRequestAttributeListener.java | 2 +- src/main/java/javax/servlet/ServletRequestEvent.java | 2 +- src/main/java/javax/servlet/ServletRequestListener.java | 2 +- src/main/java/javax/servlet/ServletRequestWrapper.java | 2 +- src/main/java/javax/servlet/ServletResponse.java | 2 +- src/main/java/javax/servlet/ServletResponseWrapper.java | 2 +- src/main/java/javax/servlet/ServletSecurityElement.java | 2 +- src/main/java/javax/servlet/SessionCookieConfig.java | 2 +- src/main/java/javax/servlet/SessionTrackingMode.java | 2 +- src/main/java/javax/servlet/SingleThreadModel.java | 2 +- src/main/java/javax/servlet/UnavailableException.java | 2 +- src/main/java/javax/servlet/WriteListener.java | 2 +- src/main/java/javax/servlet/annotation/HandlesTypes.java | 2 +- src/main/java/javax/servlet/annotation/HttpConstraint.java | 2 +- .../java/javax/servlet/annotation/HttpMethodConstraint.java | 2 +- src/main/java/javax/servlet/annotation/MultipartConfig.java | 2 +- src/main/java/javax/servlet/annotation/ServletSecurity.java | 2 +- src/main/java/javax/servlet/annotation/WebFilter.java | 2 +- src/main/java/javax/servlet/annotation/WebInitParam.java | 2 +- src/main/java/javax/servlet/annotation/WebListener.java | 2 +- src/main/java/javax/servlet/annotation/WebServlet.java | 2 +- src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java | 2 +- .../javax/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +- src/main/java/javax/servlet/descriptor/TaglibDescriptor.java | 2 +- src/main/java/javax/servlet/http/Cookie.java | 2 +- src/main/java/javax/servlet/http/HttpFilter.java | 2 +- src/main/java/javax/servlet/http/HttpServlet.java | 2 +- src/main/java/javax/servlet/http/HttpServletRequest.java | 2 +- src/main/java/javax/servlet/http/HttpServletRequestWrapper.java | 2 +- src/main/java/javax/servlet/http/HttpServletResponse.java | 2 +- .../java/javax/servlet/http/HttpServletResponseWrapper.java | 2 +- src/main/java/javax/servlet/http/HttpSession.java | 2 +- .../java/javax/servlet/http/HttpSessionActivationListener.java | 2 +- .../java/javax/servlet/http/HttpSessionAttributeListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionBindingEvent.java | 2 +- .../java/javax/servlet/http/HttpSessionBindingListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionContext.java | 2 +- src/main/java/javax/servlet/http/HttpSessionEvent.java | 2 +- src/main/java/javax/servlet/http/HttpSessionIdListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionListener.java | 2 +- src/main/java/javax/servlet/http/HttpUpgradeHandler.java | 2 +- src/main/java/javax/servlet/http/HttpUtils.java | 2 +- src/main/java/javax/servlet/http/NoOpPushBuilder.java | 2 +- src/main/java/javax/servlet/http/Part.java | 2 +- src/main/java/javax/servlet/http/WebConnection.java | 2 +- 78 files changed, 78 insertions(+), 78 deletions(-) diff --git a/exclude.xml b/exclude.xml index d4292749..e31eedc4 100644 --- a/exclude.xml +++ b/exclude.xml @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/pom.xml b/pom.xml index 18fa97ef..5c1d1e4a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/release.sh b/release.sh index 5404b980..62c47254 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java index fec5ba13..a1b54ae5 100644 --- a/src/main/java/javax/servlet/AsyncContext.java +++ b/src/main/java/javax/servlet/AsyncContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/AsyncEvent.java b/src/main/java/javax/servlet/AsyncEvent.java index 2e1faa00..df8cb752 100644 --- a/src/main/java/javax/servlet/AsyncEvent.java +++ b/src/main/java/javax/servlet/AsyncEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/AsyncListener.java b/src/main/java/javax/servlet/AsyncListener.java index 41b9711d..9a157d56 100644 --- a/src/main/java/javax/servlet/AsyncListener.java +++ b/src/main/java/javax/servlet/AsyncListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/DispatcherType.java b/src/main/java/javax/servlet/DispatcherType.java index 44b7dd5e..541eb0d7 100644 --- a/src/main/java/javax/servlet/DispatcherType.java +++ b/src/main/java/javax/servlet/DispatcherType.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/Filter.java b/src/main/java/javax/servlet/Filter.java index 01168c4a..f6a095a7 100644 --- a/src/main/java/javax/servlet/Filter.java +++ b/src/main/java/javax/servlet/Filter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/FilterChain.java b/src/main/java/javax/servlet/FilterChain.java index c81ff5b6..fe737147 100644 --- a/src/main/java/javax/servlet/FilterChain.java +++ b/src/main/java/javax/servlet/FilterChain.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/FilterConfig.java b/src/main/java/javax/servlet/FilterConfig.java index c4924758..bfcacf34 100644 --- a/src/main/java/javax/servlet/FilterConfig.java +++ b/src/main/java/javax/servlet/FilterConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/FilterRegistration.java b/src/main/java/javax/servlet/FilterRegistration.java index 0e93468a..59fc8039 100644 --- a/src/main/java/javax/servlet/FilterRegistration.java +++ b/src/main/java/javax/servlet/FilterRegistration.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/GenericFilter.java b/src/main/java/javax/servlet/GenericFilter.java index fb732c77..f6aae53c 100644 --- a/src/main/java/javax/servlet/GenericFilter.java +++ b/src/main/java/javax/servlet/GenericFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/GenericServlet.java b/src/main/java/javax/servlet/GenericServlet.java index bbf31769..ea1b5499 100644 --- a/src/main/java/javax/servlet/GenericServlet.java +++ b/src/main/java/javax/servlet/GenericServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/HttpConstraintElement.java b/src/main/java/javax/servlet/HttpConstraintElement.java index 57f9841f..6a30c13f 100644 --- a/src/main/java/javax/servlet/HttpConstraintElement.java +++ b/src/main/java/javax/servlet/HttpConstraintElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/HttpMethodConstraintElement.java b/src/main/java/javax/servlet/HttpMethodConstraintElement.java index 52640ff6..d6df392a 100644 --- a/src/main/java/javax/servlet/HttpMethodConstraintElement.java +++ b/src/main/java/javax/servlet/HttpMethodConstraintElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/MultipartConfigElement.java b/src/main/java/javax/servlet/MultipartConfigElement.java index a525e7ea..19a88d2c 100644 --- a/src/main/java/javax/servlet/MultipartConfigElement.java +++ b/src/main/java/javax/servlet/MultipartConfigElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java index 0aa820c1..b1a5323b 100644 --- a/src/main/java/javax/servlet/ReadListener.java +++ b/src/main/java/javax/servlet/ReadListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/Registration.java b/src/main/java/javax/servlet/Registration.java index 663544fb..08b415f0 100644 --- a/src/main/java/javax/servlet/Registration.java +++ b/src/main/java/javax/servlet/Registration.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/RequestDispatcher.java b/src/main/java/javax/servlet/RequestDispatcher.java index f707a7e3..a14ca9e6 100644 --- a/src/main/java/javax/servlet/RequestDispatcher.java +++ b/src/main/java/javax/servlet/RequestDispatcher.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/Servlet.java b/src/main/java/javax/servlet/Servlet.java index d5780a41..f945e415 100644 --- a/src/main/java/javax/servlet/Servlet.java +++ b/src/main/java/javax/servlet/Servlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletConfig.java b/src/main/java/javax/servlet/ServletConfig.java index 479e809c..ce35d9f3 100644 --- a/src/main/java/javax/servlet/ServletConfig.java +++ b/src/main/java/javax/servlet/ServletConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContainerInitializer.java b/src/main/java/javax/servlet/ServletContainerInitializer.java index eb48a705..06890eed 100644 --- a/src/main/java/javax/servlet/ServletContainerInitializer.java +++ b/src/main/java/javax/servlet/ServletContainerInitializer.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index e487ba50..4e39a888 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextAttributeEvent.java b/src/main/java/javax/servlet/ServletContextAttributeEvent.java index 0ed017eb..f64cc244 100644 --- a/src/main/java/javax/servlet/ServletContextAttributeEvent.java +++ b/src/main/java/javax/servlet/ServletContextAttributeEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextAttributeListener.java b/src/main/java/javax/servlet/ServletContextAttributeListener.java index 61922740..df6498f1 100644 --- a/src/main/java/javax/servlet/ServletContextAttributeListener.java +++ b/src/main/java/javax/servlet/ServletContextAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextEvent.java b/src/main/java/javax/servlet/ServletContextEvent.java index 81068b73..e98bee2a 100644 --- a/src/main/java/javax/servlet/ServletContextEvent.java +++ b/src/main/java/javax/servlet/ServletContextEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextListener.java b/src/main/java/javax/servlet/ServletContextListener.java index c5f19d4b..212ce350 100644 --- a/src/main/java/javax/servlet/ServletContextListener.java +++ b/src/main/java/javax/servlet/ServletContextListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletException.java b/src/main/java/javax/servlet/ServletException.java index e82f59c9..46190563 100644 --- a/src/main/java/javax/servlet/ServletException.java +++ b/src/main/java/javax/servlet/ServletException.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletInputStream.java b/src/main/java/javax/servlet/ServletInputStream.java index 479a4f47..4e07bef0 100644 --- a/src/main/java/javax/servlet/ServletInputStream.java +++ b/src/main/java/javax/servlet/ServletInputStream.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletOutputStream.java b/src/main/java/javax/servlet/ServletOutputStream.java index 9d5dff96..e865daee 100644 --- a/src/main/java/javax/servlet/ServletOutputStream.java +++ b/src/main/java/javax/servlet/ServletOutputStream.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRegistration.java b/src/main/java/javax/servlet/ServletRegistration.java index b65b3ab3..159ee7d4 100644 --- a/src/main/java/javax/servlet/ServletRegistration.java +++ b/src/main/java/javax/servlet/ServletRegistration.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java index 6aced53e..d280b0a9 100644 --- a/src/main/java/javax/servlet/ServletRequest.java +++ b/src/main/java/javax/servlet/ServletRequest.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestAttributeEvent.java b/src/main/java/javax/servlet/ServletRequestAttributeEvent.java index 6a09c42f..b7912422 100644 --- a/src/main/java/javax/servlet/ServletRequestAttributeEvent.java +++ b/src/main/java/javax/servlet/ServletRequestAttributeEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestAttributeListener.java b/src/main/java/javax/servlet/ServletRequestAttributeListener.java index cff3e38c..05b056db 100644 --- a/src/main/java/javax/servlet/ServletRequestAttributeListener.java +++ b/src/main/java/javax/servlet/ServletRequestAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestEvent.java b/src/main/java/javax/servlet/ServletRequestEvent.java index 5717f9d8..ace9a0fa 100644 --- a/src/main/java/javax/servlet/ServletRequestEvent.java +++ b/src/main/java/javax/servlet/ServletRequestEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestListener.java b/src/main/java/javax/servlet/ServletRequestListener.java index 2cb45ebe..72e6851e 100644 --- a/src/main/java/javax/servlet/ServletRequestListener.java +++ b/src/main/java/javax/servlet/ServletRequestListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java index f7948a7b..9d162bca 100644 --- a/src/main/java/javax/servlet/ServletRequestWrapper.java +++ b/src/main/java/javax/servlet/ServletRequestWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java index d438b5d2..fd8798a2 100644 --- a/src/main/java/javax/servlet/ServletResponse.java +++ b/src/main/java/javax/servlet/ServletResponse.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletResponseWrapper.java b/src/main/java/javax/servlet/ServletResponseWrapper.java index c4111041..e234a8ea 100644 --- a/src/main/java/javax/servlet/ServletResponseWrapper.java +++ b/src/main/java/javax/servlet/ServletResponseWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletSecurityElement.java b/src/main/java/javax/servlet/ServletSecurityElement.java index a00a256e..69aa3a22 100644 --- a/src/main/java/javax/servlet/ServletSecurityElement.java +++ b/src/main/java/javax/servlet/ServletSecurityElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/SessionCookieConfig.java b/src/main/java/javax/servlet/SessionCookieConfig.java index 7f35005a..c66c276b 100644 --- a/src/main/java/javax/servlet/SessionCookieConfig.java +++ b/src/main/java/javax/servlet/SessionCookieConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/SessionTrackingMode.java b/src/main/java/javax/servlet/SessionTrackingMode.java index d9126e6b..6ddd690f 100644 --- a/src/main/java/javax/servlet/SessionTrackingMode.java +++ b/src/main/java/javax/servlet/SessionTrackingMode.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/SingleThreadModel.java b/src/main/java/javax/servlet/SingleThreadModel.java index 97bd767c..88569ace 100644 --- a/src/main/java/javax/servlet/SingleThreadModel.java +++ b/src/main/java/javax/servlet/SingleThreadModel.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/UnavailableException.java b/src/main/java/javax/servlet/UnavailableException.java index 5588dcc7..6b4ae49d 100644 --- a/src/main/java/javax/servlet/UnavailableException.java +++ b/src/main/java/javax/servlet/UnavailableException.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java index 45d15977..399a9151 100644 --- a/src/main/java/javax/servlet/WriteListener.java +++ b/src/main/java/javax/servlet/WriteListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java index 33ebfd36..3127dc14 100644 --- a/src/main/java/javax/servlet/annotation/HandlesTypes.java +++ b/src/main/java/javax/servlet/annotation/HandlesTypes.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/HttpConstraint.java b/src/main/java/javax/servlet/annotation/HttpConstraint.java index d4230889..cd7e4355 100644 --- a/src/main/java/javax/servlet/annotation/HttpConstraint.java +++ b/src/main/java/javax/servlet/annotation/HttpConstraint.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java b/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java index 1a5e8131..7f8df681 100644 --- a/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java +++ b/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/MultipartConfig.java b/src/main/java/javax/servlet/annotation/MultipartConfig.java index f697cf70..302a971e 100644 --- a/src/main/java/javax/servlet/annotation/MultipartConfig.java +++ b/src/main/java/javax/servlet/annotation/MultipartConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/ServletSecurity.java b/src/main/java/javax/servlet/annotation/ServletSecurity.java index e40b7f9d..5f862c42 100644 --- a/src/main/java/javax/servlet/annotation/ServletSecurity.java +++ b/src/main/java/javax/servlet/annotation/ServletSecurity.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebFilter.java b/src/main/java/javax/servlet/annotation/WebFilter.java index ce01fb3c..d74b0ea4 100644 --- a/src/main/java/javax/servlet/annotation/WebFilter.java +++ b/src/main/java/javax/servlet/annotation/WebFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebInitParam.java b/src/main/java/javax/servlet/annotation/WebInitParam.java index 14572774..70ab649a 100644 --- a/src/main/java/javax/servlet/annotation/WebInitParam.java +++ b/src/main/java/javax/servlet/annotation/WebInitParam.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebListener.java b/src/main/java/javax/servlet/annotation/WebListener.java index cd54c7c0..2df0fc62 100644 --- a/src/main/java/javax/servlet/annotation/WebListener.java +++ b/src/main/java/javax/servlet/annotation/WebListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebServlet.java b/src/main/java/javax/servlet/annotation/WebServlet.java index 4e3c3b6b..7485f27d 100644 --- a/src/main/java/javax/servlet/annotation/WebServlet.java +++ b/src/main/java/javax/servlet/annotation/WebServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2008-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java index 22ab0748..ba1e526e 100644 --- a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2009-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java b/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java index 1fbe918e..c87dfbb6 100644 --- a/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java b/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java index bbec79a3..473abc1b 100644 --- a/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/Cookie.java b/src/main/java/javax/servlet/http/Cookie.java index 42176832..ee3f66b5 100644 --- a/src/main/java/javax/servlet/http/Cookie.java +++ b/src/main/java/javax/servlet/http/Cookie.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpFilter.java b/src/main/java/javax/servlet/http/HttpFilter.java index d6d63898..01560d84 100644 --- a/src/main/java/javax/servlet/http/HttpFilter.java +++ b/src/main/java/javax/servlet/http/HttpFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index bbc57795..18b30fc0 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/src/main/java/javax/servlet/http/HttpServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 74cd673b..c556f5e5 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index 25bd2efd..58f4779a 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java index 8e67ce83..88ed6c50 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponse.java +++ b/src/main/java/javax/servlet/http/HttpServletResponse.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java index fd7b63de..c0ec7096 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java index 992afbf8..0c38ee8d 100644 --- a/src/main/java/javax/servlet/http/HttpSession.java +++ b/src/main/java/javax/servlet/http/HttpSession.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index e011373a..714856df 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java index e67b544f..644e60aa 100644 --- a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java index 5ce9752e..834b012d 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java index 49234d7b..f9ebf457 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java index b984c913..0bd2b95b 100644 --- a/src/main/java/javax/servlet/http/HttpSessionContext.java +++ b/src/main/java/javax/servlet/http/HttpSessionContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionEvent.java b/src/main/java/javax/servlet/http/HttpSessionEvent.java index 96272149..c6a1862a 100644 --- a/src/main/java/javax/servlet/http/HttpSessionEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionIdListener.java b/src/main/java/javax/servlet/http/HttpSessionIdListener.java index c1d4b8c1..1921b92a 100644 --- a/src/main/java/javax/servlet/http/HttpSessionIdListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionIdListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionListener.java b/src/main/java/javax/servlet/http/HttpSessionListener.java index 51daf50e..2b0d343a 100644 --- a/src/main/java/javax/servlet/http/HttpSessionListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpUpgradeHandler.java b/src/main/java/javax/servlet/http/HttpUpgradeHandler.java index ec6c411d..1d840096 100644 --- a/src/main/java/javax/servlet/http/HttpUpgradeHandler.java +++ b/src/main/java/javax/servlet/http/HttpUpgradeHandler.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpUtils.java b/src/main/java/javax/servlet/http/HttpUtils.java index a850bb11..249427cb 100644 --- a/src/main/java/javax/servlet/http/HttpUtils.java +++ b/src/main/java/javax/servlet/http/HttpUtils.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/NoOpPushBuilder.java b/src/main/java/javax/servlet/http/NoOpPushBuilder.java index d149a254..8cd7f6d0 100644 --- a/src/main/java/javax/servlet/http/NoOpPushBuilder.java +++ b/src/main/java/javax/servlet/http/NoOpPushBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/Part.java b/src/main/java/javax/servlet/http/Part.java index 3954f083..2d951ee5 100644 --- a/src/main/java/javax/servlet/http/Part.java +++ b/src/main/java/javax/servlet/http/Part.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/WebConnection.java b/src/main/java/javax/servlet/http/WebConnection.java index 9ca22e16..8827e47f 100644 --- a/src/main/java/javax/servlet/http/WebConnection.java +++ b/src/main/java/javax/servlet/http/WebConnection.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development From 96148e5f3ba3ac11bfe5068e67c2f2493518436d Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Tue, 10 May 2016 16:50:09 +0000 Subject: [PATCH 060/160] M src/main/java/javax/servlet/http/LocalStrings_fr.properties M src/main/java/javax/servlet/http/LocalStrings_es.properties M src/main/java/javax/servlet/http/package.html M src/main/java/javax/servlet/http/LocalStrings.properties M src/main/java/javax/servlet/http/LocalStrings_ja.properties M src/main/java/javax/servlet/LocalStrings_fr.properties M src/main/java/javax/servlet/package.html M src/main/java/javax/servlet/LocalStrings.properties M src/main/java/javax/servlet/LocalStrings_ja.properties M src/main/java/javax/servlet/annotation/package.html M src/main/java/javax/servlet/descriptor/package.html M src/main/resources/META-INF/README M pom.xml - Update copyright dates. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64262 --- pom.xml | 2 +- src/main/java/javax/servlet/LocalStrings.properties | 2 +- src/main/java/javax/servlet/LocalStrings_fr.properties | 2 +- src/main/java/javax/servlet/LocalStrings_ja.properties | 2 +- src/main/java/javax/servlet/annotation/package.html | 2 +- src/main/java/javax/servlet/descriptor/package.html | 2 +- src/main/java/javax/servlet/http/LocalStrings.properties | 2 +- src/main/java/javax/servlet/http/LocalStrings_es.properties | 4 ++-- src/main/java/javax/servlet/http/LocalStrings_fr.properties | 2 +- src/main/java/javax/servlet/http/LocalStrings_ja.properties | 2 +- src/main/java/javax/servlet/http/package.html | 2 +- src/main/java/javax/servlet/package.html | 2 +- src/main/resources/META-INF/README | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 5c1d1e4a..a616bc7c 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ -Oracle and/or its affiliates. All Rights Reserved. Use is subject to diff --git a/src/main/java/javax/servlet/LocalStrings.properties b/src/main/java/javax/servlet/LocalStrings.properties index a6c765a4..efefc4ed 100644 --- a/src/main/java/javax/servlet/LocalStrings.properties +++ b/src/main/java/javax/servlet/LocalStrings.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/LocalStrings_fr.properties b/src/main/java/javax/servlet/LocalStrings_fr.properties index d90b8522..9c67c3b4 100644 --- a/src/main/java/javax/servlet/LocalStrings_fr.properties +++ b/src/main/java/javax/servlet/LocalStrings_fr.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/LocalStrings_ja.properties b/src/main/java/javax/servlet/LocalStrings_ja.properties index 52659bb8..23c2f73a 100644 --- a/src/main/java/javax/servlet/LocalStrings_ja.properties +++ b/src/main/java/javax/servlet/LocalStrings_ja.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/package.html b/src/main/java/javax/servlet/annotation/package.html index 6be44bc6..fea3fc8a 100644 --- a/src/main/java/javax/servlet/annotation/package.html +++ b/src/main/java/javax/servlet/annotation/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2008-2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/package.html b/src/main/java/javax/servlet/descriptor/package.html index 5e5b4241..1cb7db15 100644 --- a/src/main/java/javax/servlet/descriptor/package.html +++ b/src/main/java/javax/servlet/descriptor/package.html @@ -5,7 +5,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009-2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/LocalStrings.properties b/src/main/java/javax/servlet/http/LocalStrings.properties index d0f5ca55..4e6556d8 100644 --- a/src/main/java/javax/servlet/http/LocalStrings.properties +++ b/src/main/java/javax/servlet/http/LocalStrings.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/LocalStrings_es.properties b/src/main/java/javax/servlet/http/LocalStrings_es.properties index 7f9b7f56..48b84bdf 100644 --- a/src/main/java/javax/servlet/http/LocalStrings_es.properties +++ b/src/main/java/javax/servlet/http/LocalStrings_es.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development @@ -56,7 +56,7 @@ # limitations under the License. # -# $Id: LocalStrings_es.properties,v 1.1.1.1 2003/01/27 16:07:47 ja120114 Exp $ +# $Id: LocalStrings_es.properties,v 1.1.1.1 2003/01/27 16:07:47 ja120164 Exp $ # # Default localized string information # Localized para Locale es_ES diff --git a/src/main/java/javax/servlet/http/LocalStrings_fr.properties b/src/main/java/javax/servlet/http/LocalStrings_fr.properties index 9bef80c7..576bb537 100644 --- a/src/main/java/javax/servlet/http/LocalStrings_fr.properties +++ b/src/main/java/javax/servlet/http/LocalStrings_fr.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/LocalStrings_ja.properties b/src/main/java/javax/servlet/http/LocalStrings_ja.properties index 0967d935..02678d0e 100644 --- a/src/main/java/javax/servlet/http/LocalStrings_ja.properties +++ b/src/main/java/javax/servlet/http/LocalStrings_ja.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/package.html b/src/main/java/javax/servlet/http/package.html index 18fcab13..d3d033fd 100644 --- a/src/main/java/javax/servlet/http/package.html +++ b/src/main/java/javax/servlet/http/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/package.html b/src/main/java/javax/servlet/package.html index c1d2d223..66848874 100644 --- a/src/main/java/javax/servlet/package.html +++ b/src/main/java/javax/servlet/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/resources/META-INF/README b/src/main/resources/META-INF/README index 54f53e00..a583144d 100644 --- a/src/main/resources/META-INF/README +++ b/src/main/resources/META-INF/README @@ -1,7 +1,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development From 074f300916b166840799883edc412150888c306c Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 18 Jan 2017 19:52:17 +0000 Subject: [PATCH 061/160] change etag to eTag in PushBuilder svn path=/trunk/api/javaee-api/javax.servlet/; revision=64410 --- .../javax/servlet/http/NoOpPushBuilder.java | 6 ++--- .../java/javax/servlet/http/PushBuilder.java | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/javax/servlet/http/NoOpPushBuilder.java b/src/main/java/javax/servlet/http/NoOpPushBuilder.java index 8cd7f6d0..92e8444a 100644 --- a/src/main/java/javax/servlet/http/NoOpPushBuilder.java +++ b/src/main/java/javax/servlet/http/NoOpPushBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -63,7 +63,7 @@ class NoOpPushBuilder implements PushBuilder { @Override public PushBuilder path(String path) { return this; } @Override - public PushBuilder etag(String etag) { return this; } + public PushBuilder eTag(String etag) { return this; } @Override public PushBuilder lastModified(String lastModified) { return this; } @Override @@ -83,7 +83,7 @@ public void push() {} @Override public String getPath() { return ""; } @Override - public String getEtag() { return ""; } + public String getETag() { return ""; } @Override public String getLastModified() { return ""; } } diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index abeb60a3..87a21075 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -110,7 +110,7 @@ * asynchronous push request with the current state of the builder. * After the call to {@link #push()}, the builder may be reused for * another push, however the implementation must make it so the {@link - * #path(String)}, {@link #etag(String)} and {@link + * #path(String)}, {@link #eTag(String)} and {@link * #lastModified(String)} values are cleared before returning from * {@link #push}. All other values are retained over calls to {@link * #push()}. @@ -157,9 +157,9 @@ public interface PushBuilder public abstract PushBuilder sessionId(String sessionId); /** Set if the request is to be conditional. - * If the request is conditional, any available values from {@link #etag(String)} or + * If the request is conditional, any available values from {@link #eTag(String)} or * {@link #lastModified(String)} will be set in the appropriate headers. If the request - * is not conditional, then etag and lastModified values are ignored. + * is not conditional, then eTag and lastModified values are ignored. * Defaults to true if the associated request was conditional. * @param conditional true if the push request is conditional * @return this builder. @@ -214,14 +214,14 @@ public interface PushBuilder public abstract PushBuilder path(String path); /** - * Set the etag to be used for conditional pushes. - * The etag will be used only if {@link #isConditional()} is true. - * Defaults to no etag. The value is nulled after every call to + * Set the eTag to be used for conditional pushes. + * The eTag will be used only if {@link #isConditional()} is true. + * Defaults to no eTag. The value is nulled after every call to * {@link #push()} - * @param etag the etag to be used for the push. + * @param eTag the eTag to be used for the push. * @return this builder. */ - public abstract PushBuilder etag(String etag); + public abstract PushBuilder eTag(String eTag); /** * Set the last modified date to be used for conditional pushes. @@ -242,9 +242,9 @@ public interface PushBuilder * be pushed, since it is possible the client can decline acceptance * of the pushed resource using the underlying HTTP/2 protocol.

    - *

    If {@link #isConditional()} is true and an etag or + *

    If {@link #isConditional()} is true and an eTag or * lastModified value is provided, then an appropriate conditional - * header will be generated. If both an etag and lastModified value + * header will be generated. If both an eTag and lastModified value * are provided only an If-None-Match header will be generated. If * the builder has a session ID, then the pushed request will * include the session ID either as a Cookie or as a URI parameter @@ -252,7 +252,7 @@ public interface PushBuilder * passed query string.

    *

    Before returning from this method, the builder has its path, - * etag and lastModified fields nulled. All other fields are left as + * eTag and lastModified fields nulled. All other fields are left as * is for possible reuse in another push.

    * * @throws IllegalArgumentException if the method set expects a @@ -276,7 +276,7 @@ public interface PushBuilder public abstract Set getHeaderNames(); public abstract String getHeader(String name); public abstract String getPath(); - public abstract String getEtag(); + public abstract String getETag(); public abstract String getLastModified(); From d8c2e0fca9443483a6ae5d10ae0fffa9244614e4 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 20 Jan 2017 21:05:41 +0000 Subject: [PATCH 062/160] SERVLET_SPEC-148 M src/main/java/javax/servlet/http/HttpServletRequest.java - Add @since 4.0 to getPushBuilder svn path=/trunk/api/javaee-api/javax.servlet/; revision=64420 --- .../servlet/http/HttpServletRequest.java | 190 +++++++++--------- 1 file changed, 96 insertions(+), 94 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index c556f5e5..d0ffa3ca 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -68,7 +68,7 @@ * Extends the {@link javax.servlet.ServletRequest} interface to provide * request information for HTTP servlets. * - *

    The servlet container creates an HttpServletRequest + *

    The servlet container creates an HttpServletRequest * object and passes it as an argument to the servlet's service * methods (doGet, doPost, etc). * @@ -100,23 +100,23 @@ public interface HttpServletRequest extends ServletRequest { /** * Returns the name of the authentication scheme used to protect - * the servlet. All servlet containers support basic, form and client - * certificate authentication, and may additionally support digest + * the servlet. All servlet containers support basic, form and client + * certificate authentication, and may additionally support digest * authentication. - * If the servlet is not authenticated null is returned. + * If the servlet is not authenticated null is returned. * *

    Same as the value of the CGI variable AUTH_TYPE. * - * @return one of the static members BASIC_AUTH, + * @return one of the static members BASIC_AUTH, * FORM_AUTH, CLIENT_CERT_AUTH, DIGEST_AUTH * (suitable for == comparison) or * the container-specific string indicating * the authentication scheme, or - * null if the request was - * not authenticated. + * null if the request was + * not authenticated. */ public String getAuthType(); - + /** * Returns an array containing all of the Cookie * objects the client sent with this request. @@ -130,10 +130,10 @@ public interface HttpServletRequest extends ServletRequest { /** * Returns the value of the specified request header - * as a long value that represents a + * as a long value that represents a * Date object. Use this method with * headers that contain dates, such as - * If-Modified-Since. + * If-Modified-Since. * *

    The date is returned as * the number of milliseconds since January 1, 1970 GMT. @@ -179,8 +179,8 @@ public interface HttpServletRequest extends ServletRequest { * header, or null * if the request does not * have a header of that name - */ - public String getHeader(String name); + */ + public String getHeader(String name); /** * Returns all the values of the specified request header @@ -203,12 +203,12 @@ public interface HttpServletRequest extends ServletRequest { * the values of the requested header. If * the request does not have any headers of * that name return an empty - * enumeration. If + * enumeration. If * the container does not allow access to * header information, return null - */ - public Enumeration getHeaders(String name); - + */ + public Enumeration getHeaders(String name); + /** * Returns an enumeration of all the header names * this request contains. If the request has no @@ -227,7 +227,7 @@ public interface HttpServletRequest extends ServletRequest { * null */ public Enumeration getHeaderNames(); - + /** * Returns the value of the specified request header * as an int. If the request does not have a header @@ -240,7 +240,7 @@ public interface HttpServletRequest extends ServletRequest { * @param name a String specifying the name * of a request header * - * @return an integer expressing the value + * @return an integer expressing the value * of the request header or -1 * if the request doesn't have a * header of this name @@ -250,19 +250,19 @@ public interface HttpServletRequest extends ServletRequest { * to an int */ public int getIntHeader(String name); - + /** - * Returns the name of the HTTP method with which this + * Returns the name of the HTTP method with which this * request was made, for example, GET, POST, or PUT. * Same as the value of the CGI variable REQUEST_METHOD. * - * @return a String + * @return a String * specifying the name * of the method with which * this request was made */ public String getMethod(); - + /** * Returns any extra path information associated with * the URL the client sent when it made this request. @@ -276,7 +276,7 @@ public interface HttpServletRequest extends ServletRequest { *

    Same as the value of the CGI variable PATH_INFO. * * @return a String, decoded by the - * web container, specifying + * web container, specifying * extra path information that comes * after the servlet path but before * the query string in the request URL; @@ -315,11 +315,13 @@ public interface HttpServletRequest extends ServletRequest { * * @return a {@link PushBuilder} for issuing server push responses * from the current request. + * + * @since 4.0 */ default public PushBuilder getPushBuilder() { return new NoOpPushBuilder(); } - + /** * Returns the portion of the request URI that indicates the context * of the request. The context path always comes first in a request @@ -344,26 +346,26 @@ default public PushBuilder getPushBuilder() { * @see javax.servlet.ServletContext#getContextPath() */ public String getContextPath(); - + /** * Returns the query string that is contained in the request * URL after the path. This method returns null * if the URL does not have a query string. Same as the value - * of the CGI variable QUERY_STRING. + * of the CGI variable QUERY_STRING. * * @return a String containing the query - * string or null if the URL + * string or null if the URL * contains no query string. The value is not * decoded by the container. */ public String getQueryString(); - + /** * Returns the login of the user making this request, if the - * user has been authenticated, or null if the user + * user has been authenticated, or null if the user * has not been authenticated. * Whether the user name is sent with each subsequent request - * depends on the browser and type of authentication. Same as the + * depends on the browser and type of authentication. Same as the * value of the CGI variable REMOTE_USER. * * @return a String specifying the login @@ -371,7 +373,7 @@ default public PushBuilder getPushBuilder() { * if the user login is not known */ public String getRemoteUser(); - + /** * Returns a boolean indicating whether the authenticated user is included * in the specified logical "role". Roles and role membership can be @@ -394,11 +396,11 @@ default public PushBuilder getPushBuilder() { * * @return a boolean indicating whether * the user making this request belongs to a given role; - * false if the user has not been + * false if the user has not been * authenticated */ public boolean isUserInRole(String role); - + /** * Returns a java.security.Principal object containing * the name of the current authenticated user. If the user has not been @@ -406,11 +408,11 @@ default public PushBuilder getPushBuilder() { * * @return a java.security.Principal containing * the name of the user making this request; - * null if the user has not been + * null if the user has not been * authenticated */ public java.security.Principal getUserPrincipal(); - + /** * Returns the session ID specified by the client. This may * not be the same as the ID of the current valid session @@ -425,13 +427,13 @@ default public PushBuilder getPushBuilder() { * @see #isRequestedSessionIdValid */ public String getRequestedSessionId(); - + /** * Returns the part of this request's URL from the protocol * name up to the query string in the first line of the HTTP request. * The web container does not decode this String. * For example: - * + * * * * @@ -445,13 +447,13 @@ default public PushBuilder getPushBuilder() { * {@link HttpUtils#getRequestURL}. * * @return a String containing - * the part of the URL from the + * the part of the URL from the * protocol name up to the query string * * @see HttpUtils#getRequestURL */ public String getRequestURI(); - + /** * Reconstructs the URL the client used to make the request. * The returned URL contains a protocol, server name, port @@ -495,11 +497,11 @@ default public PushBuilder getPushBuilder() { * using the "/*" pattern. */ public String getServletPath(); - + /** * Returns the current HttpSession * associated with this request or, if there is no - * current session and create is true, returns + * current session and create is true, returns * a new session. * *

    If create is false @@ -507,17 +509,17 @@ default public PushBuilder getPushBuilder() { * this method returns null. * *

    To make sure the session is properly maintained, - * you must call this method before + * you must call this method before * the response is committed. If the container is using cookies * to maintain session integrity and is asked to create a new session * when the response is committed, an IllegalStateException is thrown. * * @param create true to create - * a new session for this request if necessary; + * a new session for this request if necessary; * false to return null * if there's no current session * - * @return the HttpSession associated + * @return the HttpSession associated * with this request or null if * create is false * and the request has no valid session @@ -529,7 +531,7 @@ default public PushBuilder getPushBuilder() { /** * Returns the current session associated with this request, * or if the request does not have a session, creates one. - * + * * @return the HttpSession associated * with this request * @@ -539,7 +541,7 @@ default public PushBuilder getPushBuilder() { /** * Change the session id of the current session associated with this - * request and return the new session id. + * request and return the new session id. * * @return the new session id * @@ -549,12 +551,12 @@ default public PushBuilder getPushBuilder() { * @since Servlet 3.1 */ public String changeSessionId(); - + /** * Checks whether the requested session ID is still valid. * *

    If the client did not specify any session ID, this method returns - * false. + * false. * * @return true if this * request has an id for a valid session @@ -566,7 +568,7 @@ default public PushBuilder getPushBuilder() { * @see HttpSessionContext */ public boolean isRequestedSessionIdValid(); - + /** * Checks whether the requested session ID came in as a cookie. * @@ -575,11 +577,11 @@ default public PushBuilder getPushBuilder() { * cookie; otherwise, false * * @see #getSession - */ + */ public boolean isRequestedSessionIdFromCookie(); - + /** - * Checks whether the requested session ID came in as part of the + * Checks whether the requested session ID came in as part of the * request URL. * * @return true if the session ID @@ -589,12 +591,12 @@ default public PushBuilder getPushBuilder() { * @see #getSession */ public boolean isRequestedSessionIdFromURL(); - + /** * @deprecated As of Version 2.1 of the Java Servlet * API, use {@link #isRequestedSessionIdFromURL} * instead. - * + * * @return true if the session ID * came in as part of a URL; otherwise, * false @@ -603,21 +605,21 @@ default public PushBuilder getPushBuilder() { public boolean isRequestedSessionIdFromUrl(); /** - * Use the container login mechanism configured for the - * ServletContext to authenticate the user making - * this request. - * - *

    This method may modify and commit the argument + * Use the container login mechanism configured for the + * ServletContext to authenticate the user making + * this request. + * + *

    This method may modify and commit the argument * HttpServletResponse. - * - * @param response The HttpServletResponse + * + * @param response The HttpServletResponse * associated with this HttpServletRequest - * + * * @return true when non-null values were or have been - * established as the values returned by getUserPrincipal, - * getRemoteUser, and getAuthType. Return - * false if authentication is incomplete and the underlying - * login mechanism has committed, in the response, the message (e.g., + * established as the values returned by getUserPrincipal, + * getRemoteUser, and getAuthType. Return + * false if authentication is incomplete and the underlying + * login mechanism has committed, in the response, the message (e.g., * challenge) and HTTP status code to be returned to the user. * * @throws IOException if an input or output error occurred while @@ -625,60 +627,60 @@ default public PushBuilder getPushBuilder() { * * @throws IllegalStateException if the login mechanism attempted to * modify the response and it was already committed - * + * * @throws ServletException if the authentication failed and - * the caller is responsible for handling the error (i.e., the - * underlying login mechanism did NOT establish the message and + * the caller is responsible for handling the error (i.e., the + * underlying login mechanism did NOT establish the message and * HTTP status code to be returned to the user) * * @since Servlet 3.0 */ - public boolean authenticate(HttpServletResponse response) + public boolean authenticate(HttpServletResponse response) throws IOException,ServletException; /** - * Validate the provided username and password in the password validation - * realm used by the web container login mechanism configured for the + * Validate the provided username and password in the password validation + * realm used by the web container login mechanism configured for the * ServletContext. - * - *

    This method returns without throwing a ServletException - * when the login mechanism configured for the ServletContext + * + *

    This method returns without throwing a ServletException + * when the login mechanism configured for the ServletContext * supports username password validation, and when, at the time of the * call to login, the identity of the caller of the request had - * not been established (i.e, all of getUserPrincipal, - * getRemoteUser, and getAuthType return null), - * and when validation of the provided credentials is successful. + * not been established (i.e, all of getUserPrincipal, + * getRemoteUser, and getAuthType return null), + * and when validation of the provided credentials is successful. * Otherwise, this method throws a ServletException as * described below. - * + * *

    When this method returns without throwing an exception, it must * have established non-null values as the values returned by - * getUserPrincipal, getRemoteUser, and + * getUserPrincipal, getRemoteUser, and * getAuthType. - * + * * @param username The String value corresponding to * the login identifier of the user. - * + * * @param password The password String corresponding * to the identified user. * - * @exception ServletException if the configured login mechanism - * does not support username - * password authentication, or if a - * non-null caller identity had - * already been established (prior - * to the call to login), or if - * validation of the provided + * @exception ServletException if the configured login mechanism + * does not support username + * password authentication, or if a + * non-null caller identity had + * already been established (prior + * to the call to login), or if + * validation of the provided * username and password fails. * * @since Servlet 3.0 */ - public void login(String username, String password) + public void login(String username, String password) throws ServletException; - + /** - * Establish null as the value returned when - * getUserPrincipal, getRemoteUser, + * Establish null as the value returned when + * getUserPrincipal, getRemoteUser, * and getAuthType is called on the request. * * @exception ServletException if logout fails @@ -695,7 +697,7 @@ public void login(String username, String password) * does not contain any Part components, the returned * Collection will be empty. * - *

    Any changes to the returned Collection must not + *

    Any changes to the returned Collection must not * affect this HttpServletRequest. * * @return a (possibly empty) Collection of the From 102d62b896861d1daec700774a388e22fce0bdaa Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 20 Jan 2017 21:08:43 +0000 Subject: [PATCH 063/160] SERVLET_SPEC-149 M src/main/java/javax/servlet/ServletContext.java - Remove the use of "default" context in the spec for getContextPath() svn path=/trunk/api/javaee-api/javax.servlet/; revision=64421 --- .../java/javax/servlet/ServletContext.java | 238 +++++++++--------- 1 file changed, 119 insertions(+), 119 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 4e39a888..f97ec0ca 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -76,16 +76,16 @@ *

    There is one context per "web application" per Java Virtual Machine. (A * "web application" is a collection of servlets and content installed under a * specific subset of the server's URL namespace such as /catalog - * and possibly installed via a .war file.) + * and possibly installed via a .war file.) * *

    In the case of a web * application marked "distributed" in its deployment descriptor, there will - * be one context instance for each virtual machine. In this situation, the + * be one context instance for each virtual machine. In this situation, the * context cannot be used as a location to share global information (because - * the information won't be truly global). Use an external resource like + * the information won't be truly global). Use an external resource like * a database instead. * - *

    The ServletContext object is contained within + *

    The ServletContext object is contained within * the {@link ServletConfig} object, which the Web server provides the * servlet when the servlet is initialized. * @@ -123,7 +123,7 @@ public interface ServletContext { * *

    The context path is the portion of the request URI that is used * to select the context of the request. The context path always comes - * first in a request URI. If this context is the "default" context + * first in a request URI. If this context is the "root" context * rooted at the base of the Web server's URL name space, this path * will be an empty string. Otherwise, if the context is not rooted at * the root of the server's name space, the path starts with a / @@ -138,7 +138,7 @@ public interface ServletContext { * prime or preferred context path of the application. * * @return The context path of the web application, or "" for the - * default (root) context + * root context * * @see javax.servlet.http.HttpServletRequest#getContextPath() * @@ -148,30 +148,30 @@ public interface ServletContext { /** - * Returns a ServletContext object that + * Returns a ServletContext object that * corresponds to a specified URL on the server. * *

    This method allows servlets to gain * access to the context for various parts of the server, and as * needed obtain {@link RequestDispatcher} objects from the context. - * The given path must be begin with /, is interpreted relative + * The given path must be begin with /, is interpreted relative * to the server's document root and is matched against the context * roots of other web applications hosted on this container. - * + * *

    In a security conscious environment, the servlet container may * return null for a given URL. - * + * * @param uripath a String specifying the context path of * another web application in the container. * @return the ServletContext object that * corresponds to the named URL, or null if either - none exists or the container wishes to restrict + none exists or the container wishes to restrict * this access. * * @see RequestDispatcher */ public ServletContext getContext(String uripath); - + /** * Returns the major version of the Servlet API that this @@ -181,8 +181,8 @@ public interface ServletContext { * @return 4 */ public int getMajorVersion(); - - + + /** * Returns the minor version of the Servlet API that this * servlet container supports. All implementations that comply @@ -191,8 +191,8 @@ public interface ServletContext { * @return 0 */ public int getMinorVersion(); - - + + /** * Gets the major version of the Servlet specification that the * application represented by this ServletContext is based on. @@ -213,8 +213,8 @@ public interface ServletContext { * @since Servlet 3.0 */ public int getEffectiveMajorVersion(); - - + + /** * Gets the minor version of the Servlet specification that the * application represented by this ServletContext is based on. @@ -238,7 +238,7 @@ public interface ServletContext { /** - * Returns the MIME type of the specified file, or null if + * Returns the MIME type of the specified file, or null if * the MIME type is not known. The MIME type is determined * by the configuration of the servlet container, and may be specified * in a web application deployment descriptor. Common MIME @@ -249,7 +249,7 @@ public interface ServletContext { * @return a String specifying the file's MIME type */ public String getMimeType(String file); - + /** * Returns a directory-like listing of all the paths to resources @@ -276,23 +276,23 @@ public interface ServletContext { * /WEB-INF/classes/com.acme.OrderServlet.class * /WEB-INF/lib/catalog.jar!/META-INF/resources/catalog/moreOffers/books.html * } - * + * * getResourcePaths("/") would return * {"/welcome.html", "/catalog/", "/customer/", "/WEB-INF/"}, * and getResourcePaths("/catalog/") would return * {"/catalog/index.html", "/catalog/products.html", * "/catalog/offers/", "/catalog/moreOffers/"}. - * + * * @param path the partial path used to match the resources, * which must start with a / * @return a Set containing the directory listing, or null if there * are no resources in the web application whose path * begins with the supplied path. - * + * * @since Servlet 2.3 - */ + */ public Set getResourcePaths(String path); - + /** * Returns a URL to the resource that is mapped to the given path. @@ -308,10 +308,10 @@ public interface ServletContext { * The order in which the JAR files inside /WEB-INF/lib * are searched is undefined. * - *

    This method allows the servlet container to make a resource - * available to servlets from any source. Resources + *

    This method allows the servlet container to make a resource + * available to servlets from any source. Resources * can be located on a local or remote - * file system, in a database, or in a .war file. + * file system, in a database, or in a .war file. * *

    The servlet container must implement the URL handlers * and URLConnection objects that are necessary @@ -323,38 +323,38 @@ public interface ServletContext { *

    Some containers may allow writing to the URL returned by * this method using the methods of the URL class. * - *

    The resource content is returned directly, so be aware that + *

    The resource content is returned directly, so be aware that * requesting a .jsp page returns the JSP source code. - * Use a RequestDispatcher instead to include results of + * Use a RequestDispatcher instead to include results of * an execution. * *

    This method has a different purpose than * java.lang.Class.getResource, * which looks up resources based on a class loader. This * method does not use class loaders. - * + * * @param path a String specifying * the path to the resource * * @return the resource located at the named path, * or null if there is no resource at that path * - * @exception MalformedURLException if the pathname is not given in + * @exception MalformedURLException if the pathname is not given in * the correct form - */ + */ public URL getResource(String path) throws MalformedURLException; - + /** * Returns the resource located at the named path as * an InputStream object. * - *

    The data in the InputStream can be + *

    The data in the InputStream can be * of any type or length. The path must be specified according * to the rules given in getResource. * This method returns null if no resource exists at - * the specified path. - * + * the specified path. + * *

    Meta-information such as content length and content type * that is available via getResource * method is lost when using this method. @@ -363,28 +363,28 @@ public interface ServletContext { * and URLConnection objects necessary to access * the resource. * - *

    This method is different from + *

    This method is different from * java.lang.Class.getResourceAsStream, - * which uses a class loader. This method allows servlet containers + * which uses a class loader. This method allows servlet containers * to make a resource available * to a servlet from any location, without using a class loader. - * + * * * @param path a String specifying the path * to the resource * - * @return the InputStream returned to the + * @return the InputStream returned to the * servlet, or null if no resource - * exists at the specified path + * exists at the specified path */ public InputStream getResourceAsStream(String path); - + /** - * + * * Returns a {@link RequestDispatcher} object that acts * as a wrapper for the resource located at the given path. - * A RequestDispatcher object can be used to forward + * A RequestDispatcher object can be used to forward * a request to the resource or to include the resource in a response. * The resource can be dynamic or static. * @@ -402,7 +402,7 @@ public interface ServletContext { * * @return a RequestDispatcher object * that acts as a wrapper for the resource - * at the specified path, or null if + * at the specified path, or null if * the ServletContext cannot return * a RequestDispatcher * @@ -416,12 +416,12 @@ public interface ServletContext { * Returns a {@link RequestDispatcher} object that acts * as a wrapper for the named servlet. * - *

    Servlets (and JSP pages also) may be given names via server + *

    Servlets (and JSP pages also) may be given names via server * administration or via a web application deployment descriptor. - * A servlet instance can determine its name using + * A servlet instance can determine its name using * {@link ServletConfig#getServletName}. * - *

    This method returns null if the + *

    This method returns null if the * ServletContext * cannot return a RequestDispatcher for any reason. * @@ -438,18 +438,18 @@ public interface ServletContext { * @see ServletConfig#getServletName */ public RequestDispatcher getNamedDispatcher(String name); - - + + /** * @deprecated As of Java Servlet API 2.1, with no direct replacement. * *

    This method was originally defined to retrieve a servlet - * from a ServletContext. In this version, this method - * always returns null and remains only to preserve - * binary compatibility. This method will be permanently removed + * from a ServletContext. In this version, this method + * always returns null and remains only to preserve + * binary compatibility. This method will be permanently removed * in a future version of the Java Servlet API. * - *

    In lieu of this method, servlets can share information using the + *

    In lieu of this method, servlets can share information using the * ServletContext class and can perform shared business logic * by invoking methods on common non-servlet classes. * @@ -460,7 +460,7 @@ public interface ServletContext { */ @Deprecated public Servlet getServlet(String name) throws ServletException; - + /** * @deprecated As of Java Servlet API 2.0, with no replacement. @@ -477,42 +477,42 @@ public interface ServletContext { */ @Deprecated public Enumeration getServlets(); - + /** * @deprecated As of Java Servlet API 2.1, with no replacement. * - *

    This method was originally defined to return an + *

    This method was originally defined to return an * Enumeration * of all the servlet names known to this context. In this version, - * this method always returns an empty Enumeration and - * remains only to preserve binary compatibility. This method will + * this method always returns an empty Enumeration and + * remains only to preserve binary compatibility. This method will * be permanently removed in a future version of the Java Servlet API. * * @return an Enumeration of {@code javax.servlet.Servlet Servlet} names */ @Deprecated public Enumeration getServletNames(); - + /** * * Writes the specified message to a servlet log file, usually - * an event log. The name and type of the servlet log file is + * an event log. The name and type of the servlet log file is * specific to the servlet container. * - * @param msg a String specifying the + * @param msg a String specifying the * message to be written to the log file */ public void log(String msg); - + /** * @deprecated As of Java Servlet API 2.1, use - * {@link #log(String message, Throwable throwable)} + * {@link #log(String message, Throwable throwable)} * instead. * - *

    This method was originally defined to write an + *

    This method was originally defined to write an * exception's stack trace and an explanatory error message * to the servlet log file. * @@ -521,23 +521,23 @@ public interface ServletContext { */ @Deprecated public void log(Exception exception, String msg); - + /** * Writes an explanatory message and a stack trace * for a given Throwable exception - * to the servlet log file. The name and type of the servlet log + * to the servlet log file. The name and type of the servlet log * file is specific to the servlet container, usually an event log. * - * @param message a String that + * @param message a String that * describes the error or exception * - * @param throwable the Throwable error + * @param throwable the Throwable error * or exception */ public void log(String message, Throwable throwable); - - + + /** * Gets the real path corresponding to the given * virtual path. @@ -571,27 +571,27 @@ public interface ServletContext { * translation cannot be performed */ public String getRealPath(String path); - + /** * Returns the name and version of the servlet container on which - * the servlet is running. + * the servlet is running. * - *

    The form of the returned string is + *

    The form of the returned string is * servername/versionnumber. * For example, the JavaServer Web Development Kit may return the string * JavaServer Web Dev Kit/1.0. * - *

    The servlet container may return other optional information + *

    The servlet container may return other optional information * after the primary string in parentheses, for example, * JavaServer Web Dev Kit/1.0 (JDK 1.1.6; Windows NT 4.0 x86). * * - * @return a String containing at least the + * @return a String containing at least the * servlet container name and version number */ public String getServerInfo(); - + /** * Returns a String containing the value of the named @@ -599,13 +599,13 @@ public interface ServletContext { * the parameter does not exist. * *

    This method can make available configuration information useful - * to an entire web application. For example, it can provide a - * webmaster's email address or the name of a system that holds + * to an entire web application. For example, it can provide a + * webmaster's email address or the name of a system that holds * critical data. * * @param name a String containing the name of the * parameter whose value is requested - * + * * @return a String containing the value of the * context's initialization parameter, or null if the * context's initialization parameter does not exist. @@ -624,14 +624,14 @@ public interface ServletContext { * empty Enumeration if the context has no initialization * parameters. * - * @return an Enumeration of String + * @return an Enumeration of String * objects containing the names of the context's * initialization parameters * * @see ServletConfig#getInitParameter */ public Enumeration getInitParameterNames(); - + /** * Sets the context initialization parameter with the given name and @@ -655,7 +655,7 @@ public interface ServletContext { * of a {@link ServletContextListener} that was neither declared in * web.xml or web-fragment.xml, nor annotated * with {@link javax.servlet.annotation.WebListener} - * + * * @since Servlet 3.0 */ public boolean setInitParameter(String name, String value); @@ -680,7 +680,7 @@ public interface ServletContext { * matching java.*, javax.*, * and sun.*. * - * @param name a String specifying the name + * @param name a String specifying the name * of the attribute * * @return an Object containing the value of the @@ -694,39 +694,39 @@ public interface ServletContext { * */ public Object getAttribute(String name); - + /** - * Returns an Enumeration containing the + * Returns an Enumeration containing the * attribute names available within this ServletContext. * *

    Use the {@link #getAttribute} method with an attribute name * to get the value of an attribute. * - * @return an Enumeration of attribute + * @return an Enumeration of attribute * names * * @see #getAttribute */ public Enumeration getAttributeNames(); - - + + /** * Binds an object to a given attribute name in this ServletContext. If * the name specified is already used for an attribute, this * method will replace the attribute with the new to the new attribute. - *

    If listeners are configured on the ServletContext the + *

    If listeners are configured on the ServletContext the * container notifies them accordingly. *

    - * If a null value is passed, the effect is the same as calling + * If a null value is passed, the effect is the same as calling * removeAttribute(). - * + * *

    Attribute names should follow the same convention as package * names. The Java Servlet API specification reserves names * matching java.*, javax.*, and * sun.*. * - * @param name a String specifying the name + * @param name a String specifying the name * of the attribute * * @param object an Object representing the @@ -736,23 +736,23 @@ public interface ServletContext { * */ public void setAttribute(String name, Object object); - + /** - * Removes the attribute with the given name from + * Removes the attribute with the given name from * this ServletContext. After removal, subsequent calls to * {@link #getAttribute} to retrieve the attribute's value * will return null. * - *

    If listeners are configured on the ServletContext the + *

    If listeners are configured on the ServletContext the * container notifies them accordingly. * - * @param name a String specifying the name + * @param name a String specifying the name * of the attribute to be removed */ public void removeAttribute(String name); - + /** * Returns the name of this web application corresponding to this * ServletContext as specified in the deployment descriptor for this @@ -760,7 +760,7 @@ public interface ServletContext { * * @return The name of the web application or null if no name has been * declared in the deployment descriptor. - * + * * @since Servlet 2.3 */ public String getServletContextName(); @@ -773,7 +773,7 @@ public interface ServletContext { *

    The registered servlet may be further configured via the returned * {@link ServletRegistration} object. * - *

    The specified className will be loaded using the + *

    The specified className will be loaded using the * classloader associated with the application represented by this * ServletContext. * @@ -783,7 +783,7 @@ public interface ServletContext { * and returned. * *

    This method introspects the class with the given className - * for the {@link javax.servlet.annotation.ServletSecurity}, + * for the {@link javax.servlet.annotation.ServletSecurity}, * {@link javax.servlet.annotation.MultipartConfig}, * javax.annotation.security.RunAs, and * javax.annotation.security.DeclareRoles annotations. @@ -798,7 +798,7 @@ public interface ServletContext { * @return a ServletRegistration object that may be used to further * configure the registered servlet, or null if this * ServletContext already contains a complete ServletRegistration for - * a servlet with the given servletName + * a servlet with the given servletName * * @throws IllegalStateException if this ServletContext has already * been initialized @@ -849,7 +849,7 @@ public ServletRegistration.Dynamic addServlet( * web.xml or web-fragment.xml, nor annotated * with {@link javax.servlet.annotation.WebListener} * - * @throws IllegalArgumentException if the given servlet instance + * @throws IllegalArgumentException if the given servlet instance * implements {@link SingleThreadModel}, or servletName is null * or an empty String * @@ -872,7 +872,7 @@ public ServletRegistration.Dynamic addServlet( * servletClass to it) and returned. * *

    This method introspects the given servletClass for - * the {@link javax.servlet.annotation.ServletSecurity}, + * the {@link javax.servlet.annotation.ServletSecurity}, * {@link javax.servlet.annotation.MultipartConfig}, * javax.annotation.security.RunAs, and * javax.annotation.security.DeclareRoles annotations. @@ -888,7 +888,7 @@ public ServletRegistration.Dynamic addServlet( * @return a ServletRegistration object that may be used to further * configure the registered servlet, or null if this * ServletContext already contains a complete ServletRegistration for - * the given servletName + * the given servletName * * @throws IllegalStateException if this ServletContext has already * been initialized @@ -912,7 +912,7 @@ public ServletRegistration.Dynamic addServlet(String servletName, * Instantiates the given Servlet class. * *

    The returned Servlet instance may be further customized before it - * is registered with this ServletContext via a call to + * is registered with this ServletContext via a call to * {@link #addServlet(String,Servlet)}. * *

    The given Servlet class must define a zero argument constructor, @@ -920,7 +920,7 @@ public ServletRegistration.Dynamic addServlet(String servletName, * *

    This method introspects the given clazz for * the following annotations: - * {@link javax.servlet.annotation.ServletSecurity}, + * {@link javax.servlet.annotation.ServletSecurity}, * {@link javax.servlet.annotation.MultipartConfig}, * javax.annotation.security.RunAs, and * javax.annotation.security.DeclareRoles. @@ -1003,7 +1003,7 @@ public T createServlet(Class clazz) *

    The registered filter may be further configured via the returned * {@link FilterRegistration} object. * - *

    The specified className will be loaded using the + *

    The specified className will be loaded using the * classloader associated with the application represented by this * ServletContext. * @@ -1023,7 +1023,7 @@ public T createServlet(Class clazz) * @return a FilterRegistration object that may be used to further * configure the registered filter, or null if this * ServletContext already contains a complete FilterRegistration for - * a filter with the given filterName + * a filter with the given filterName * * @throws IllegalStateException if this ServletContext has already * been initialized @@ -1041,7 +1041,7 @@ public T createServlet(Class clazz) */ public FilterRegistration.Dynamic addFilter( String filterName, String className); - + /** * Registers the given filter instance with this ServletContext @@ -1107,7 +1107,7 @@ public FilterRegistration.Dynamic addFilter( * @return a FilterRegistration object that may be used to further * configure the registered filter, or null if this * ServletContext already contains a complete FilterRegistration for a - * filter with the given filterName + * filter with the given filterName * * @throws IllegalStateException if this ServletContext has already * been initialized @@ -1131,7 +1131,7 @@ public FilterRegistration.Dynamic addFilter(String filterName, * Instantiates the given Filter class. * *

    The returned Filter instance may be further customized before it - * is registered with this ServletContext via a call to + * is registered with this ServletContext via a call to * {@link #addFilter(String,Filter)}. * *

    The given Filter class must define a zero argument constructor, @@ -1323,13 +1323,13 @@ public T createFilter(Class clazz) *

  • {@link javax.servlet.http.HttpSessionListener} * * - *

    If this ServletContext was passed to + *

    If this ServletContext was passed to * {@link ServletContainerInitializer#onStartup}, then the class with * the given name may also implement {@link ServletContextListener}, * in addition to the interfaces listed above. * *

    As part of this method call, the container must load the class - * with the specified class name to ensure that it implements one of + * with the specified class name to ensure that it implements one of * the required interfaces. * *

    If the class with the given name implements a listener interface @@ -1380,7 +1380,7 @@ public T createFilter(Class clazz) *

  • {@link javax.servlet.http.HttpSessionListener} * * - *

    If this ServletContext was passed to + *

    If this ServletContext was passed to * {@link ServletContainerInitializer#onStartup}, then the given * listener may also be an instance of {@link ServletContextListener}, * in addition to the interfaces listed above. @@ -1429,7 +1429,7 @@ public T createFilter(Class clazz) *

  • {@link javax.servlet.http.HttpSessionListener} * * - *

    If this ServletContext was passed to + *

    If this ServletContext was passed to * {@link ServletContainerInitializer#onStartup}, then the given * listenerClass may also implement * {@link ServletContextListener}, in addition to the interfaces listed @@ -1522,7 +1522,7 @@ public T createFilter(Class clazz) * @since Servlet 3.0 */ public T createListener(Class clazz) - throws ServletException; + throws ServletException; /** @@ -1570,7 +1570,7 @@ public T createListener(Class clazz) * web.xml or web-fragment.xml, nor annotated * with {@link javax.servlet.annotation.WebListener} * - * @throws SecurityException if a security manager denies access to + * @throws SecurityException if a security manager denies access to * the requested class loader * * @since Servlet 3.0 From c5a1824b4e017369d7c35edf7ec01daa982f3c97 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Fri, 20 Jan 2017 22:52:38 +0000 Subject: [PATCH 064/160] Update copyright to 2017 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64422 --- exclude.xml | 2 +- pom.xml | 4 ++-- release.sh | 2 +- src/main/java/javax/servlet/AsyncContext.java | 2 +- src/main/java/javax/servlet/AsyncEvent.java | 2 +- src/main/java/javax/servlet/AsyncListener.java | 2 +- src/main/java/javax/servlet/DispatcherType.java | 2 +- src/main/java/javax/servlet/Filter.java | 2 +- src/main/java/javax/servlet/FilterChain.java | 2 +- src/main/java/javax/servlet/FilterConfig.java | 2 +- src/main/java/javax/servlet/FilterRegistration.java | 2 +- src/main/java/javax/servlet/GenericFilter.java | 2 +- src/main/java/javax/servlet/GenericServlet.java | 2 +- src/main/java/javax/servlet/HttpConstraintElement.java | 2 +- src/main/java/javax/servlet/HttpMethodConstraintElement.java | 2 +- src/main/java/javax/servlet/LocalStrings.properties | 2 +- src/main/java/javax/servlet/LocalStrings_fr.properties | 2 +- src/main/java/javax/servlet/LocalStrings_ja.properties | 2 +- src/main/java/javax/servlet/MultipartConfigElement.java | 2 +- src/main/java/javax/servlet/ReadListener.java | 2 +- src/main/java/javax/servlet/Registration.java | 2 +- src/main/java/javax/servlet/RequestDispatcher.java | 2 +- src/main/java/javax/servlet/Servlet.java | 2 +- src/main/java/javax/servlet/ServletConfig.java | 2 +- src/main/java/javax/servlet/ServletContainerInitializer.java | 2 +- src/main/java/javax/servlet/ServletContext.java | 2 +- src/main/java/javax/servlet/ServletContextAttributeEvent.java | 2 +- .../java/javax/servlet/ServletContextAttributeListener.java | 2 +- src/main/java/javax/servlet/ServletContextEvent.java | 2 +- src/main/java/javax/servlet/ServletContextListener.java | 2 +- src/main/java/javax/servlet/ServletException.java | 2 +- src/main/java/javax/servlet/ServletInputStream.java | 2 +- src/main/java/javax/servlet/ServletOutputStream.java | 2 +- src/main/java/javax/servlet/ServletRegistration.java | 2 +- src/main/java/javax/servlet/ServletRequest.java | 2 +- src/main/java/javax/servlet/ServletRequestAttributeEvent.java | 2 +- .../java/javax/servlet/ServletRequestAttributeListener.java | 2 +- src/main/java/javax/servlet/ServletRequestEvent.java | 2 +- src/main/java/javax/servlet/ServletRequestListener.java | 2 +- src/main/java/javax/servlet/ServletRequestWrapper.java | 2 +- src/main/java/javax/servlet/ServletResponse.java | 2 +- src/main/java/javax/servlet/ServletResponseWrapper.java | 2 +- src/main/java/javax/servlet/ServletSecurityElement.java | 2 +- src/main/java/javax/servlet/SessionCookieConfig.java | 2 +- src/main/java/javax/servlet/SessionTrackingMode.java | 2 +- src/main/java/javax/servlet/SingleThreadModel.java | 2 +- src/main/java/javax/servlet/UnavailableException.java | 2 +- src/main/java/javax/servlet/WriteListener.java | 2 +- src/main/java/javax/servlet/annotation/HandlesTypes.java | 2 +- src/main/java/javax/servlet/annotation/HttpConstraint.java | 2 +- .../java/javax/servlet/annotation/HttpMethodConstraint.java | 2 +- src/main/java/javax/servlet/annotation/MultipartConfig.java | 2 +- src/main/java/javax/servlet/annotation/ServletSecurity.java | 2 +- src/main/java/javax/servlet/annotation/WebFilter.java | 2 +- src/main/java/javax/servlet/annotation/WebInitParam.java | 2 +- src/main/java/javax/servlet/annotation/WebListener.java | 2 +- src/main/java/javax/servlet/annotation/WebServlet.java | 2 +- src/main/java/javax/servlet/annotation/package.html | 2 +- .../java/javax/servlet/descriptor/JspConfigDescriptor.java | 2 +- .../javax/servlet/descriptor/JspPropertyGroupDescriptor.java | 2 +- src/main/java/javax/servlet/descriptor/TaglibDescriptor.java | 2 +- src/main/java/javax/servlet/descriptor/package.html | 2 +- src/main/java/javax/servlet/http/Cookie.java | 2 +- src/main/java/javax/servlet/http/HttpFilter.java | 2 +- src/main/java/javax/servlet/http/HttpServlet.java | 2 +- src/main/java/javax/servlet/http/HttpServletRequest.java | 2 +- .../java/javax/servlet/http/HttpServletRequestWrapper.java | 2 +- src/main/java/javax/servlet/http/HttpServletResponse.java | 2 +- .../java/javax/servlet/http/HttpServletResponseWrapper.java | 2 +- src/main/java/javax/servlet/http/HttpSession.java | 2 +- .../javax/servlet/http/HttpSessionActivationListener.java | 2 +- .../java/javax/servlet/http/HttpSessionAttributeListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionBindingEvent.java | 2 +- .../java/javax/servlet/http/HttpSessionBindingListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionContext.java | 2 +- src/main/java/javax/servlet/http/HttpSessionEvent.java | 2 +- src/main/java/javax/servlet/http/HttpSessionIdListener.java | 2 +- src/main/java/javax/servlet/http/HttpSessionListener.java | 2 +- src/main/java/javax/servlet/http/HttpUpgradeHandler.java | 2 +- src/main/java/javax/servlet/http/HttpUtils.java | 2 +- src/main/java/javax/servlet/http/LocalStrings.properties | 2 +- src/main/java/javax/servlet/http/LocalStrings_es.properties | 4 ++-- src/main/java/javax/servlet/http/LocalStrings_fr.properties | 2 +- src/main/java/javax/servlet/http/LocalStrings_ja.properties | 2 +- src/main/java/javax/servlet/http/Part.java | 2 +- src/main/java/javax/servlet/http/WebConnection.java | 2 +- src/main/java/javax/servlet/http/package.html | 2 +- src/main/java/javax/servlet/package.html | 2 +- src/main/javadoc/doc-files/speclicense.html | 4 ++-- src/main/javadoc/javax.servlet-api.css | 2 +- src/main/resources/META-INF/README | 2 +- 91 files changed, 94 insertions(+), 94 deletions(-) diff --git a/exclude.xml b/exclude.xml index e31eedc4..5bcaa0bf 100644 --- a/exclude.xml +++ b/exclude.xml @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/pom.xml b/pom.xml index a616bc7c..ef9df43e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development @@ -241,7 +241,7 @@ -Oracle and/or its affiliates. All Rights Reserved. Use is subject to diff --git a/release.sh b/release.sh index 62c47254..d62e98e9 100755 --- a/release.sh +++ b/release.sh @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java index a1b54ae5..264d0441 100644 --- a/src/main/java/javax/servlet/AsyncContext.java +++ b/src/main/java/javax/servlet/AsyncContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/AsyncEvent.java b/src/main/java/javax/servlet/AsyncEvent.java index df8cb752..e94b0922 100644 --- a/src/main/java/javax/servlet/AsyncEvent.java +++ b/src/main/java/javax/servlet/AsyncEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/AsyncListener.java b/src/main/java/javax/servlet/AsyncListener.java index 9a157d56..8c6293c5 100644 --- a/src/main/java/javax/servlet/AsyncListener.java +++ b/src/main/java/javax/servlet/AsyncListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/DispatcherType.java b/src/main/java/javax/servlet/DispatcherType.java index 541eb0d7..f67e8445 100644 --- a/src/main/java/javax/servlet/DispatcherType.java +++ b/src/main/java/javax/servlet/DispatcherType.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/Filter.java b/src/main/java/javax/servlet/Filter.java index f6a095a7..12f7e01f 100644 --- a/src/main/java/javax/servlet/Filter.java +++ b/src/main/java/javax/servlet/Filter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/FilterChain.java b/src/main/java/javax/servlet/FilterChain.java index fe737147..cafc0632 100644 --- a/src/main/java/javax/servlet/FilterChain.java +++ b/src/main/java/javax/servlet/FilterChain.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/FilterConfig.java b/src/main/java/javax/servlet/FilterConfig.java index bfcacf34..4265b61d 100644 --- a/src/main/java/javax/servlet/FilterConfig.java +++ b/src/main/java/javax/servlet/FilterConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/FilterRegistration.java b/src/main/java/javax/servlet/FilterRegistration.java index 59fc8039..6128df96 100644 --- a/src/main/java/javax/servlet/FilterRegistration.java +++ b/src/main/java/javax/servlet/FilterRegistration.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/GenericFilter.java b/src/main/java/javax/servlet/GenericFilter.java index f6aae53c..f07cc5e2 100644 --- a/src/main/java/javax/servlet/GenericFilter.java +++ b/src/main/java/javax/servlet/GenericFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/GenericServlet.java b/src/main/java/javax/servlet/GenericServlet.java index ea1b5499..c82760f7 100644 --- a/src/main/java/javax/servlet/GenericServlet.java +++ b/src/main/java/javax/servlet/GenericServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/HttpConstraintElement.java b/src/main/java/javax/servlet/HttpConstraintElement.java index 6a30c13f..e8985ede 100644 --- a/src/main/java/javax/servlet/HttpConstraintElement.java +++ b/src/main/java/javax/servlet/HttpConstraintElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/HttpMethodConstraintElement.java b/src/main/java/javax/servlet/HttpMethodConstraintElement.java index d6df392a..36ddf6ff 100644 --- a/src/main/java/javax/servlet/HttpMethodConstraintElement.java +++ b/src/main/java/javax/servlet/HttpMethodConstraintElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/LocalStrings.properties b/src/main/java/javax/servlet/LocalStrings.properties index efefc4ed..dc368276 100644 --- a/src/main/java/javax/servlet/LocalStrings.properties +++ b/src/main/java/javax/servlet/LocalStrings.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/LocalStrings_fr.properties b/src/main/java/javax/servlet/LocalStrings_fr.properties index 9c67c3b4..1abd2eb0 100644 --- a/src/main/java/javax/servlet/LocalStrings_fr.properties +++ b/src/main/java/javax/servlet/LocalStrings_fr.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/LocalStrings_ja.properties b/src/main/java/javax/servlet/LocalStrings_ja.properties index 23c2f73a..84980abf 100644 --- a/src/main/java/javax/servlet/LocalStrings_ja.properties +++ b/src/main/java/javax/servlet/LocalStrings_ja.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/MultipartConfigElement.java b/src/main/java/javax/servlet/MultipartConfigElement.java index 19a88d2c..96e71116 100644 --- a/src/main/java/javax/servlet/MultipartConfigElement.java +++ b/src/main/java/javax/servlet/MultipartConfigElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java index b1a5323b..bf60a774 100644 --- a/src/main/java/javax/servlet/ReadListener.java +++ b/src/main/java/javax/servlet/ReadListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/Registration.java b/src/main/java/javax/servlet/Registration.java index 08b415f0..6c8bc1ec 100644 --- a/src/main/java/javax/servlet/Registration.java +++ b/src/main/java/javax/servlet/Registration.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/RequestDispatcher.java b/src/main/java/javax/servlet/RequestDispatcher.java index a14ca9e6..86d2daf3 100644 --- a/src/main/java/javax/servlet/RequestDispatcher.java +++ b/src/main/java/javax/servlet/RequestDispatcher.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/Servlet.java b/src/main/java/javax/servlet/Servlet.java index f945e415..c0bf45d8 100644 --- a/src/main/java/javax/servlet/Servlet.java +++ b/src/main/java/javax/servlet/Servlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletConfig.java b/src/main/java/javax/servlet/ServletConfig.java index ce35d9f3..312e7484 100644 --- a/src/main/java/javax/servlet/ServletConfig.java +++ b/src/main/java/javax/servlet/ServletConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContainerInitializer.java b/src/main/java/javax/servlet/ServletContainerInitializer.java index 06890eed..b07bf954 100644 --- a/src/main/java/javax/servlet/ServletContainerInitializer.java +++ b/src/main/java/javax/servlet/ServletContainerInitializer.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index f97ec0ca..4b82006e 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextAttributeEvent.java b/src/main/java/javax/servlet/ServletContextAttributeEvent.java index f64cc244..3413ca4f 100644 --- a/src/main/java/javax/servlet/ServletContextAttributeEvent.java +++ b/src/main/java/javax/servlet/ServletContextAttributeEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextAttributeListener.java b/src/main/java/javax/servlet/ServletContextAttributeListener.java index df6498f1..493cab8b 100644 --- a/src/main/java/javax/servlet/ServletContextAttributeListener.java +++ b/src/main/java/javax/servlet/ServletContextAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextEvent.java b/src/main/java/javax/servlet/ServletContextEvent.java index e98bee2a..7db29b6f 100644 --- a/src/main/java/javax/servlet/ServletContextEvent.java +++ b/src/main/java/javax/servlet/ServletContextEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletContextListener.java b/src/main/java/javax/servlet/ServletContextListener.java index 212ce350..b5d69f70 100644 --- a/src/main/java/javax/servlet/ServletContextListener.java +++ b/src/main/java/javax/servlet/ServletContextListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletException.java b/src/main/java/javax/servlet/ServletException.java index 46190563..bf85c2dd 100644 --- a/src/main/java/javax/servlet/ServletException.java +++ b/src/main/java/javax/servlet/ServletException.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletInputStream.java b/src/main/java/javax/servlet/ServletInputStream.java index 4e07bef0..f7b12da7 100644 --- a/src/main/java/javax/servlet/ServletInputStream.java +++ b/src/main/java/javax/servlet/ServletInputStream.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletOutputStream.java b/src/main/java/javax/servlet/ServletOutputStream.java index e865daee..2e5192fb 100644 --- a/src/main/java/javax/servlet/ServletOutputStream.java +++ b/src/main/java/javax/servlet/ServletOutputStream.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRegistration.java b/src/main/java/javax/servlet/ServletRegistration.java index 159ee7d4..253b3f8c 100644 --- a/src/main/java/javax/servlet/ServletRegistration.java +++ b/src/main/java/javax/servlet/ServletRegistration.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java index d280b0a9..ab4669de 100644 --- a/src/main/java/javax/servlet/ServletRequest.java +++ b/src/main/java/javax/servlet/ServletRequest.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestAttributeEvent.java b/src/main/java/javax/servlet/ServletRequestAttributeEvent.java index b7912422..bcb8403d 100644 --- a/src/main/java/javax/servlet/ServletRequestAttributeEvent.java +++ b/src/main/java/javax/servlet/ServletRequestAttributeEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestAttributeListener.java b/src/main/java/javax/servlet/ServletRequestAttributeListener.java index 05b056db..7d9853c1 100644 --- a/src/main/java/javax/servlet/ServletRequestAttributeListener.java +++ b/src/main/java/javax/servlet/ServletRequestAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestEvent.java b/src/main/java/javax/servlet/ServletRequestEvent.java index ace9a0fa..64bef29d 100644 --- a/src/main/java/javax/servlet/ServletRequestEvent.java +++ b/src/main/java/javax/servlet/ServletRequestEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestListener.java b/src/main/java/javax/servlet/ServletRequestListener.java index 72e6851e..80abf058 100644 --- a/src/main/java/javax/servlet/ServletRequestListener.java +++ b/src/main/java/javax/servlet/ServletRequestListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java index 9d162bca..9433473a 100644 --- a/src/main/java/javax/servlet/ServletRequestWrapper.java +++ b/src/main/java/javax/servlet/ServletRequestWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java index fd8798a2..514ac120 100644 --- a/src/main/java/javax/servlet/ServletResponse.java +++ b/src/main/java/javax/servlet/ServletResponse.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletResponseWrapper.java b/src/main/java/javax/servlet/ServletResponseWrapper.java index e234a8ea..ec979e93 100644 --- a/src/main/java/javax/servlet/ServletResponseWrapper.java +++ b/src/main/java/javax/servlet/ServletResponseWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/ServletSecurityElement.java b/src/main/java/javax/servlet/ServletSecurityElement.java index 69aa3a22..d3de38e9 100644 --- a/src/main/java/javax/servlet/ServletSecurityElement.java +++ b/src/main/java/javax/servlet/ServletSecurityElement.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/SessionCookieConfig.java b/src/main/java/javax/servlet/SessionCookieConfig.java index c66c276b..e0bded68 100644 --- a/src/main/java/javax/servlet/SessionCookieConfig.java +++ b/src/main/java/javax/servlet/SessionCookieConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/SessionTrackingMode.java b/src/main/java/javax/servlet/SessionTrackingMode.java index 6ddd690f..b207a08b 100644 --- a/src/main/java/javax/servlet/SessionTrackingMode.java +++ b/src/main/java/javax/servlet/SessionTrackingMode.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/SingleThreadModel.java b/src/main/java/javax/servlet/SingleThreadModel.java index 88569ace..6516b311 100644 --- a/src/main/java/javax/servlet/SingleThreadModel.java +++ b/src/main/java/javax/servlet/SingleThreadModel.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/UnavailableException.java b/src/main/java/javax/servlet/UnavailableException.java index 6b4ae49d..9bc169d7 100644 --- a/src/main/java/javax/servlet/UnavailableException.java +++ b/src/main/java/javax/servlet/UnavailableException.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java index 399a9151..d96d2e89 100644 --- a/src/main/java/javax/servlet/WriteListener.java +++ b/src/main/java/javax/servlet/WriteListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java index 3127dc14..bc15c61d 100644 --- a/src/main/java/javax/servlet/annotation/HandlesTypes.java +++ b/src/main/java/javax/servlet/annotation/HandlesTypes.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/HttpConstraint.java b/src/main/java/javax/servlet/annotation/HttpConstraint.java index cd7e4355..124635c1 100644 --- a/src/main/java/javax/servlet/annotation/HttpConstraint.java +++ b/src/main/java/javax/servlet/annotation/HttpConstraint.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java b/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java index 7f8df681..fb2d79d3 100644 --- a/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java +++ b/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/MultipartConfig.java b/src/main/java/javax/servlet/annotation/MultipartConfig.java index 302a971e..97298984 100644 --- a/src/main/java/javax/servlet/annotation/MultipartConfig.java +++ b/src/main/java/javax/servlet/annotation/MultipartConfig.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/ServletSecurity.java b/src/main/java/javax/servlet/annotation/ServletSecurity.java index 5f862c42..bd592fb2 100644 --- a/src/main/java/javax/servlet/annotation/ServletSecurity.java +++ b/src/main/java/javax/servlet/annotation/ServletSecurity.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebFilter.java b/src/main/java/javax/servlet/annotation/WebFilter.java index d74b0ea4..eff06964 100644 --- a/src/main/java/javax/servlet/annotation/WebFilter.java +++ b/src/main/java/javax/servlet/annotation/WebFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebInitParam.java b/src/main/java/javax/servlet/annotation/WebInitParam.java index 70ab649a..4c3152e8 100644 --- a/src/main/java/javax/servlet/annotation/WebInitParam.java +++ b/src/main/java/javax/servlet/annotation/WebInitParam.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebListener.java b/src/main/java/javax/servlet/annotation/WebListener.java index 2df0fc62..bfc5ed37 100644 --- a/src/main/java/javax/servlet/annotation/WebListener.java +++ b/src/main/java/javax/servlet/annotation/WebListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/WebServlet.java b/src/main/java/javax/servlet/annotation/WebServlet.java index 7485f27d..363d25a5 100644 --- a/src/main/java/javax/servlet/annotation/WebServlet.java +++ b/src/main/java/javax/servlet/annotation/WebServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/annotation/package.html b/src/main/java/javax/servlet/annotation/package.html index fea3fc8a..2e116f61 100644 --- a/src/main/java/javax/servlet/annotation/package.html +++ b/src/main/java/javax/servlet/annotation/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2008-2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2008-2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java index ba1e526e..e6b84910 100644 --- a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java b/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java index c87dfbb6..1cedfbdf 100644 --- a/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java b/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java index 473abc1b..9434841b 100644 --- a/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java +++ b/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/descriptor/package.html b/src/main/java/javax/servlet/descriptor/package.html index 1cb7db15..4ff08bcd 100644 --- a/src/main/java/javax/servlet/descriptor/package.html +++ b/src/main/java/javax/servlet/descriptor/package.html @@ -5,7 +5,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2009-2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009-2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/Cookie.java b/src/main/java/javax/servlet/http/Cookie.java index ee3f66b5..e511ee28 100644 --- a/src/main/java/javax/servlet/http/Cookie.java +++ b/src/main/java/javax/servlet/http/Cookie.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpFilter.java b/src/main/java/javax/servlet/http/HttpFilter.java index 01560d84..a4463f45 100644 --- a/src/main/java/javax/servlet/http/HttpFilter.java +++ b/src/main/java/javax/servlet/http/HttpFilter.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java index 18b30fc0..42b161d2 100644 --- a/src/main/java/javax/servlet/http/HttpServlet.java +++ b/src/main/java/javax/servlet/http/HttpServlet.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index d0ffa3ca..7f9eaeba 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index 58f4779a..0364bc02 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java index 88ed6c50..ad6a5f6d 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponse.java +++ b/src/main/java/javax/servlet/http/HttpServletResponse.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java index c0ec7096..f09a177b 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java index 0c38ee8d..95a857d2 100644 --- a/src/main/java/javax/servlet/http/HttpSession.java +++ b/src/main/java/javax/servlet/http/HttpSession.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index 714856df..84dc53e8 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java index 644e60aa..285b5983 100644 --- a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java index 834b012d..0497b023 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java index f9ebf457..1c50c85b 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java index 0bd2b95b..5c8ee8f5 100644 --- a/src/main/java/javax/servlet/http/HttpSessionContext.java +++ b/src/main/java/javax/servlet/http/HttpSessionContext.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionEvent.java b/src/main/java/javax/servlet/http/HttpSessionEvent.java index c6a1862a..9ed0329b 100644 --- a/src/main/java/javax/servlet/http/HttpSessionEvent.java +++ b/src/main/java/javax/servlet/http/HttpSessionEvent.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionIdListener.java b/src/main/java/javax/servlet/http/HttpSessionIdListener.java index 1921b92a..635aedd8 100644 --- a/src/main/java/javax/servlet/http/HttpSessionIdListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionIdListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpSessionListener.java b/src/main/java/javax/servlet/http/HttpSessionListener.java index 2b0d343a..6825a3ee 100644 --- a/src/main/java/javax/servlet/http/HttpSessionListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionListener.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpUpgradeHandler.java b/src/main/java/javax/servlet/http/HttpUpgradeHandler.java index 1d840096..6a52dbf8 100644 --- a/src/main/java/javax/servlet/http/HttpUpgradeHandler.java +++ b/src/main/java/javax/servlet/http/HttpUpgradeHandler.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/HttpUtils.java b/src/main/java/javax/servlet/http/HttpUtils.java index 249427cb..f63e72c7 100644 --- a/src/main/java/javax/servlet/http/HttpUtils.java +++ b/src/main/java/javax/servlet/http/HttpUtils.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/LocalStrings.properties b/src/main/java/javax/servlet/http/LocalStrings.properties index 4e6556d8..e74ddcdf 100644 --- a/src/main/java/javax/servlet/http/LocalStrings.properties +++ b/src/main/java/javax/servlet/http/LocalStrings.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/LocalStrings_es.properties b/src/main/java/javax/servlet/http/LocalStrings_es.properties index 48b84bdf..395c8fee 100644 --- a/src/main/java/javax/servlet/http/LocalStrings_es.properties +++ b/src/main/java/javax/servlet/http/LocalStrings_es.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development @@ -56,7 +56,7 @@ # limitations under the License. # -# $Id: LocalStrings_es.properties,v 1.1.1.1 2003/01/27 16:07:47 ja120164 Exp $ +# $Id: LocalStrings_es.properties,v 1.1.1.1 2003/01/27 16:07:47 ja120174 Exp $ # # Default localized string information # Localized para Locale es_ES diff --git a/src/main/java/javax/servlet/http/LocalStrings_fr.properties b/src/main/java/javax/servlet/http/LocalStrings_fr.properties index 576bb537..88c8c508 100644 --- a/src/main/java/javax/servlet/http/LocalStrings_fr.properties +++ b/src/main/java/javax/servlet/http/LocalStrings_fr.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/LocalStrings_ja.properties b/src/main/java/javax/servlet/http/LocalStrings_ja.properties index 02678d0e..4e785ead 100644 --- a/src/main/java/javax/servlet/http/LocalStrings_ja.properties +++ b/src/main/java/javax/servlet/http/LocalStrings_ja.properties @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/Part.java b/src/main/java/javax/servlet/http/Part.java index 2d951ee5..8df769b7 100644 --- a/src/main/java/javax/servlet/http/Part.java +++ b/src/main/java/javax/servlet/http/Part.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/WebConnection.java b/src/main/java/javax/servlet/http/WebConnection.java index 8827e47f..59cd66ea 100644 --- a/src/main/java/javax/servlet/http/WebConnection.java +++ b/src/main/java/javax/servlet/http/WebConnection.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2016-2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/http/package.html b/src/main/java/javax/servlet/http/package.html index d3d033fd..d11c0687 100644 --- a/src/main/java/javax/servlet/http/package.html +++ b/src/main/java/javax/servlet/http/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/java/javax/servlet/package.html b/src/main/java/javax/servlet/package.html index 66848874..5c58aefc 100644 --- a/src/main/java/javax/servlet/package.html +++ b/src/main/java/javax/servlet/package.html @@ -2,7 +2,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/javadoc/doc-files/speclicense.html b/src/main/javadoc/doc-files/speclicense.html index ebc818da..ceee9d73 100644 --- a/src/main/javadoc/doc-files/speclicense.html +++ b/src/main/javadoc/doc-files/speclicense.html @@ -11,11 +11,11 @@
    Specification Lead: Oracle America, Inc. ("Specification Lead")
    -Release: April 2013 +Release: April 2017

    -Copyright © 2013 Oracle America, Inc. +Copyright © 2017 Oracle America, Inc.
    All rights reserved.
    diff --git a/src/main/javadoc/javax.servlet-api.css b/src/main/javadoc/javax.servlet-api.css index ec5b99d0..28bb607d 100644 --- a/src/main/javadoc/javax.servlet-api.css +++ b/src/main/javadoc/javax.servlet-api.css @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011-2017 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development diff --git a/src/main/resources/META-INF/README b/src/main/resources/META-INF/README index a583144d..56bb2b5e 100644 --- a/src/main/resources/META-INF/README +++ b/src/main/resources/META-INF/README @@ -1,7 +1,7 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. The contents of this file are subject to the terms of either the GNU General Public License Version 2 only ("GPL") or the Common Development From 9ff502ea29bbf8779a824153ac4e5afa2da2a835 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Mon, 23 Jan 2017 23:29:24 +0000 Subject: [PATCH 065/160] fix https://java.net/jira/browse/SERVLET_SPEC-155 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64427 --- src/main/java/javax/servlet/ServletContext.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 4b82006e..928ba649 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1289,10 +1289,6 @@ public T createFilter(Class clazz) *

    The session tracking modes in effect are those provided to * {@link #setSessionTrackingModes setSessionTrackingModes}. * - *

    By default, the session tracking modes returned by - * {@link #getDefaultSessionTrackingModes getDefaultSessionTrackingModes} - * are in effect. - * * @return set of the session tracking modes in effect for this * ServletContext * From 1afbeec24988a84e04f2cc7d6045c7952208bc1d Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 31 Jan 2017 19:47:19 +0000 Subject: [PATCH 066/160] add get/setSessionTimeout in ServletContext, update push API svn path=/trunk/api/javaee-api/javax.servlet/; revision=64446 --- .../java/javax/servlet/ServletContext.java | 35 ++++++++ .../servlet/http/HttpServletRequest.java | 10 +-- .../http/HttpServletRequestWrapper.java | 11 +++ .../javax/servlet/http/NoOpPushBuilder.java | 89 ------------------- 4 files changed, 49 insertions(+), 96 deletions(-) delete mode 100644 src/main/java/javax/servlet/http/NoOpPushBuilder.java diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index 928ba649..e4f5bc82 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1626,4 +1626,39 @@ public T createListener(Class clazz) * @since Servlet 3.1 */ public String getVirtualServerName(); + + + /** + * Gets the session timeout in minutes that are supported by default for + * this ServletContext. + * + * @return the session timeout in minutes that are supported by default for + * this ServletContext + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public int getSessionTimeout(); + + + /** + * Sets the session timeout in minutes for this ServletContext. + * + * @throws IllegalStateException if this ServletContext has already + * been initialized + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public void setSessionTimeout(int sessionTimeout); } diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 7f9eaeba..1f079f22 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -309,18 +309,14 @@ public interface HttpServletRequest extends ServletRequest { * from the current request. If the current connection does not * support server push, or server push has been disabled by the * client via a {@code SETTINGS_ENABLE_PUSH} settings frame value of - * {@code 0} (zero), a valid {@code PushBuilder} must still be - * returned, but calling any of the methods on it will have no - * effect. + * {@code 0} (zero), it will return null. * * @return a {@link PushBuilder} for issuing server push responses * from the current request. * - * @since 4.0 + * @since Servlet 4.0 */ - default public PushBuilder getPushBuilder() { - return new NoOpPushBuilder(); - } + public PushBuilder getPushBuilder(); /** * Returns the portion of the request URI that indicates the context diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index 0364bc02..3df15142 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -404,4 +404,15 @@ public T upgrade(Class handlerClass) throws IOException, ServletException { return this._getHttpServletRequest().upgrade(handlerClass); } + + /** + * The default behavior of this method is to call getPushBuilder on the + * wrapped request object. + * + * @since Servlet 4.0 + */ + @Override + public PushBuilder getPushBuilder() { + return this._getHttpServletRequest().getPushBuilder(); + } } diff --git a/src/main/java/javax/servlet/http/NoOpPushBuilder.java b/src/main/java/javax/servlet/http/NoOpPushBuilder.java deleted file mode 100644 index 92e8444a..00000000 --- a/src/main/java/javax/servlet/http/NoOpPushBuilder.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can - * obtain a copy of the License at - * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - * or packager/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at packager/legal/LICENSE.txt. - * - * GPL Classpath Exception: - * Oracle designates this particular file as subject to the "Classpath" - * exception as provided by Oracle in the GPL Version 2 section of the License - * file that accompanied this code. - * - * Modifications: - * If applicable, add the following below the License Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyright [year] [name of copyright owner]" - * - * Contributor(s): - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - * - */ - -package javax.servlet.http; - -import java.util.Set; -import java.util.Collections; - - -class NoOpPushBuilder implements PushBuilder { - @Override - public PushBuilder method(String method) { return this; } - @Override - public PushBuilder queryString(String queryString) { return this; } - @Override - public PushBuilder sessionId(String sessionId) { return this; } - @Override - public PushBuilder conditional(boolean conditional) { return this; } - @Override - public PushBuilder setHeader(String name, String value) { return this; } - @Override - public PushBuilder addHeader(String name, String value) { return this; } - @Override - public PushBuilder removeHeader(String name) { return this; } - @Override - public PushBuilder path(String path) { return this; } - @Override - public PushBuilder eTag(String etag) { return this; } - @Override - public PushBuilder lastModified(String lastModified) { return this; } - @Override - public void push() {} - @Override - public String getMethod() { return ""; } - @Override - public String getQueryString() { return ""; } - @Override - public String getSessionId() { return ""; } - @Override - public boolean isConditional() { return false; } - @Override - public Set getHeaderNames() { return Collections.emptySet(); } - @Override - public String getHeader(String name) { return ""; } - @Override - public String getPath() { return ""; } - @Override - public String getETag() { return ""; } - @Override - public String getLastModified() { return ""; } -} From afa392f5c9a0410c8d42961aadd30739b613231c Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 1 Feb 2017 21:00:47 +0000 Subject: [PATCH 067/160] change HttpServletRequest#getPushBuilder with default returning null; javadoc fixes svn path=/trunk/api/javaee-api/javax.servlet/; revision=64461 --- pom.xml | 33 ++++++++++++++++++- src/main/java/javax/servlet/Filter.java | 16 ++++----- .../java/javax/servlet/GenericFilter.java | 18 +++++----- .../java/javax/servlet/ServletContext.java | 2 ++ .../java/javax/servlet/http/HttpFilter.java | 28 +++++----------- .../servlet/http/HttpServletRequest.java | 7 +++- .../java/javax/servlet/http/PushBuilder.java | 2 +- 7 files changed, 66 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index ef9df43e..fc77ddcc 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 2.10.4 src ${doc.title} @@ -249,6 +249,37 @@ Portions Copyright © 1999-2002 The Apache Software Foundation. ]]> + + + implSpec + a + Implementation Requirements: + + + param + + + return + + + throws + + + since + + + version + + + serialData + + + factory + + + see + + diff --git a/src/main/java/javax/servlet/Filter.java b/src/main/java/javax/servlet/Filter.java index 12f7e01f..0b579fb0 100644 --- a/src/main/java/javax/servlet/Filter.java +++ b/src/main/java/javax/servlet/Filter.java @@ -61,7 +61,7 @@ import java.io.IOException; /** - *

    A filter is an object that performs + *

    A filter is an object that performs * filtering tasks on either the request to a resource (a servlet or static content), or on the response * from a resource, or both.

    * @@ -92,8 +92,8 @@ public interface Filter { /** - *

    Called by the web container - * to indicate to a filter that it is being placed into service. + *

    Called by the web container + * to indicate to a filter that it is being placed into service.

    * *

    The servlet container calls the init * method exactly once after instantiating the filter. The init @@ -107,8 +107,8 @@ public interface Filter { *

  • Does not return within a time period defined by the web container * * - *

    In version 4.0, a default implementation - * has been added that takes no action.

    + * @implSpec + * The default implementation takes no action. * * @param filterConfig a FilterConfig object containing the * filter's configuration and initialization parameters @@ -161,7 +161,7 @@ public void doFilter(ServletRequest request, ServletResponse response, /** - *

    Called by the web container + *

    Called by the web container * to indicate to a filter that it is being * taken out of service.

    * @@ -175,8 +175,8 @@ public void doFilter(ServletRequest request, ServletResponse response, * threads) and make sure that any persistent state is synchronized * with the filter's current state in memory.

    * - *

    In version 4.0, a default implementation - * has been added that takes no action.

    + * @implSpec + * The default implementation takes no action. */ default public void destroy() {} } diff --git a/src/main/java/javax/servlet/GenericFilter.java b/src/main/java/javax/servlet/GenericFilter.java index f07cc5e2..f8161261 100644 --- a/src/main/java/javax/servlet/GenericFilter.java +++ b/src/main/java/javax/servlet/GenericFilter.java @@ -66,7 +66,7 @@ * * @author Various * - * @since 4.0 + * @since Servlet 4.0 */ @@ -85,7 +85,7 @@ public abstract class GenericFilter *

    Does nothing. All of the filter initialization * is done by one of the init methods.

    * - * @since 4.0 + * @since Servlet 4.0 */ public GenericFilter() { } @@ -105,7 +105,7 @@ public GenericFilter() { } * @return String a String containing the value * of the initialization parameter * - * @since 4.0 + * @since Servlet 4.0 * */ @Override @@ -134,7 +134,7 @@ public String getInitParameter(String name) { * objects containing the names of * the filter's initialization parameters * - * @since 4.0 + * @since Servlet 4.0 */ @Override public Enumeration getInitParameterNames() { @@ -154,7 +154,7 @@ public Enumeration getInitParameterNames() { * @return FilterConfig the FilterConfig object * that initialized this filter * - * @since 4.0 + * @since Servlet 4.0 */ public FilterConfig getFilterConfig() { return config; @@ -172,7 +172,7 @@ public FilterConfig getFilterConfig() { * passed to this filter by the init * method * - * @since 4.0 + * @since Servlet 4.0 */ @Override public ServletContext getServletContext() { @@ -205,7 +205,7 @@ public ServletContext getServletContext() { * * @see UnavailableException * - * @since 4.0 + * @since Servlet 4.0 */ @Override public void init(FilterConfig config) throws ServletException { @@ -227,7 +227,7 @@ public void init(FilterConfig config) throws ServletException { * interrupts the servlet's * normal operation * - * @since 4.0 + * @since Servlet 4.0 */ public void init() throws ServletException { @@ -240,7 +240,7 @@ public void init() throws ServletException { * * @return the name of this filter instance * - * @since 4.0 + * @since Servlet 4.0 */ @Override public String getFilterName() { diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index e4f5bc82..e745262c 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1649,6 +1649,8 @@ public T createListener(Class clazz) /** * Sets the session timeout in minutes for this ServletContext. * + * @param sessionTimeout session timeout in minutes + * * @throws IllegalStateException if this ServletContext has already * been initialized * diff --git a/src/main/java/javax/servlet/http/HttpFilter.java b/src/main/java/javax/servlet/http/HttpFilter.java index a4463f45..a5e5087d 100644 --- a/src/main/java/javax/servlet/http/HttpFilter.java +++ b/src/main/java/javax/servlet/http/HttpFilter.java @@ -51,12 +51,10 @@ /** * - *

    Provides an abstract class to be subclassed to create + *

    Provides an abstract class to be subclassed to create * an HTTP filter suitable for a Web site. A subclass of * HttpFilter should override {@link #doFilter(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain) }.

    * - *
    - * *

    Filters typically run on multithreaded servers, * so be aware that a filter must handle concurrent * requests and be careful to synchronize access to shared resources. @@ -69,18 +67,16 @@ * Java Tutorial on Multithreaded Programming for more * information on handling multiple threads in a Java program. * - *

    - * * @author Various * - * @since 4.0 + * @since Servlet 4.0 */ public abstract class HttpFilter extends GenericFilter { /** - *

    Does nothing, because this is an abstract class.

    + *

    Does nothing, because this is an abstract class.

    * * @since 4.0 */ @@ -89,23 +85,19 @@ public HttpFilter() { } /** * - *

    The doFilter method of the Filter is called by the + *

    The doFilter method of the Filter is called by the * container each time a request/response pair is passed through the * chain due to a client request for a resource at the end of the chain. * The FilterChain passed in to this method allows the Filter to pass * on the request and response to the next entity in the chain. There's no need to * override this method.

    * - *
    - * *

    The default implementation inspects the incoming {@code req} and {@code res} * objects to determine if they are instances of {@link HttpServletRequest} * and {@link HttpServletResponse}, respectively. If not, a {@link ServletException} is thrown. * Otherwise, the protected {@link #doFilter(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain)} * method is called.

    * - *
    - * * @param req a {@link ServletRequest} object that * contains the request the client has made * of the filter @@ -124,7 +116,7 @@ public HttpFilter() { } * either parameter is not an instance of the respective {@link HttpServletRequest} * or {@link HttpServletResponse}. * - * @since 4.0 + * @since Servlet 4.0 */ @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { @@ -138,18 +130,14 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) /** * - *

    The doFilter method of the Filter is called by the + *

    The doFilter method of the Filter is called by the * container each time a request/response pair is passed through the * chain due to a client request for a resource at the end of the chain. * The FilterChain passed in to this method allows the Filter to pass * on the request and response to the next entity in the chain.

    * - *
    - * - *

    The default implementation simply calls {@link FilterChain#doFilter} + *

    The default implementation simply calls {@link FilterChain#doFilter}

    * - *
    - * * @param req a {@link HttpServletRequest} object that * contains the request the client has made * of the filter @@ -166,7 +154,7 @@ public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) * * @throws ServletException if the request for the could not be handled * - * @since 4.0 + * @since Servlet 4.0 */ protected void doFilter(HttpServletRequest req, HttpServletResponse res, FilterChain chain) throws IOException, ServletException { chain.doFilter(req, res); diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 1f079f22..9689259e 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -311,12 +311,17 @@ public interface HttpServletRequest extends ServletRequest { * client via a {@code SETTINGS_ENABLE_PUSH} settings frame value of * {@code 0} (zero), it will return null. * + * @implSpec + * The default implementation returns null. + * * @return a {@link PushBuilder} for issuing server push responses * from the current request. * * @since Servlet 4.0 */ - public PushBuilder getPushBuilder(); + default public PushBuilder getPushBuilder() { + return null; + } /** * Returns the portion of the request URI that indicates the context diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 87a21075..c9f28bb4 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -115,7 +115,7 @@ * {@link #push}. All other values are retained over calls to {@link * #push()}. * - * @since 4.0 + * @since Servlet 4.0 */ public interface PushBuilder { From b7c4994e2bcb972e6d7d2a572f5f9f25f04bf26e Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 1 Feb 2017 21:21:44 +0000 Subject: [PATCH 068/160] Use @implSpec to define requirements for default implementations svn path=/trunk/api/javaee-api/javax.servlet/; revision=64462 --- .../javax/servlet/ServletContextAttributeListener.java | 9 +++++++++ src/main/java/javax/servlet/ServletContextListener.java | 6 ++++++ .../javax/servlet/ServletRequestAttributeListener.java | 9 +++++++++ src/main/java/javax/servlet/ServletRequestListener.java | 6 ++++++ 4 files changed, 30 insertions(+) diff --git a/src/main/java/javax/servlet/ServletContextAttributeListener.java b/src/main/java/javax/servlet/ServletContextAttributeListener.java index 493cab8b..749a568f 100644 --- a/src/main/java/javax/servlet/ServletContextAttributeListener.java +++ b/src/main/java/javax/servlet/ServletContextAttributeListener.java @@ -87,6 +87,9 @@ public interface ServletContextAttributeListener extends EventListener { * @param event the ServletContextAttributeEvent containing the * ServletContext to which the attribute was added, along with the * attribute name and value + * + * @implSpec + * The default implementation takes no action. */ default public void attributeAdded(ServletContextAttributeEvent event) {} @@ -97,6 +100,9 @@ default public void attributeAdded(ServletContextAttributeEvent event) {} * @param event the ServletContextAttributeEvent containing the * ServletContext from which the attribute was removed, along with * the attribute name and value + * + * @implSpec + * The default implementation takes no action. */ default public void attributeRemoved(ServletContextAttributeEvent event) {} @@ -107,6 +113,9 @@ default public void attributeRemoved(ServletContextAttributeEvent event) {} * @param event the ServletContextAttributeEvent containing the * ServletContext in which the attribute was replaced, along with * the attribute name and its old value + * + * @implSpec + * The default implementation takes no action. */ default public void attributeReplaced(ServletContextAttributeEvent event) {} } diff --git a/src/main/java/javax/servlet/ServletContextListener.java b/src/main/java/javax/servlet/ServletContextListener.java index b5d69f70..0f95d48f 100644 --- a/src/main/java/javax/servlet/ServletContextListener.java +++ b/src/main/java/javax/servlet/ServletContextListener.java @@ -91,6 +91,9 @@ public interface ServletContextListener extends EventListener { * * @param sce the ServletContextEvent containing the ServletContext * that is being initialized + * + * @implSpec + * The default implementation takes no action. */ default public void contextInitialized(ServletContextEvent sce) {} @@ -104,6 +107,9 @@ default public void contextInitialized(ServletContextEvent sce) {} * * @param sce the ServletContextEvent containing the ServletContext * that is being destroyed + * + * @implSpec + * The default implementation takes no action. */ default public void contextDestroyed(ServletContextEvent sce) {} } diff --git a/src/main/java/javax/servlet/ServletRequestAttributeListener.java b/src/main/java/javax/servlet/ServletRequestAttributeListener.java index 7d9853c1..7b5821da 100644 --- a/src/main/java/javax/servlet/ServletRequestAttributeListener.java +++ b/src/main/java/javax/servlet/ServletRequestAttributeListener.java @@ -92,6 +92,9 @@ public interface ServletRequestAttributeListener extends EventListener { * @param srae the ServletRequestAttributeEvent containing the * ServletRequest and the name and value of the attribute that was * added + * + * @implSpec + * The default implementation takes no action. */ default public void attributeAdded(ServletRequestAttributeEvent srae) {} @@ -102,6 +105,9 @@ default public void attributeAdded(ServletRequestAttributeEvent srae) {} * @param srae the ServletRequestAttributeEvent containing the * ServletRequest and the name and value of the attribute that was * removed + * + * @implSpec + * The default implementation takes no action. */ default public void attributeRemoved(ServletRequestAttributeEvent srae) {} @@ -112,6 +118,9 @@ default public void attributeRemoved(ServletRequestAttributeEvent srae) {} * @param srae the ServletRequestAttributeEvent containing the * ServletRequest and the name and (old) value of the attribute * that was replaced + * + * @implSpec + * The default implementation takes no action. */ default public void attributeReplaced(ServletRequestAttributeEvent srae) {} } diff --git a/src/main/java/javax/servlet/ServletRequestListener.java b/src/main/java/javax/servlet/ServletRequestListener.java index 80abf058..c76cdb04 100644 --- a/src/main/java/javax/servlet/ServletRequestListener.java +++ b/src/main/java/javax/servlet/ServletRequestListener.java @@ -91,6 +91,9 @@ public interface ServletRequestListener extends EventListener { * * @param sre the ServletRequestEvent containing the ServletRequest * and the ServletContext representing the web application + * + * @implSpec + * The default implementation takes no action. */ default public void requestDestroyed(ServletRequestEvent sre) {} @@ -100,6 +103,9 @@ default public void requestDestroyed(ServletRequestEvent sre) {} * * @param sre the ServletRequestEvent containing the ServletRequest * and the ServletContext representing the web application + * + * @implSpec + * The default implementation takes no action. */ default public void requestInitialized(ServletRequestEvent sre) {} } From 056e3b78ee3e386d4e24bab6e50ed11157145c34 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 1 Feb 2017 21:25:40 +0000 Subject: [PATCH 069/160] add javadoc for default methods svn path=/trunk/api/javaee-api/javax.servlet/; revision=64463 --- .../http/HttpSessionActivationListener.java | 14 ++++++++++++-- .../servlet/http/HttpSessionBindingListener.java | 6 ++++++ .../javax/servlet/http/HttpSessionListener.java | 7 ++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java index 84dc53e8..7d6b709e 100644 --- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java @@ -72,13 +72,23 @@ public interface HttpSessionActivationListener extends EventListener { - /** Notification that the session is about to be passivated. + /** + * Notification that the session is about to be passivated. + * + * @implSpec + * The default implementation takes no action. + * * @param se the {@link HttpSessionEvent} indicating the passivation * of the session */ default public void sessionWillPassivate(HttpSessionEvent se) {} - /** Notification that the session has just been activated. + /** + * Notification that the session has just been activated. + * + * @implSpec + * The default implementation takes no action. + * * @param se the {@link HttpSessionEvent} indicating the activation * of the session */ diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java index 1c50c85b..f21cb9fa 100644 --- a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java @@ -86,6 +86,9 @@ public interface HttpSessionBindingListener extends EventListener { * Notifies the object that it is being bound to * a session and identifies the session. * + * @implSpec + * The default implementation takes no action. + * * @param event the event that identifies the * session * @@ -99,6 +102,9 @@ default public void valueBound(HttpSessionBindingEvent event) {} * Notifies the object that it is being unbound * from a session and identifies the session. * + * @implSpec + * The default implementation takes no action. + * * @param event the event that identifies * the session * diff --git a/src/main/java/javax/servlet/http/HttpSessionListener.java b/src/main/java/javax/servlet/http/HttpSessionListener.java index 6825a3ee..63e66454 100644 --- a/src/main/java/javax/servlet/http/HttpSessionListener.java +++ b/src/main/java/javax/servlet/http/HttpSessionListener.java @@ -84,6 +84,9 @@ public interface HttpSessionListener extends EventListener { /** * Receives notification that a session has been created. * + * @implSpec + * The default implementation takes no action. + * * @param se the HttpSessionEvent containing the session */ default public void sessionCreated(HttpSessionEvent se) {} @@ -91,8 +94,10 @@ default public void sessionCreated(HttpSessionEvent se) {} /** * Receives notification that a session is about to be invalidated. * + * @implSpec + * The default implementation takes no action. + * * @param se the HttpSessionEvent containing the session */ default public void sessionDestroyed(HttpSessionEvent se) {} } - From 78d896809f1816c8fea31b44d5f017279d50a167 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Feb 2017 21:28:57 +0000 Subject: [PATCH 070/160] add ServletContext#addJspFfile svn path=/trunk/api/javaee-api/javax.servlet/; revision=64485 --- .../java/javax/servlet/ServletContext.java | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index e745262c..fb9b0a57 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -908,6 +908,44 @@ public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass); + /** + * Adds the servlet with the given jsp file to this servlet context. + * + *

    The registered servlet may be further configured via the returned + * {@link ServletRegistration} object. + * + *

    If this ServletContext already contains a preliminary + * ServletRegistration for a servlet with the given servletName, + * it will be completed (by assigning the given jspFile to it) + * and returned. + * + * @param servletName the name of the servlet + * @param jspFile the full path to a JSP file within the web application + * beginning with a `/'. + * + * @return a ServletRegistration object that may be used to further + * configure the registered servlet, or null if this + * ServletContext already contains a complete ServletRegistration for + * a servlet with the given servletName + * + * @throws IllegalStateException if this ServletContext has already + * been initialized + * + * @throws IllegalArgumentException if servletName is null + * or an empty String + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public ServletRegistration.Dynamic addJspFile( + String servletName, String jspFile); + + /** * Instantiates the given Servlet class. * @@ -948,6 +986,7 @@ public ServletRegistration.Dynamic addServlet(String servletName, public T createServlet(Class clazz) throws ServletException; + /** * Gets the ServletRegistration corresponding to the servlet with the * given servletName. @@ -976,7 +1015,8 @@ public T createServlet(Class clazz) *

    The returned Map includes the ServletRegistration objects * corresponding to all declared and annotated servlets, as well as the * ServletRegistration objects corresponding to all servlets that have - * been added via one of the addServlet methods. + * been added via one of the addServlet and addJspFile + * methods. * *

    If permitted, any changes to the returned Map must not affect this * ServletContext. From 36be1edca862703fe02598e13b915e4c9f0a0df1 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Feb 2017 23:21:02 +0000 Subject: [PATCH 071/160] add -B svn path=/trunk/api/javaee-api/javax.servlet/; revision=64489 --- release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.sh b/release.sh index d62e98e9..bdc6dc87 100755 --- a/release.sh +++ b/release.sh @@ -72,5 +72,5 @@ # https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8.ReleaseIt # http://aseng-wiki.us.oracle.com/asengwiki/display/GlassFish/Migrating+Maven+deployment+to+maven.java.net -mvn release:prepare -Prelease -mvn release:perform -Prelease +mvn -B release:prepare -Prelease +mvn -B release:perform -Prelease From 759ba07b5d5bc0892cbf247a89b16fb1bad6de87 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Feb 2017 23:21:41 +0000 Subject: [PATCH 072/160] [maven-release-plugin] prepare release javax.servlet-api-4.0.0-b02 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64490 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index fc77ddcc..76123541 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b02-SNAPSHOT + 4.0.0-b02 4.0 @@ -130,9 +130,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b02 + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b02 + http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b02 From b5a8a5d500198936125e5b86977995d7fbc2b125 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Feb 2017 23:21:47 +0000 Subject: [PATCH 073/160] [maven-release-plugin] prepare for next development iteration svn path=/trunk/api/javaee-api/javax.servlet/; revision=64492 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 76123541..1d29b66c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b02 + 4.0.0-b03-SNAPSHOT 4.0 @@ -130,9 +130,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b02 - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b02 - http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b02 + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet From eafcf91c9119d3af37fa352976020a040d2235b1 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Tue, 7 Feb 2017 00:35:16 +0000 Subject: [PATCH 074/160] add javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64512 --- .../java/javax/servlet/http/PushBuilder.java | 104 ++++++++++++------ 1 file changed, 72 insertions(+), 32 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index c9f28bb4..705d5d60 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -117,8 +117,7 @@ * * @since Servlet 4.0 */ -public interface PushBuilder -{ +public interface PushBuilder { /** *

    Set the method to be used for the push.

    * @@ -131,7 +130,7 @@ public interface PushBuilder * @param method the method to be used for the push. * @return this builder. */ - public abstract PushBuilder method(String method); + public PushBuilder method(String method); /** Set the query string to be used for the push. * @@ -143,7 +142,7 @@ public interface PushBuilder * @param queryString the query string to be used for the push. * @return this builder. */ - public abstract PushBuilder queryString(String queryString); + public PushBuilder queryString(String queryString); /** Set the SessionID to be used for the push. * The session ID will be set in the same way it was on the associated request (ie @@ -154,7 +153,7 @@ public interface PushBuilder * @param sessionId the SessionID to be used for the push. * @return this builder. */ - public abstract PushBuilder sessionId(String sessionId); + public PushBuilder sessionId(String sessionId); /** Set if the request is to be conditional. * If the request is conditional, any available values from {@link #eTag(String)} or @@ -164,7 +163,7 @@ public interface PushBuilder * @param conditional true if the push request is conditional * @return this builder. */ - public abstract PushBuilder conditional(boolean conditional); + public PushBuilder conditional(boolean conditional); /** *

    Set a header to be used for the push. If the builder has an @@ -174,8 +173,7 @@ public interface PushBuilder * @param value The header value to set * @return this builder. */ - public abstract PushBuilder setHeader(String name, String value); - + public PushBuilder setHeader(String name, String value); /** *

    Add a header to be used for the push.

    @@ -183,8 +181,7 @@ public interface PushBuilder * @param value The header value to add * @return this builder. */ - public abstract PushBuilder addHeader(String name, String value); - + public PushBuilder addHeader(String name, String value); /** *

    Remove the named header. If the header does not exist, take @@ -193,10 +190,8 @@ public interface PushBuilder * @param name The name of the header to remove * @return this builder. */ - public abstract PushBuilder removeHeader(String name); + public PushBuilder removeHeader(String name); - - /** * Set the URI path to be used for the push. The path may start * with "/" in which case it is treated as an absolute path, @@ -211,7 +206,7 @@ public interface PushBuilder * query string. * @return this builder. */ - public abstract PushBuilder path(String path); + public PushBuilder path(String path); /** * Set the eTag to be used for conditional pushes. @@ -221,7 +216,7 @@ public interface PushBuilder * @param eTag the eTag to be used for the push. * @return this builder. */ - public abstract PushBuilder eTag(String eTag); + public PushBuilder eTag(String eTag); /** * Set the last modified date to be used for conditional pushes. @@ -231,12 +226,11 @@ public interface PushBuilder * @param lastModified the last modified date to be used for the push. * @return this builder. * */ - public abstract PushBuilder lastModified(String lastModified); - + public PushBuilder lastModified(String lastModified); /** Push a resource given the current state of the builder, * returning immediately without blocking. - + * *

    Push a resource based on the current state of the PushBuilder. * Calling this method does not guarantee the resource will actually * be pushed, since it is possible the client can decline acceptance @@ -263,22 +257,68 @@ public interface PushBuilder * last call to {@code push()} that did not throw an * IllegalStateException. */ - public abstract void push(); - - + public void push(); - - - public abstract String getMethod(); - public abstract String getQueryString(); - public abstract String getSessionId(); - public abstract boolean isConditional(); - public abstract Set getHeaderNames(); - public abstract String getHeader(String name); - public abstract String getPath(); - public abstract String getETag(); - public abstract String getLastModified(); + /** + * Return the method to be used for the push. + * + * @return the method to be used for the push. + */ + public String getMethod(); + + /** + * Return the query string to be used for the push. + * + * @return the query string to be used for the push. + */ + public String getQueryString(); + + /** + * Return the SessionID to be used for the push. + * + * @return the SessionID to be used for the push. + */ + public String getSessionId(); + /** + * Return if the request is to be conditional. + * + * @return if the request is to be conditional. + */ + public boolean isConditional(); + /** + * Return the set of header to be used for the push. + * + * @return the set of header to be used for the push. + */ + public Set getHeaderNames(); + + /** + * Return the header of the given name to be used for the push. + * + * @return the header of the given name to be used for the push. + */ + public String getHeader(String name); + /** + * Return the URI path to be used for the push. + * + * @return the URI path to be used for the push. + */ + public String getPath(); + + /** + * Return the eTag to be used for conditional pushes. + * + * @return the eTag to be used for conditional pushes. + */ + public String getETag(); + + /** + * Return the last modified date to be used for conditional pushes. + * + * @return the last modified date to be used for conditional pushes. + */ + public String getLastModified(); } From f1be89913ce74ce80e09a325537849b47995e955 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 9 Feb 2017 01:02:43 +0000 Subject: [PATCH 075/160] add "request" header svn path=/trunk/api/javaee-api/javax.servlet/; revision=64526 --- src/main/java/javax/servlet/http/PushBuilder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 705d5d60..56617421 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -61,7 +61,7 @@ * *

  • The method is initialized to "GET"
    • * - *
  • The existing headers of the current {@link HttpServletRequest} + *
  • The existing request headers of the current {@link HttpServletRequest} * are added to the builder, except for: * *
      @@ -166,7 +166,7 @@ public interface PushBuilder { public PushBuilder conditional(boolean conditional); /** - *

      Set a header to be used for the push. If the builder has an + *

      Set a request header to be used for the push. If the builder has an * existing header with the same name, its value is overwritten.

      * * @param name The header name to set @@ -176,7 +176,7 @@ public interface PushBuilder { public PushBuilder setHeader(String name, String value); /** - *

      Add a header to be used for the push.

      + *

      Add a request header to be used for the push.

      * @param name The header name to add * @param value The header value to add * @return this builder. @@ -184,7 +184,7 @@ public interface PushBuilder { public PushBuilder addHeader(String name, String value); /** - *

      Remove the named header. If the header does not exist, take + *

      Remove the named request header. If the header does not exist, take * no action.

      * * @param name The name of the header to remove From 1e589560a16cd19210d0eb49dd22c6d8cec30795 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 9 Feb 2017 19:52:21 +0000 Subject: [PATCH 076/160] SERVLET_SPEC-88 clarify responsibility in sendError() M src/main/java/javax/servlet/http/HttpServletResponse.java svn path=/trunk/api/javaee-api/javax.servlet/; revision=64527 --- .../servlet/http/HttpServletResponse.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java index ad6a5f6d..2a7efd28 100644 --- a/src/main/java/javax/servlet/http/HttpServletResponse.java +++ b/src/main/java/javax/servlet/http/HttpServletResponse.java @@ -177,17 +177,22 @@ public interface HttpServletResponse extends ServletResponse { public String encodeRedirectUrl(String url); /** - * Sends an error response to the client using the specified - * status and clears the buffer. The server defaults to creating the - * response to look like an HTML-formatted server error page - * containing the specified message, setting the content type - * to "text/html". The server will preserve cookies and may clear or - * update any headers needed to serve the error page as a valid response. - * - * If an error-page declaration has been made for the web application - * corresponding to the status code passed in, it will be served back in - * preference to the suggested msg parameter and the msg parameter will - * be ignored. + *

      Sends an error response to the client using the specified + * status and clears the buffer. The server defaults to creating + * the response to look like an HTML-formatted server error page + * containing the specified message, setting the content type to + * "text/html". The caller is not responsible for + * escaping or re-encoding the message to ensure it is safe with + * respect to the current response encoding and content type. This + * aspect of safety is the responsibility of the container, as it is + * generating the error page containing the message. The server + * will preserve cookies and may clear or update any headers needed + * to serve the error page as a valid response.

      + * + *

      If an error-page declaration has been made for the web + * application corresponding to the status code passed in, it will + * be served back in preference to the suggested msg parameter and + * the msg parameter will be ignored.

      * *

      If the response has already been committed, this method throws * an IllegalStateException. From ee29dd36db9435efe85e0fa0f9fb9a548fd19263 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 17 Feb 2017 18:53:10 +0000 Subject: [PATCH 077/160] throw IllegalArgumentException for non-cacheable or unsafe methods svn path=/trunk/api/javaee-api/javax.servlet/; revision=64565 --- src/main/java/javax/servlet/http/PushBuilder.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 56617421..0c089c45 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -47,7 +47,11 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -/** Build a request to be pushed. +/** + * Build a request to be pushed. + * + * According section 8.2 of RFC 7540, a promised request must be cacheable and + * safe without a request body. * *

      A PushBuilder is obtained by calling {@link * HttpServletRequest#getPushBuilder()}. Each call to this method will @@ -121,11 +125,11 @@ public interface PushBuilder { /** *

      Set the method to be used for the push.

      * - *

      Any non-empty String may be used for the method.

      - * * @throws NullPointerException if the argument is {@code null} * - * @throws IllegalArgumentException if the argument is the empty String + * @throws IllegalArgumentException if the argument is the empty String, + * or any non-cacheable or unsafe methods defined in RFC 7231, + * which are POST, PUT, DELETE, CONNECT, OPTIONS and TRACE. * * @param method the method to be used for the push. * @return this builder. From 624b4636ec1a031ee78694cbd7e8340ac965cbdf Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 1 Mar 2017 18:49:18 +0000 Subject: [PATCH 078/160] Fix typo: has has svn path=/trunk/api/javaee-api/javax.servlet/; revision=64680 --- src/main/java/javax/servlet/http/PushBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 0c089c45..c529c481 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -98,7 +98,7 @@ * to the PushBuilder, unless the {@link Cookie#getMaxAge()} is <=0, in which * case the Cookie will be removed from the builder. * - *
    • If this request has has the conditional headers If-Modified-Since + *
    • If this request has the conditional headers If-Modified-Since * or If-None-Match, then the {@link #isConditional()} header is set to * true.
      • * From 7eff1d9832381c520eb3a5b61b2b1a7b571a8103 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 1 Mar 2017 19:01:32 +0000 Subject: [PATCH 079/160] Reword conditional header language svn path=/trunk/api/javaee-api/javax.servlet/; revision=64681 --- src/main/java/javax/servlet/http/PushBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index c529c481..c4f30554 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -98,9 +98,9 @@ * to the PushBuilder, unless the {@link Cookie#getMaxAge()} is <=0, in which * case the Cookie will be removed from the builder. * - *
    • If this request has the conditional headers If-Modified-Since - * or If-None-Match, then the {@link #isConditional()} header is set to - * true.
      • + *
    • If this request has either of the conditional headers + * "If-Modified-Since" or "If-None-Match", then {@link #isConditional()} + * must return {@code true}.
      • * *
    * From 00717c41824574df48b287bfe1b4d5de13b5d531 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 1 Mar 2017 20:01:48 +0000 Subject: [PATCH 080/160] add new APIs for SERVLET_SPEC-161 Allow encoding to be set from deployment descriptor and API svn path=/trunk/api/javaee-api/javax.servlet/; revision=64682 --- .../java/javax/servlet/ServletContext.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index fb9b0a57..a187e4bb 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1703,4 +1703,78 @@ public T createListener(Class clazz) * @since Servlet 4.0 */ public void setSessionTimeout(int sessionTimeout); + + + /** + * Gets the request character encoding that are supported by default for + * this ServletContext. + * + * @return the request character encoding that are supported by default for + * this ServletContext + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public String getRequestCharacterEncoding(); + + + /** + * Sets the request character encoding for this ServletContext. + * + * @param encoding request character encoding + * + * @throws IllegalStateException if this ServletContext has already + * been initialized + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public void setRequestCharacterEncoding(String encoding); + + + /** + * Gets the response character encoding that are supported by default for + * this ServletContext. + * + * @return the request character encoding that are supported by default for + * this ServletContext + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public String getResponseCharacterEncoding(); + + + /** + * Sets the response character encoding for this ServletContext. + * + * @param encoding response character encoding + * + * @throws IllegalStateException if this ServletContext has already + * been initialized + * + * @throws UnsupportedOperationException if this ServletContext was + * passed to the {@link ServletContextListener#contextInitialized} method + * of a {@link ServletContextListener} that was neither declared in + * web.xml or web-fragment.xml, nor annotated + * with {@link javax.servlet.annotation.WebListener} + * + * @since Servlet 4.0 + */ + public void setResponseCharacterEncoding(String encoding); } From 78f936ccd6eb32142942f606a6ac2516fcd67fe0 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 1 Mar 2017 20:45:21 +0000 Subject: [PATCH 081/160] M pom.xml - Update developer M src/main/java/javax/servlet/AsyncContext.java - Add constant ASYNC_MAPPING. M src/main/java/javax/servlet/RequestDispatcher.java - Add constants FORWARD_MAPPING, INCLUDE_MAPPING. M src/main/java/javax/servlet/http/HttpServletRequest.java M src/main/java/javax/servlet/http/HttpServletRequestWrapper.java - Add getServletMapping(). A src/main/java/javax/servlet/http/MappingMatch.java A src/main/java/javax/servlet/http/ServletMapping.java - The mapping discovery API. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64685 --- pom.xml | 9 +- src/main/java/javax/servlet/AsyncContext.java | 7 + .../java/javax/servlet/RequestDispatcher.java | 18 ++ .../servlet/http/HttpServletRequest.java | 72 ++++++++ .../http/HttpServletRequestWrapper.java | 11 +- .../java/javax/servlet/http/MappingMatch.java | 82 +++++++++ .../javax/servlet/http/ServletMapping.java | 158 ++++++++++++++++++ 7 files changed, 352 insertions(+), 5 deletions(-) create mode 100644 src/main/java/javax/servlet/http/MappingMatch.java create mode 100644 src/main/java/javax/servlet/http/ServletMapping.java diff --git a/pom.xml b/pom.xml index 1d29b66c..f32af3d4 100644 --- a/pom.xml +++ b/pom.xml @@ -75,12 +75,13 @@ - mode - Rajiv Mordani - http://weblogs.java.net/blog/mode + edburns + Ed Burns + http://purl.oclc.org/NET/edburns/ Oracle - lead + co-lead + developer diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java index 264d0441..1361ca52 100644 --- a/src/main/java/javax/servlet/AsyncContext.java +++ b/src/main/java/javax/servlet/AsyncContext.java @@ -82,6 +82,13 @@ public interface AsyncContext { */ static final String ASYNC_CONTEXT_PATH = "javax.servlet.async.context_path"; + /** + * The name of the request attribute under which the original + * {@link javax.servlet.http.ServletMapping} is made available to the target of a + * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} + */ + static final String ASYNC_MAPPING = "javax.servlet.async.mapping"; + /** * The name of the request attribute under which the original * path info is made available to the target of a diff --git a/src/main/java/javax/servlet/RequestDispatcher.java b/src/main/java/javax/servlet/RequestDispatcher.java index 86d2daf3..8aa2ed74 100644 --- a/src/main/java/javax/servlet/RequestDispatcher.java +++ b/src/main/java/javax/servlet/RequestDispatcher.java @@ -95,6 +95,16 @@ public interface RequestDispatcher { */ static final String FORWARD_CONTEXT_PATH = "javax.servlet.forward.context_path"; + /** + * The name of the request attribute under which the original + * {@link javax.servlet.http.ServletMapping} is made available + * to the target of a + * {@link #forward(ServletRequest,ServletResponse) forward} + * + * @since 4.0 + */ + static final String FORWARD_MAPPING = "javax.servlet.forward.mapping"; + /** * The name of the request attribute under which the original * path info is made available to the target of a @@ -137,6 +147,14 @@ public interface RequestDispatcher { */ static final String INCLUDE_PATH_INFO = "javax.servlet.include.path_info"; + /** + * The name of the request attribute under which the + * {@link javax.servlet.http.ServletMapping} + * of the target of an {@link #include(ServletRequest,ServletResponse) + * include} is stored + */ + static final String INCLUDE_MAPPING = "javax.servlet.include.mapping"; + /** * The name of the request attribute under which the servlet path * of the target of an {@link #include(ServletRequest,ServletResponse) diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 9689259e..edf1cc06 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -60,6 +60,7 @@ import java.io.IOException; import java.util.*; +import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; import javax.servlet.ServletRequest; @@ -251,6 +252,77 @@ public interface HttpServletRequest extends ServletRequest { */ public int getIntHeader(String name); + /** + *

    Return the {@link ServletMapping} by which the {@link + * HttpServlet} for this {@code HttpServletRequest} was invoked. + * The mappings for any applicable {@link javax.servlet.Filter}s are + * not indicated in the result. If the currently active {@link + * javax.servlet.Servlet} invocation was obtained by a call to + * {@link ServletRequest#getRequestDispatcher} followed by a call to + * {@link RequestDispatcher#forward}, the returned {@code + * ServletMapping} is the one corresponding to the path used to + * obtain the {@link RequestDispatcher}. If the currently active + * {@code Servlet} invocation was obtained by a call to {@link + * ServletRequest#getRequestDispatcher} followed by a call to {@link + * RequestDispatcher#include}, the returned {@code ServletMapping} + * is the one corresponding path that caused the first {@code + * Servlet} in the invocation sequence to be invoked. If the + * currently active {@code Servlet} invocation was obtained by a + * call to {@link javax.servlet.AsyncContext#dispatch}, the returned + * {@code ServletMapping} is the one corresponding path that caused + * the first {@code Servlet} in the invocation sequence to be + * invoked. See sections 9.3.1, 9.4.2 and 9.7.2 of the + * specification document for additional request attributes related + * to {@code ServletMapping}.

    + * + *

    The returned object is immutable. Servlet 4.0 compliant + * implementations must override this method.

    + * + * @implSpec The default implementation returns a {@code + * ServletMapping} that returns the empty string for the match + * value, pattern and servlet name and {@link MappingMatch#UNKNOWN} for the match + * type. + * + * @return An instance of {@code ServletMapping} describing the manner in which + * the current request was invoked. + * + * @since 4.0 + */ + + default public ServletMapping getServletMapping() { + return new ServletMapping() { + @Override + public String getMatchValue() { + return ""; + } + + @Override + public String getPattern() { + return ""; + } + + @Override + public String getServletName() { + return ""; + } + + @Override + public MappingMatch getMappingMatch() { + return MappingMatch.UNKNOWN; + } + + @Override + public String toString() { + return "MappingImpl{" + "matchValue=" + getMatchValue() + + ", pattern=" + getPattern() + ", servletName=" + + getServletName() + ", mappingMatch=" + getMappingMatch() + '}'; + } + + + + }; + } + /** * Returns the name of the HTTP method with which this * request was made, for example, GET, POST, or PUT. diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java index 3df15142..434be968 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -154,7 +154,16 @@ public Enumeration getHeaderNames() { public int getIntHeader(String name) { return this._getHttpServletRequest().getIntHeader(name); } - + + /** + *

    The default behavior of this method is to + * return getServletMapping() on the wrapped request object.

    + */ + @Override + public ServletMapping getServletMapping() { + return this._getHttpServletRequest().getServletMapping(); + } + /** * The default behavior of this method is to return getMethod() * on the wrapped request object. diff --git a/src/main/java/javax/servlet/http/MappingMatch.java b/src/main/java/javax/servlet/http/MappingMatch.java new file mode 100644 index 00000000..ebd09252 --- /dev/null +++ b/src/main/java/javax/servlet/http/MappingMatch.java @@ -0,0 +1,82 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + + */ + +package javax.servlet.http; + +/** + *

    Enumeration of Servlet mapping types.

    + * + * @since 4.0 + */ +public enum MappingMatch { + /** + *

    This is used when the mapping was achieved + * with an exact match to the application's context root.

    + */ + CONTEXT_ROOT, + /** + *

    This is used when the mapping was achieved + * with an exact match to the default servlet of the application, the '{@code /}' + * character.

    + */ + DEFAULT, + /** + *

    This is used when the mapping was achieved + * with an exact match to the incoming request.

    + */ + EXACT, + /** + *

    This is used when the mapping was achieved + * using an extension, such as "{@code *.xhtml}".

    + */ + EXTENSION, + /** + *

    This is used when the mapping was achieved + * using a path, such as "{@code /faces/*}".

    + */ + PATH, + /** + *

    This is only specified to be used in the default + * implementation of {@link ServletMapping} returned from {@link + * HttpServletRequest#getServletMapping}.

    + */ + UNKNOWN +} diff --git a/src/main/java/javax/servlet/http/ServletMapping.java b/src/main/java/javax/servlet/http/ServletMapping.java new file mode 100644 index 00000000..8d73233f --- /dev/null +++ b/src/main/java/javax/servlet/http/ServletMapping.java @@ -0,0 +1,158 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + * or packager/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at packager/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * Oracle designates this particular file as subject to the "Classpath" + * exception as provided by Oracle in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + + */ +package javax.servlet.http; + +/** + *

    Allows runtime discovery of the manner in + * which the {@link HttpServlet} for the current {@link HttpServletRequest} was + * invoked. Invoking any of the methods must not block the caller. The + * implementation must be thread safe. Instances are returned from + * {@link HttpServletRequest#getServletMapping}.

    + * + *

    Following are some illustrative examples for various combinations + * of mappings. Consider the following Servlet declaration:

    + * + * 
    
+ * <servlet>
+ *     <servlet-name>MyServlet</servlet-name>
+ *     <servlet-class>MyServlet</servlet-class>
+ * </servlet>
+ * <servlet-mapping>
+ *     <servlet-name>MyServlet</servlet-name>
+ *     <url-pattern>/MyServlet</url-pattern>
+ *     <url-pattern>""</url-pattern>
+ *     <url-pattern>*.extension</url-pattern>
+ *     <url-pattern>/path/*</url-pattern>
+ * </servlet-mapping>
+ *
    + * + *

    The expected values of the properties for various incoming URI + * path values are as shown in this table. The {@code servletName} + * column is omitted as its value is always {@code MyServlet}.

    + * + *
    • First line of HTTP request Returned Value
    + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + *
    Expected values of properties for various URI paths
    URI Path (in quotes)matchValuepatternmappingMatch
    """"/CONTEXT_ROOT
    "/MyServlet"MyServlet/MyServletEXACT
    "/foo.extension"foo/*.extensionEXTENSION
    "/path/foo"foo/path/*PATH
    + * + * @since 4.0 + */ +public interface ServletMapping { + + + + /** + *

    Return the actual value that caused this request + * to be matched or the empty String if not known or not knowable.

    + * + * @return the match. + * + * @since 4.0 + */ + public String getMatchValue(); + + /** + *

    Return the String representation for the + * {@code url-pattern} for this mapping or the empty String if not known + * or not knowable.

    + * + * @return the String representation for the + * {@code url-pattern} for this mapping or the empty String if not known + * or not knowable. + * + * @since 4.0 + */ + public String getPattern(); + + /** + *

    Return the String representation for the + * {@code servlet-name} for this mapping or the empty String if not known + * or not knowable.

    + * + * @return the String representation for the + * {@code servlet-name} for this mapping or the empty String if not known + * or not knowable. + * + * @since 4.0 + */ + public String getServletName(); + + /** + *

    Return the {@link MappingMatch} for this + * instance

    + * + * @return the {@code MappingMatch} for this instance. + * + * @since 4.0 + */ + public MappingMatch getMappingMatch(); + +} From 4834f204e7abbc0492bbdf65bc975556efe4de56 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 1 Mar 2017 21:12:54 +0000 Subject: [PATCH 082/160] M src/main/java/javax/servlet/http/HttpServletRequest.java M src/main/java/javax/servlet/http/MappingMatch.java - Remove MappingMatch.UNKNOWN pending EG discussion. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64686 --- src/main/java/javax/servlet/http/HttpServletRequest.java | 4 ++-- src/main/java/javax/servlet/http/MappingMatch.java | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index edf1cc06..6cc89fac 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -280,7 +280,7 @@ public interface HttpServletRequest extends ServletRequest { * * @implSpec The default implementation returns a {@code * ServletMapping} that returns the empty string for the match - * value, pattern and servlet name and {@link MappingMatch#UNKNOWN} for the match + * value, pattern and servlet name and {@code null} for the match * type. * * @return An instance of {@code ServletMapping} describing the manner in which @@ -308,7 +308,7 @@ public String getServletName() { @Override public MappingMatch getMappingMatch() { - return MappingMatch.UNKNOWN; + return null; } @Override diff --git a/src/main/java/javax/servlet/http/MappingMatch.java b/src/main/java/javax/servlet/http/MappingMatch.java index ebd09252..90bbe189 100644 --- a/src/main/java/javax/servlet/http/MappingMatch.java +++ b/src/main/java/javax/servlet/http/MappingMatch.java @@ -72,11 +72,5 @@ public enum MappingMatch { *

    This is used when the mapping was achieved * using a path, such as "{@code /faces/*}".

    */ - PATH, - /** - *

    This is only specified to be used in the default - * implementation of {@link ServletMapping} returned from {@link - * HttpServletRequest#getServletMapping}.

    - */ - UNKNOWN + PATH } From 3010e86767d9d0454c0ba7629cad87d3c0aaf91e Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Wed, 1 Mar 2017 22:45:06 +0000 Subject: [PATCH 083/160] M pom.xml - Upgrade to latest findbugs. M src/main/java/javax/servlet/http/HttpServletRequest.java - Work around SIC_INNER_SHOULD_BE_STATIC_ANON by using the "embedded reference to the object which created it" in the toString(). Reviewed by Shing-wai Chan. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64687 --- pom.xml | 2 +- src/main/java/javax/servlet/http/HttpServletRequest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f32af3d4..031ca6c3 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ Java Servlet 4.0 API Specification Oracle Corporation org.glassfish - 3.0.1 + 3.0.4 exclude.xml Low 1.33 diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 6cc89fac..0f6456f3 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -315,7 +315,9 @@ public MappingMatch getMappingMatch() { public String toString() { return "MappingImpl{" + "matchValue=" + getMatchValue() + ", pattern=" + getPattern() + ", servletName=" - + getServletName() + ", mappingMatch=" + getMappingMatch() + '}'; + + getServletName() + ", mappingMatch=" + getMappingMatch() + + "} HttpServletRequest {" + HttpServletRequest.this.toString() + + '}'; } From a7e9e04642072cc5c21a0eae990d4cc8dc8fe0ea Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 2 Mar 2017 00:06:54 +0000 Subject: [PATCH 084/160] change wording: #push "must be non-blocking" rather than "returning immediately without blocking" svn path=/trunk/api/javaee-api/javax.servlet/; revision=64689 --- src/main/java/javax/servlet/http/PushBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index c4f30554..d565adda 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -232,8 +232,9 @@ public interface PushBuilder { * */ public PushBuilder lastModified(String lastModified); - /** Push a resource given the current state of the builder, - * returning immediately without blocking. + /** + * Push a resource given the current state of the builder, + * the method must be non-blocking. * *

    Push a resource based on the current state of the PushBuilder. * Calling this method does not guarantee the resource will actually From c362e017b8f068dfe7d56babf6d8f38b656e5f6d Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 2 Mar 2017 02:40:23 +0000 Subject: [PATCH 085/160] [maven-release-plugin] prepare release javax.servlet-api-4.0.0-b03 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64690 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 031ca6c3..113c58ce 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b03-SNAPSHOT + 4.0.0-b03 4.0 @@ -131,9 +131,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b03 + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b03 + http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b03 From 7570056ef12dbd35663a8aef8804561fbf566680 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 2 Mar 2017 02:40:28 +0000 Subject: [PATCH 086/160] [maven-release-plugin] prepare for next development iteration svn path=/trunk/api/javaee-api/javax.servlet/; revision=64692 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 113c58ce..ce4dce6b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b03 + 4.0.0-b04-SNAPSHOT 4.0 @@ -131,9 +131,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b03 - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b03 - http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b03 + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet From 15a1d924b46b92d7188edb4a3720dbb2e080495f Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 2 Mar 2017 18:47:52 +0000 Subject: [PATCH 087/160] add @param in javadoc svn path=/trunk/api/javaee-api/javax.servlet/; revision=64698 --- src/main/java/javax/servlet/http/PushBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index d565adda..e52ec17f 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -301,6 +301,7 @@ public interface PushBuilder { /** * Return the header of the given name to be used for the push. + * @param name the name of the header * * @return the header of the given name to be used for the push. */ From 1f3c83012bbdfe9e2bfc1a91f426b9da86f56134 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 2 Mar 2017 21:53:53 +0000 Subject: [PATCH 088/160] SERVLET_SPEC-73: fix javadoc. In table, in row for EXTENSION, remove leading slash for column for pattern. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64704 --- src/main/java/javax/servlet/http/ServletMapping.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/ServletMapping.java b/src/main/java/javax/servlet/http/ServletMapping.java index 8d73233f..77c1cc5c 100644 --- a/src/main/java/javax/servlet/http/ServletMapping.java +++ b/src/main/java/javax/servlet/http/ServletMapping.java @@ -91,7 +91,7 @@ * * "/foo.extension" * foo - * /*.extension + * *.extension * EXTENSION * * From ac91d69d00505f9a818ba5b4207e9c4ed8e16bf3 Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Thu, 2 Mar 2017 23:47:24 +0000 Subject: [PATCH 089/160] SERVLET_SPEC-73: fix javadoc. In table, add row for DEFAULT. Fix paths for CONTEXT_ROOT row. svn path=/trunk/api/javaee-api/javax.servlet/; revision=64709 --- src/main/java/javax/servlet/http/ServletMapping.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/javax/servlet/http/ServletMapping.java b/src/main/java/javax/servlet/http/ServletMapping.java index 77c1cc5c..c442779d 100644 --- a/src/main/java/javax/servlet/http/ServletMapping.java +++ b/src/main/java/javax/servlet/http/ServletMapping.java @@ -79,10 +79,16 @@ * * "" * "" - * / + * "" * CONTEXT_ROOT * * + * "/" + * "" + * "/" + * DEFAULT + * + * * "/MyServlet" * MyServlet * /MyServlet From 740da07b45aea9d9f52afa6ca0f37975f2914d56 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Mar 2017 00:17:36 +0000 Subject: [PATCH 090/160] update javadoc for SERVLET_SPEC-161 Allow encoding to be set from deployment descriptor and API svn path=/trunk/api/javaee-api/javax.servlet/; revision=64710 --- .../java/javax/servlet/ServletRequest.java | 8 +++- .../java/javax/servlet/ServletResponse.java | 42 ++++++++++++------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java index ab4669de..4fba869e 100644 --- a/src/main/java/javax/servlet/ServletRequest.java +++ b/src/main/java/javax/servlet/ServletRequest.java @@ -116,8 +116,12 @@ public interface ServletRequest { /** * Returns the name of the character encoding used in the body of this - * request. This method returns null if the request - * does not specify a character encoding + * request. This method returns null if no request encoding + * character encoding has been specified. The following methods for + * specifying the request character encoding are consulted, in decreasing + * order of priority: per request, per web app (using + * {@link ServletContext#setRequestCharacterEncoding}, deployment + * descriptor), and per container (using vendor specific configuration). * * @return a String containing the name of the character * encoding, or null if the request does not specify a diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java index 514ac120..04596435 100644 --- a/src/main/java/javax/servlet/ServletResponse.java +++ b/src/main/java/javax/servlet/ServletResponse.java @@ -76,13 +76,18 @@ * ServletOutputStream and manage the character sections * manually. * - *

    The charset for the MIME body response can be specified - * explicitly using the {@link #setCharacterEncoding} and - * {@link #setContentType} methods, or implicitly - * using the {@link #setLocale} method. - * Explicit specifications take precedence over - * implicit specifications. If no charset is specified, ISO-8859-1 will be - * used. The setCharacterEncoding, + *

    The charset for the MIME body response can be specified explicitly + * using any of the following techniques: per request, per web-app (using + * {@link ServletContext#setRequestCharacterEncoding}, deployment descriptor), + * and per container (using vendor specific configuration). + * If multiple of the preceding techniques have been employed, the priority is + * the order listed. + * For per request, the charset for the response can be specified explicitly + * using the {@link #setCharacterEncoding} and {@link #setContentType} methods, + * or implicitly using the {@link #setLocale} method. + * Explicit specifications take precedence over implicit specifications. + * If no charset is explicitly specified, ISO-8859-1 will be used. + * The setCharacterEncoding, * setContentType, or setLocale method must * be called before getWriter and before committing * the response for the character encoding to be used. @@ -103,12 +108,16 @@ public interface ServletResponse { /** * Returns the name of the character encoding (MIME charset) * used for the body sent in this response. - * The character encoding may have been specified explicitly - * using the {@link #setCharacterEncoding} or - * {@link #setContentType} methods, or implicitly using the - * {@link #setLocale} method. Explicit specifications take - * precedence over implicit specifications. Calls made - * to these methods after getWriter has been + * The following methods for specifying the response character encoding are + * consulted, in decreasing order of priority: per request, perweb-app + * (using {@link ServletContext#setResponseCharacterEncoding}, deployment + * descriptor), and per container (using vendor specific configuration). + * The first one of these methods that yields a result is returned. + * Per-request, the charset for the response can be specified explicitly + * using the {@link setCharacterEncoding} and {@link setContentType} + * methods, or implicitly using the setLocale(java.util.Locale) method. + * Explicit specifications take precedence over implicit specifications. + * Calls made to these methods after getWriter has been * called or after the response has been committed have no * effect on the character encoding. If no character encoding * has been specified, ISO-8859-1 is returned. @@ -205,9 +214,10 @@ public interface ServletResponse { /** * Sets the character encoding (MIME charset) of the response * being sent to the client, for example, to UTF-8. - * If the character encoding has already been set by - * {@link #setContentType} or {@link #setLocale}, - * this method overrides it. + * If the response character encoding has already been set by the + * {@link ServletContext#setResponseCharacterEncoding}, + * deployment descriptor, or using the setContentType() or setLocale() + * methods, the value set in this method overrides any of those values. * Calling {@link #setContentType} with the String * of text/html and calling * this method with the String of UTF-8 From ccba974a9f3149837a7ceb4511145ff397442871 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Mar 2017 17:39:29 +0000 Subject: [PATCH 091/160] ServletContext#getResponseCharacterEncoding returns null if it is not specified svn path=/trunk/api/javaee-api/javax.servlet/; revision=64719 --- src/main/java/javax/servlet/ServletContext.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index a187e4bb..ca657817 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1707,7 +1707,8 @@ public T createListener(Class clazz) /** * Gets the request character encoding that are supported by default for - * this ServletContext. + * this ServletContext. This method returns null if no request + * encoding character encoding has been specified. * * @return the request character encoding that are supported by default for * this ServletContext @@ -1744,7 +1745,8 @@ public T createListener(Class clazz) /** * Gets the response character encoding that are supported by default for - * this ServletContext. + * this ServletContext. This method returns null if no response + * encoding character encoding has been specified. * * @return the request character encoding that are supported by default for * this ServletContext From 92e90cd8746f3bf38967e51d13c8d87fc373b098 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 3 Mar 2017 19:51:19 +0000 Subject: [PATCH 092/160] update description for default request/response character encoding svn path=/trunk/api/javaee-api/javax.servlet/; revision=64720 --- src/main/java/javax/servlet/ServletContext.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index ca657817..bc7d9682 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -1708,7 +1708,8 @@ public T createListener(Class clazz) /** * Gets the request character encoding that are supported by default for * this ServletContext. This method returns null if no request - * encoding character encoding has been specified. + * encoding character encoding has been specified in deployment descriptor + * or container specific configuration. * * @return the request character encoding that are supported by default for * this ServletContext @@ -1746,7 +1747,8 @@ public T createListener(Class clazz) /** * Gets the response character encoding that are supported by default for * this ServletContext. This method returns null if no response - * encoding character encoding has been specified. + * encoding character encoding has been specified in deployment descriptor + * or container specific configuration. * * @return the request character encoding that are supported by default for * this ServletContext From 1d25c35a9ff9e36783c87b9f4d44cca39245947b Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Mon, 6 Mar 2017 21:21:32 +0000 Subject: [PATCH 093/160] remove IllegalArgumentException from #push svn path=/trunk/api/javaee-api/javax.servlet/; revision=64726 --- src/main/java/javax/servlet/http/PushBuilder.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index e52ec17f..5240c3eb 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -254,9 +254,6 @@ public interface PushBuilder { * eTag and lastModified fields nulled. All other fields are left as * is for possible reuse in another push.

    * - * @throws IllegalArgumentException if the method set expects a - * request body (eg POST) - * * @throws IllegalStateException if there was no call to {@link * #path} on this instance either between its instantiation or the * last call to {@code push()} that did not throw an From 23de8a1dfcf3cac3e158e8a309adfdecd87964dd Mon Sep 17 00:00:00 2001 From: Ed Burns Date: Mon, 6 Mar 2017 21:57:14 +0000 Subject: [PATCH 094/160] SERVLET_SPEC-73 M src/main/java/javax/servlet/http/HttpServletRequest.java - In getServletMapping(), replace spec section numbers with reference to constants. - I didn't like the "came in as" wording for the session ID. M src/main/java/javax/servlet/http/PushBuilder.java - Reword bullet point specifying how the session id is handled. M src/main/java/javax/servlet/http/ServletMapping.java - Fix table per EG discussion. - Specify getMatchValue() and getPattern(). svn path=/trunk/api/javaee-api/javax.servlet/; revision=64727 --- .../servlet/http/HttpServletRequest.java | 25 +++++++------ .../java/javax/servlet/http/PushBuilder.java | 16 +++++--- .../javax/servlet/http/ServletMapping.java | 37 +++++++++++++------ 3 files changed, 50 insertions(+), 28 deletions(-) diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java index 0f6456f3..9aace485 100644 --- a/src/main/java/javax/servlet/http/HttpServletRequest.java +++ b/src/main/java/javax/servlet/http/HttpServletRequest.java @@ -271,9 +271,11 @@ public interface HttpServletRequest extends ServletRequest { * call to {@link javax.servlet.AsyncContext#dispatch}, the returned * {@code ServletMapping} is the one corresponding path that caused * the first {@code Servlet} in the invocation sequence to be - * invoked. See sections 9.3.1, 9.4.2 and 9.7.2 of the - * specification document for additional request attributes related - * to {@code ServletMapping}.

    + * invoked. See {@link + * javax.servlet.RequestDispatcher#FORWARD_MAPPING}, {@link + * javax.servlet.RequestDispatcher#INCLUDE_MAPPING} and {@link + * javax.servlet.AsyncContext#ASYNC_MAPPING} for additional request + * attributes related to {@code ServletMapping}.

    * *

    The returned object is immutable. Servlet 4.0 compliant * implementations must override this method.

    @@ -645,10 +647,11 @@ default public PushBuilder getPushBuilder() { public boolean isRequestedSessionIdValid(); /** - * Checks whether the requested session ID came in as a cookie. + *

    Checks whether the requested session ID was conveyed to the + * server as an HTTP cookie.

    * * @return true if the session ID - * came in as a + * was conveyed to the server an an HTTP * cookie; otherwise, false * * @see #getSession @@ -656,11 +659,11 @@ default public PushBuilder getPushBuilder() { public boolean isRequestedSessionIdFromCookie(); /** - * Checks whether the requested session ID came in as part of the - * request URL. + *

    Checks whether the requested session ID was conveyed to the + * server as part of the request URL.

    * - * @return true if the session ID - * came in as part of a URL; otherwise, + * @return true if the session ID was conveyed to the + * server as part of a URL; otherwise, * false * * @see #getSession @@ -672,8 +675,8 @@ default public PushBuilder getPushBuilder() { * API, use {@link #isRequestedSessionIdFromURL} * instead. * - * @return true if the session ID - * came in as part of a URL; otherwise, + * @return true if the session ID was conveyed to the + * server as part of a URL; otherwise, * false */ @Deprecated diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 5240c3eb..761956b5 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -82,12 +82,18 @@ * be set with a container generated token that will result in equivalent * Authorization for the pushed request.
    • * - *
  • The {@link HttpServletRequest#getRequestedSessionId()} value, - * unless at the time of the call {@link + *
  • The session ID will be the value returned from {@link + * HttpServletRequest#getRequestedSessionId()}, unless {@link * HttpServletRequest#getSession(boolean)} has previously been called to - * create a new {@link HttpSession}, in which case the new session ID - * will be used as the PushBuilder's requested session ID. The source of - * the requested session id will be the same as for the request
    • + * create a new {@link HttpSession} prior to the call to create the + * {@code PushBuilder}, in which case the new session ID will be used as + * the PushBuilder's requested session ID. Note that the session ID + * returned from the request can effectively come from one of two + * "sources": a cookie or the URL (as specified in {@link + * HttpServletRequest#isRequestedSessionIdFromCookie} and {@link + * HttpServletRequest#isRequestedSessionIdFromURL}, respectively). The + * session ID for the {@code PushBuilder} will also come from the same + * source as the request. * *
  • The Referer(sic) header will be set to {@link * HttpServletRequest#getRequestURL()} plus any {@link diff --git a/src/main/java/javax/servlet/http/ServletMapping.java b/src/main/java/javax/servlet/http/ServletMapping.java index c442779d..dbe0dbfc 100644 --- a/src/main/java/javax/servlet/http/ServletMapping.java +++ b/src/main/java/javax/servlet/http/ServletMapping.java @@ -41,11 +41,11 @@ package javax.servlet.http; /** - *

    Allows runtime discovery of the manner in - * which the {@link HttpServlet} for the current {@link HttpServletRequest} was - * invoked. Invoking any of the methods must not block the caller. The - * implementation must be thread safe. Instances are returned from - * {@link HttpServletRequest#getServletMapping}.

    + *

    Allows runtime discovery of the manner in which the {@link + * HttpServlet} for the current {@link HttpServletRequest} was invoked. + * Invoking any of the methods must not block the caller. The + * implementation must be thread safe. Instances are immetable and are + * returned from {@link HttpServletRequest#getServletMapping}.

    * *

    Following are some illustrative examples for various combinations * of mappings. Consider the following Servlet declaration:

    @@ -83,9 +83,9 @@ * CONTEXT_ROOT * * - * "/" + * "/index.html" * "" - * "/" + * / * DEFAULT * * @@ -116,8 +116,16 @@ public interface ServletMapping { /** - *

    Return the actual value that caused this request - * to be matched or the empty String if not known or not knowable.

    + *

    Return the portion of the URI path that caused this request to + * be matched or the empty String if not known or not knowable. If + * the {@link getMappingMatch} value is {@code CONTEXT_ROOT} or + * {@code DEFAULT}, this method must return the empty string. If + * the {@link getMappingMatch} value is {@code EXACT}, this method + * must return the portion of the path that matched the servlet, + * omitting any leading slash. If the {@link getMappingMatch} value + * is {@code EXTENSION} or {@code PATH}, this method must return the + * value that matched the '*'. See the class javadoc for + * examples.

    * * @return the match. * @@ -126,9 +134,14 @@ public interface ServletMapping { public String getMatchValue(); /** - *

    Return the String representation for the - * {@code url-pattern} for this mapping or the empty String if not known - * or not knowable.

    + *

    Return the String representation for the {@code url-pattern} + * for this mapping or the empty String if not known or not + * knowable. If the {@link getMappingMatch} value is {@code + * CONTEXT_ROOT} or {@code DEFAULT}, this method must return the + * empty string. If the {@link getMappingMatch} value is {@code + * EXTENSION}, this method must return the pattern, without any + * leading slash. Otherwise, this method returns the pattern + * exactly as specified in the descriptor or Java configuration.

    * * @return the String representation for the * {@code url-pattern} for this mapping or the empty String if not known From fe852d53a230caea1cb2074b6d4af25be185c439 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 8 Mar 2017 21:23:50 +0000 Subject: [PATCH 095/160] refer conditional headers to RFC 7232 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64738 --- src/main/java/javax/servlet/http/PushBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 761956b5..4689bfa1 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -104,8 +104,8 @@ * to the PushBuilder, unless the {@link Cookie#getMaxAge()} is <=0, in which * case the Cookie will be removed from the builder.
    • * - *
  • If this request has either of the conditional headers - * "If-Modified-Since" or "If-None-Match", then {@link #isConditional()} + *
  • If this request has any of the conditional headers defined in + * defined in RFC 7232, then {@link #isConditional()} * must return {@code true}.
    • * * From 021dd7edc3222594547c9806a9b74f480e393a60 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Wed, 15 Mar 2017 20:49:01 +0000 Subject: [PATCH 096/160] remove #conditional, #eTag, #lastModified and corresponding getters svn path=/trunk/api/javaee-api/javax.servlet/; revision=64808 --- .../java/javax/servlet/http/PushBuilder.java | 90 ++++--------------- 1 file changed, 16 insertions(+), 74 deletions(-) diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java index 4689bfa1..fa259436 100644 --- a/src/main/java/javax/servlet/http/PushBuilder.java +++ b/src/main/java/javax/servlet/http/PushBuilder.java @@ -69,7 +69,7 @@ * are added to the builder, except for: * *
      - *
    • Conditional headers (eg. If-Modified-Since) + *
    • Conditional headers (defined in RFC 7232) *
    • Range headers *
    • Expect headers *
    • Authorization headers @@ -104,10 +104,6 @@ * to the PushBuilder, unless the {@link Cookie#getMaxAge()} is <=0, in which * case the Cookie will be removed from the builder.
      • * - *
    • If this request has any of the conditional headers defined in - * defined in RFC 7232, then {@link #isConditional()} - * must return {@code true}.
      • - * *
    * *

    The {@link #path} method must be called on the {@code PushBuilder} @@ -120,10 +116,9 @@ * asynchronous push request with the current state of the builder. * After the call to {@link #push()}, the builder may be reused for * another push, however the implementation must make it so the {@link - * #path(String)}, {@link #eTag(String)} and {@link - * #lastModified(String)} values are cleared before returning from - * {@link #push}. All other values are retained over calls to {@link - * #push()}. + * #path(String)} and conditional headers (defined in RFC 7232) + * values are cleared before returning from {@link #push}. + * All other values are retained over calls to {@link #push()}. * * @since Servlet 4.0 */ @@ -142,11 +137,12 @@ public interface PushBuilder { */ public PushBuilder method(String method); - /** Set the query string to be used for the push. + /** + * Set the query string to be used for the push. * - * Will be appended to any query String included in a call to {@link - * #path(String)}. Any duplicate parameters must be preserved. This - * method should be used instead of a query in {@link #path(String)} + * The query string will be appended to any query String included in a call + * to {@link #path(String)}. Any duplicate parameters must be preserved. + * This method should be used instead of a query in {@link #path(String)} * when multiple {@link #push()} calls are to be made with the same * query string. * @param queryString the query string to be used for the push. @@ -154,7 +150,8 @@ public interface PushBuilder { */ public PushBuilder queryString(String queryString); - /** Set the SessionID to be used for the push. + /** + * Set the SessionID to be used for the push. * The session ID will be set in the same way it was on the associated request (ie * as a cookie if the associated request used a cookie, or as a url parameter if * the associated request used a url parameter). @@ -165,16 +162,6 @@ public interface PushBuilder { */ public PushBuilder sessionId(String sessionId); - /** Set if the request is to be conditional. - * If the request is conditional, any available values from {@link #eTag(String)} or - * {@link #lastModified(String)} will be set in the appropriate headers. If the request - * is not conditional, then eTag and lastModified values are ignored. - * Defaults to true if the associated request was conditional. - * @param conditional true if the push request is conditional - * @return this builder. - */ - public PushBuilder conditional(boolean conditional); - /** *

    Set a request header to be used for the push. If the builder has an * existing header with the same name, its value is overwritten.

    @@ -218,26 +205,6 @@ public interface PushBuilder { */ public PushBuilder path(String path); - /** - * Set the eTag to be used for conditional pushes. - * The eTag will be used only if {@link #isConditional()} is true. - * Defaults to no eTag. The value is nulled after every call to - * {@link #push()} - * @param eTag the eTag to be used for the push. - * @return this builder. - */ - public PushBuilder eTag(String eTag); - - /** - * Set the last modified date to be used for conditional pushes. - * The last modified date will be used only if {@link - * #isConditional()} is true. Defaults to no date. The value is - * nulled after every call to {@link #push()} - * @param lastModified the last modified date to be used for the push. - * @return this builder. - * */ - public PushBuilder lastModified(String lastModified); - /** * Push a resource given the current state of the builder, * the method must be non-blocking. @@ -246,19 +213,15 @@ public interface PushBuilder { * Calling this method does not guarantee the resource will actually * be pushed, since it is possible the client can decline acceptance * of the pushed resource using the underlying HTTP/2 protocol.

    - - *

    If {@link #isConditional()} is true and an eTag or - * lastModified value is provided, then an appropriate conditional - * header will be generated. If both an eTag and lastModified value - * are provided only an If-None-Match header will be generated. If - * the builder has a session ID, then the pushed request will + * + *

    If the builder has a session ID, then the pushed request will * include the session ID either as a Cookie or as a URI parameter * as appropriate. The builders query string is merged with any * passed query string.

    - + * *

    Before returning from this method, the builder has its path, - * eTag and lastModified fields nulled. All other fields are left as - * is for possible reuse in another push.

    + * conditional headers (defined in RFC 7232) nulled. All other fields + * are left as is for possible reuse in another push.

    * * @throws IllegalStateException if there was no call to {@link * #path} on this instance either between its instantiation or the @@ -288,13 +251,6 @@ public interface PushBuilder { */ public String getSessionId(); - /** - * Return if the request is to be conditional. - * - * @return if the request is to be conditional. - */ - public boolean isConditional(); - /** * Return the set of header to be used for the push. * @@ -316,18 +272,4 @@ public interface PushBuilder { * @return the URI path to be used for the push. */ public String getPath(); - - /** - * Return the eTag to be used for conditional pushes. - * - * @return the eTag to be used for conditional pushes. - */ - public String getETag(); - - /** - * Return the last modified date to be used for conditional pushes. - * - * @return the last modified date to be used for conditional pushes. - */ - public String getLastModified(); } From 2e8e767fc5333ff192a0723590760b2dc8e2de45 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 16 Mar 2017 21:25:40 +0000 Subject: [PATCH 097/160] [maven-release-plugin] prepare release javax.servlet-api-4.0.0-b04 svn path=/trunk/api/javaee-api/javax.servlet/; revision=64812 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ce4dce6b..4b53d0f0 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b04-SNAPSHOT + 4.0.0-b04 4.0 @@ -131,9 +131,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet - http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b04 + scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b04 + http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b04 From 6e0deafbdc91755446589e0e66364c411a9f7eea Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Thu, 16 Mar 2017 21:25:45 +0000 Subject: [PATCH 098/160] [maven-release-plugin] prepare for next development iteration svn path=/trunk/api/javaee-api/javax.servlet/; revision=64814 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4b53d0f0..bd9ba790 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ javax.servlet javax.servlet-api jar - 4.0.0-b04 + 4.0.0-b05-SNAPSHOT 4.0 @@ -131,9 +131,9 @@ - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b04 - scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b04 - http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b04 + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet + http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet From a685fdd4a20f7805786957218a8127ad974b1f88 Mon Sep 17 00:00:00 2001 From: Shing Wai Chan Date: Fri, 24 Mar 2017 17:48:12 +0000 Subject: [PATCH 099/160] fix SERVLET_SPEC-171: Behaviors of returned Set svn path=/trunk/api/javaee-api/javax.servlet/; revision=64875 --- src/main/java/javax/servlet/Registration.java | 4 ++++ src/main/java/javax/servlet/ServletContext.java | 12 ++++++++++++ src/main/java/javax/servlet/ServletRegistration.java | 8 ++++++++ src/main/java/javax/servlet/http/PushBuilder.java | 4 ++++ 4 files changed, 28 insertions(+) diff --git a/src/main/java/javax/servlet/Registration.java b/src/main/java/javax/servlet/Registration.java index 6c8bc1ec..63ecdf3f 100644 --- a/src/main/java/javax/servlet/Registration.java +++ b/src/main/java/javax/servlet/Registration.java @@ -129,6 +129,10 @@ public interface Registration { * updates will be performed, and an IllegalArgumentException will be * thrown. * + *

    The returned set is not backed by the {@code Registration} object, + * so changes in the returned set are not reflected in the + * {@code Registration} object, and vice-versa.

    + * * @param initParameters the initialization parameters * * @return the (possibly empty) Set of initialization parameter names diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java index bc7d9682..3efc31f6 100644 --- a/src/main/java/javax/servlet/ServletContext.java +++ b/src/main/java/javax/servlet/ServletContext.java @@ -263,6 +263,10 @@ public interface ServletContext { * directory of a JAR file inside the web application's * /WEB-INF/lib directory, and have a leading /. * + *

    The returned set is not backed by the {@code ServletContext} object, + * so changes in the returned set are not reflected in the + * {@code ServletContext} object, and vice-versa.

    + * *

    For example, for a web application containing: * * 

    {@code
@@ -1308,6 +1312,10 @@ public  T createFilter(Class clazz)
      * Gets the session tracking modes that are supported by default for this
      * ServletContext.
      *
+     * 
    The returned set is not backed by the {@code ServletContext} object,
+     * so changes in the returned set are not reflected in the
+     * {@code ServletContext} object, and vice-versa.
    
+     *
      * @return set of the session tracking modes supported by default for
      * this ServletContext
      *
@@ -1329,6 +1337,10 @@ public  T createFilter(Class clazz)
      * 
    The session tracking modes in effect are those provided to
      * {@link #setSessionTrackingModes setSessionTrackingModes}.
      *
+     * 
    The returned set is not backed by the {@code ServletContext} object,
+     * so changes in the returned set are not reflected in the
+     * {@code ServletContext} object, and vice-versa.
    
+     *
      * @return set of the session tracking modes in effect for this
      * ServletContext
      *
diff --git a/src/main/java/javax/servlet/ServletRegistration.java b/src/main/java/javax/servlet/ServletRegistration.java
index 253b3f8c..d78e2dce 100644
--- a/src/main/java/javax/servlet/ServletRegistration.java
+++ b/src/main/java/javax/servlet/ServletRegistration.java
@@ -59,6 +59,10 @@ public interface ServletRegistration extends Registration {
      * 
    If this method is called multiple times, each successive call
      * adds to the effects of the former.
      *
+     * 
    The returned set is not backed by the {@code ServletRegistration}
+     * object, so changes in the returned set are not reflected in the
+     * {@code ServletRegistration} object, and vice-versa.
    
+     *
      * @param urlPatterns the URL patterns of the servlet mapping
      *
      * @return the (possibly empty) Set of URL patterns that are already
@@ -156,6 +160,10 @@ interface Dynamic extends ServletRegistration, Registration.Dynamic {
          * descriptor, then this method establishes the security constraint
          * for that pattern from the argument
          * ServletSecurityElement.
+         *
+         * 
    The returned set is not backed by the {@code Dynamic} object,
+         * so changes in the returned set are not reflected in the
+         * {@code Dynamic} object, and vice-versa.
    
          * 
          * @param constraint the {@link ServletSecurityElement} to be applied
          * to the patterns mapped to this ServletRegistration
diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java
index fa259436..6a5cc191 100644
--- a/src/main/java/javax/servlet/http/PushBuilder.java
+++ b/src/main/java/javax/servlet/http/PushBuilder.java
@@ -254,6 +254,10 @@ public interface PushBuilder {
     /**
      * Return the set of header to be used for the push.
      *
+     * 
    The returned set is not backed by the {@code PushBuilder} object,
+     * so changes in the returned set are not reflected in the
+     * {@code PushBuilder} object, and vice-versa.
    
+     *
      * @return the set of header to be used for the push.
      */
     public Set getHeaderNames();

From 402b856bfacc4b28e49e5fe2a8be62f42021676d Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 28 Mar 2017 16:57:35 +0000
Subject: [PATCH 100/160] add more description for "per container"

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64881
---
 src/main/java/javax/servlet/ServletRequest.java  | 3 ++-
 src/main/java/javax/servlet/ServletResponse.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java
index 4fba869e..8300c9d2 100644
--- a/src/main/java/javax/servlet/ServletRequest.java
+++ b/src/main/java/javax/servlet/ServletRequest.java
@@ -121,7 +121,8 @@ public interface ServletRequest {
      * specifying the request character encoding are consulted, in decreasing
      * order of priority: per request, per web app (using
      * {@link ServletContext#setRequestCharacterEncoding}, deployment
-     * descriptor), and per container (using vendor specific configuration).
+     * descriptor), and per container (for all web applications deployed in 
+     * that container, using vendor specific configuration).
      * 
      * @return a String containing the name of the character
      * encoding, or null if the request does not specify a
diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java
index 04596435..63f2abd4 100644
--- a/src/main/java/javax/servlet/ServletResponse.java
+++ b/src/main/java/javax/servlet/ServletResponse.java
@@ -79,7 +79,8 @@
  * 
    The charset for the MIME body response can be specified explicitly
  * using any of the following techniques: per request, per web-app (using
  * {@link ServletContext#setRequestCharacterEncoding}, deployment descriptor),
- * and per container (using vendor specific configuration).
+ * and per container (for all web applications deployed in that container, 
+ * using vendor specific configuration).
  * If multiple of the preceding techniques have been employed, the priority is
  * the order listed.
  * For per request, the charset for the response can be specified explicitly
@@ -111,7 +112,8 @@ public interface ServletResponse {
      * The following methods for specifying the response character encoding are
      * consulted, in decreasing order of priority: per request, perweb-app
      * (using {@link ServletContext#setResponseCharacterEncoding}, deployment
-     * descriptor), and per container (using vendor specific configuration).
+     * descriptor), and per container (for all web applications deployed in
+     * that container, using vendor specific configuration).
      * The first one of these methods that yields a result is returned.
      * Per-request, the charset for the response can be specified explicitly
      * using the {@link setCharacterEncoding} and {@link setContentType}

From adbe1ae651be8e5818e468e6c215b70f49386884 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 28 Mar 2017 18:05:35 +0000
Subject: [PATCH 101/160] add more description to 'per container'

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64882
---
 src/main/java/javax/servlet/ServletContext.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java
index 3efc31f6..9e381486 100644
--- a/src/main/java/javax/servlet/ServletContext.java
+++ b/src/main/java/javax/servlet/ServletContext.java
@@ -1721,7 +1721,8 @@ public  T createListener(Class clazz)
      * Gets the request character encoding that are supported by default for
      * this ServletContext. This method returns null if no request
      * encoding character encoding has been specified in deployment descriptor
-     * or container specific configuration.
+     * or container specific configuration (for all web applications in the
+     * container).
      *
      * @return the request character encoding that are supported by default for
      * this ServletContext
@@ -1760,7 +1761,8 @@ public  T createListener(Class clazz)
      * Gets the response character encoding that are supported by default for
      * this ServletContext. This method returns null if no response
      * encoding character encoding has been specified in deployment descriptor
-     * or container specific configuration.
+     * or container specific configuration (for all web applications in the
+     * container).
      *
      * @return the request character encoding that are supported by default for
      * this ServletContext

From d8483c2aaa79faf1d334652280fd5ad946e41d6e Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 29 Mar 2017 22:59:34 +0000
Subject: [PATCH 102/160] rename HttpServletRequest#getPushBuilder to
 #newPushBuilder

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64884
---
 .../javax/servlet/http/HttpServletRequest.java     | 14 +++++++-------
 .../servlet/http/HttpServletRequestWrapper.java    |  6 +++---
 src/main/java/javax/servlet/http/PushBuilder.java  |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 9aace485..c61ff7df 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -381,21 +381,21 @@ public String toString() {
     public String getPathTranslated();
 
     /**
-     * Returns a {@link PushBuilder} for issuing server push responses
-     * from the current request.  If the current connection does not
-     * support server push, or server push has been disabled by the
-     * client via a {@code SETTINGS_ENABLE_PUSH} settings frame value of
-     * {@code 0} (zero), it will return null.
+     * Instantiates a new instance of {@link PushBuilder} for issuing server
+     * push responses from the current request. This method returns null
+     * if the current connection does not support server push, or server
+     * push has been disabled by the client via a
+     * {@code SETTINGS_ENABLE_PUSH} settings frame value of {@code 0} (zero).
      *
      * @implSpec
      * The default implementation returns null.
      *
      * @return a {@link PushBuilder} for issuing server push responses
-     * from the current request.
+     * from the current request, or null if push is not supported
      *
      * @since Servlet 4.0
      */
-     default public PushBuilder getPushBuilder() {
+     default public PushBuilder newPushBuilder() {
          return null;
      }
 
diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
index 434be968..eda4c6bc 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -415,13 +415,13 @@ public  T upgrade(Class handlerClass)
     }
 
     /**
-     * The default behavior of this method is to call getPushBuilder on the
+     * The default behavior of this method is to call newPushBuilder on the
      * wrapped request object.
      *
      * @since Servlet 4.0
      */
     @Override
-    public PushBuilder getPushBuilder() {
-        return this._getHttpServletRequest().getPushBuilder();
+    public PushBuilder newPushBuilder() {
+        return this._getHttpServletRequest().newPushBuilder();
     }
 }
diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java
index 6a5cc191..865c67b2 100644
--- a/src/main/java/javax/servlet/http/PushBuilder.java
+++ b/src/main/java/javax/servlet/http/PushBuilder.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -54,9 +54,9 @@
  * safe without a request body.
  *
  * 
    A PushBuilder is obtained by calling {@link
- * HttpServletRequest#getPushBuilder()}.  Each call to this method will
- * return a new instance of a PushBuilder based off the current {@code
- * HttpServletRequest}.  Any mutations to the returned PushBuilder are
+ * HttpServletRequest#newPushBuilder()}.  Each call to this method will
+ * a new instance of a PushBuilder based off the current {@code
+ * HttpServletRequest}, or null.  Any mutations to the returned PushBuilder are
  * not reflected on future returns.
    
  *
  * 
    The instance is initialized as follows:
    

From 744119ad49e5f2c4afbef1f42760e3b676484567 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 29 Mar 2017 23:00:34 +0000
Subject: [PATCH 103/160] [maven-release-plugin] prepare release
 javax.servlet-api-4.0.0-b05

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64885
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index bd9ba790..26a76d44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b05-SNAPSHOT
+    4.0.0-b05
 
     
         4.0
@@ -131,9 +131,9 @@
         
     
     
-        scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet
-        scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet
-        http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet
+        scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b05
+        scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b05
+        http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b05
     
 
     

From c5cb31dd96740f57de895638bfa881a26b90c455 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 29 Mar 2017 23:00:39 +0000
Subject: [PATCH 104/160] [maven-release-plugin] prepare for next development
 iteration

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64887
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 26a76d44..6b2f7544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b05
+    4.0.0-b06-SNAPSHOT
 
     
         4.0
@@ -131,9 +131,9 @@
         
     
     
-        scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b05
-        scm:svn:https://svn.java.net/svn/glassfish~svn/tags/javax.servlet-api-4.0.0-b05
-        http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-4.0.0-b05
+        scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet
+        scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet
+        http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet
     
 
     

From 0446e7edc5014e72a84dc2b62b3c7bac527f1c1c Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Fri, 31 Mar 2017 14:57:07 +0000
Subject: [PATCH 105/160] [SERVLET_SPEC-172-Part.write] update javadoc to
 clarify interpretation of fileName argument.

M       src/main/java/javax/servlet/http/Part.java

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64894
---
 src/main/java/javax/servlet/http/Part.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/javax/servlet/http/Part.java b/src/main/java/javax/servlet/http/Part.java
index 8df769b7..7ba1ebc9 100644
--- a/src/main/java/javax/servlet/http/Part.java
+++ b/src/main/java/javax/servlet/http/Part.java
@@ -98,9 +98,15 @@ public interface Part {
      * example, file renaming, where possible, rather than copying all of the
      * underlying data, thus gaining a significant performance benefit.
      *
-     * @param fileName the name of the file to which the stream will be
-     * written. The file is created relative to the location as
-     * specified in the MultipartConfig
+     * @param fileName The location into which the uploaded part should
+       be stored. The value may be a file name or a path.  The actual
+       location of the file in the filesystem is relative to {@link
+       javax.servlet.MultipartConfigElement#getLocation()}.  Absolute
+       paths are used as provided and are relative to
+       getLocation().  Note: that this is a system
+       dependent string and URI notation may not be acceptable on all
+       systems. For portability, this string should be generated with
+       the File or Path APIs.
      *
      * @throws IOException if an error occurs.
      */

From 9fa729e3734db4db021ce653c4d55601562000d3 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 14 Apr 2017 18:51:19 +0000
Subject: [PATCH 106/160] add trailer API

svn path=/trunk/api/javaee-api/javax.servlet/; revision=64930
---
 .../servlet/http/HttpServletRequest.java      | 21 +++++++++++++++++
 .../http/HttpServletRequestWrapper.java       | 11 +++++++++
 .../servlet/http/HttpServletResponse.java     | 23 ++++++++++++++++++-
 .../http/HttpServletResponseWrapper.java      | 14 +++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index c61ff7df..a869aacb 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -849,4 +849,25 @@ public void login(String username, String password)
      */
     public  T  upgrade(Class handlerClass)
         throws IOException, ServletException;
+
+    /**
+     * Get the request trailer.
+     * This method can only be called after the application reads all
+     * the request content.
+     *
+     * @implSpec
+     * The default implementation returns null.
+     * 
+     * @return A map of trailers or null if the request did not contain any
+     *
+     * @throws IllegalStateException if neither
+     * {@link javax.servlet.ReadListener#onAllDataRead} has been called nor
+     * an EOF indication has been returned from the 
+     * {@link #getReader} or {@link #getInputStream}
+     *
+     * @since Servlet 4.0
+     */
+    default public Map getTrailers() {
+        return null;
+    }
 }
diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
index eda4c6bc..03bb9153 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -424,4 +424,15 @@ public  T upgrade(Class handlerClass)
     public PushBuilder newPushBuilder() {
         return this._getHttpServletRequest().newPushBuilder();
     }
+
+    /**
+     * The default behavior of this method is to call getTrailers on the
+     * wrapped request object.
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public Map getTrailers() {
+        return this._getHttpServletRequest().getTrailers();
+    }
 }
diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index 2a7efd28..18c578bb 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -60,6 +60,8 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Map;
+import java.util.function.Supplier;
 import javax.servlet.ServletResponse;
 
 /**
@@ -454,7 +456,26 @@ public interface HttpServletResponse extends ServletResponse {
      */
     public Collection getHeaderNames();
 
-    
+    /**
+     * Set the supplier of trailer headers.
+     * The supplier will be called within the scope of whatever thread/call
+     * causes the response content to be completed. Typically this will
+     * be any thread calling close() on the output stream or writer.
+     *
+     * The trailers that run afoul of the provisions of section 4.1.2 of
+     * RFC 7230 are ignored.
+     *
+     * @implSpec
+     * The default implementation is a no-op.
+     *
+     * @param supplier the supplier of trailer headers
+     *
+     * @since Servlet 4.0
+     */
+    default public void setTrailers(Supplier> supplier) {
+    }
+
+
     /*
      * Server status codes; see RFC 2068.
      */
diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
index f09a177b..e4430162 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -60,6 +60,8 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Map;
+import java.util.function.Supplier;
 import javax.servlet.ServletResponseWrapper;
 
 /**
@@ -325,4 +327,16 @@ public Collection getHeaders(String name) {
     public Collection getHeaderNames() {
         return _getHttpServletResponse().getHeaderNames();
     }
+
+    /**
+     * The default behaviour of this method is to call
+     * {@link HttpServletResponse#setTrailers} on the wrapped response
+     * object.
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public void setTrailers(Supplier> supplier) {
+        _getHttpServletResponse().setTrailers(supplier);
+    }
 }

From bc42abfa261b5611e3a55e2b739453ffd91d3b89 Mon Sep 17 00:00:00 2001
From: Arindam Bandyopadhyay 
Date: Wed, 19 Apr 2017 12:26:31 +0530
Subject: [PATCH 107/160] Create LICENSE

---
 LICENSE | 759 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 759 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..b1c74f95
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,759 @@
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
+
+1. Definitions.
+
+    1.1. "Contributor" means each individual or entity that creates or
+    contributes to the creation of Modifications.
+
+    1.2. "Contributor Version" means the combination of the Original
+    Software, prior Modifications used by a Contributor (if any), and
+    the Modifications made by that particular Contributor.
+
+    1.3. "Covered Software" means (a) the Original Software, or (b)
+    Modifications, or (c) the combination of files containing Original
+    Software with files containing Modifications, in each case including
+    portions thereof.
+
+    1.4. "Executable" means the Covered Software in any form other than
+    Source Code.
+
+    1.5. "Initial Developer" means the individual or entity that first
+    makes Original Software available under this License.
+
+    1.6. "Larger Work" means a work which combines Covered Software or
+    portions thereof with code not governed by the terms of this License.
+
+    1.7. "License" means this document.
+
+    1.8. "Licensable" means having the right to grant, to the maximum
+    extent possible, whether at the time of the initial grant or
+    subsequently acquired, any and all of the rights conveyed herein.
+
+    1.9. "Modifications" means the Source Code and Executable form of
+    any of the following:
+
+    A. Any file that results from an addition to, deletion from or
+    modification of the contents of a file containing Original Software
+    or previous Modifications;
+
+    B. Any new file that contains any part of the Original Software or
+    previous Modification; or
+
+    C. Any new file that is contributed or otherwise made available
+    under the terms of this License.
+
+    1.10. "Original Software" means the Source Code and Executable form
+    of computer software code that is originally released under this
+    License.
+
+    1.11. "Patent Claims" means any patent claim(s), now owned or
+    hereafter acquired, including without limitation, method, process,
+    and apparatus claims, in any patent Licensable by grantor.
+
+    1.12. "Source Code" means (a) the common form of computer software
+    code in which modifications are made and (b) associated
+    documentation included in or with such code.
+
+    1.13. "You" (or "Your") means an individual or a legal entity
+    exercising rights under, and complying with all of the terms of,
+    this License. For legal entities, "You" includes any entity which
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants.
+
+    2.1. The Initial Developer Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject
+    to third party intellectual property claims, the Initial Developer
+    hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or
+    trademark) Licensable by Initial Developer, to use, reproduce,
+    modify, display, perform, sublicense and distribute the Original
+    Software (or portions thereof), with or without Modifications,
+    and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using or selling of
+    Original Software, to make, have made, use, practice, sell, and
+    offer for sale, and/or otherwise dispose of the Original Software
+    (or portions thereof).
+
+    (c) The licenses granted in Sections 2.1(a) and (b) are effective on
+    the date Initial Developer first distributes or otherwise makes the
+    Original Software available to a third party under the terms of this
+    License.
+
+    (d) Notwithstanding Section 2.1(b) above, no patent license is
+    granted: (1) for code that You delete from the Original Software, or
+    (2) for infringements caused by: (i) the modification of the
+    Original Software, or (ii) the combination of the Original Software
+    with other software or devices.
+
+    2.2. Contributor Grant.
+
+    Conditioned upon Your compliance with Section 3.1 below and subject
+    to third party intellectual property claims, each Contributor hereby
+    grants You a world-wide, royalty-free, non-exclusive license:
+
+    (a) under intellectual property rights (other than patent or
+    trademark) Licensable by Contributor to use, reproduce, modify,
+    display, perform, sublicense and distribute the Modifications
+    created by such Contributor (or portions thereof), either on an
+    unmodified basis, with other Modifications, as Covered Software
+    and/or as part of a Larger Work; and
+
+    (b) under Patent Claims infringed by the making, using, or selling
+    of Modifications made by that Contributor either alone and/or in
+    combination with its Contributor Version (or portions of such
+    combination), to make, use, sell, offer for sale, have made, and/or
+    otherwise dispose of: (1) Modifications made by that Contributor (or
+    portions thereof); and (2) the combination of Modifications made by
+    that Contributor with its Contributor Version (or portions of such
+    combination).
+
+    (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
+    on the date Contributor first distributes or otherwise makes the
+    Modifications available to a third party.
+
+    (d) Notwithstanding Section 2.2(b) above, no patent license is
+    granted: (1) for any code that Contributor has deleted from the
+    Contributor Version; (2) for infringements caused by: (i) third
+    party modifications of Contributor Version, or (ii) the combination
+    of Modifications made by that Contributor with other software
+    (except as part of the Contributor Version) or other devices; or (3)
+    under Patent Claims infringed by Covered Software in the absence of
+    Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+    3.1. Availability of Source Code.
+
+    Any Covered Software that You distribute or otherwise make available
+    in Executable form must also be made available in Source Code form
+    and that Source Code form must be distributed only under the terms
+    of this License. You must include a copy of this License with every
+    copy of the Source Code form of the Covered Software You distribute
+    or otherwise make available. You must inform recipients of any such
+    Covered Software in Executable form as to how they can obtain such
+    Covered Software in Source Code form in a reasonable manner on or
+    through a medium customarily used for software exchange.
+
+    3.2. Modifications.
+
+    The Modifications that You create or to which You contribute are
+    governed by the terms of this License. You represent that You
+    believe Your Modifications are Your original creation(s) and/or You
+    have sufficient rights to grant the rights conveyed by this License.
+
+    3.3. Required Notices.
+
+    You must include a notice in each of Your Modifications that
+    identifies You as the Contributor of the Modification. You may not
+    remove or alter any copyright, patent or trademark notices contained
+    within the Covered Software, or any notices of licensing or any
+    descriptive text giving attribution to any Contributor or the
+    Initial Developer.
+
+    3.4. Application of Additional Terms.
+
+    You may not offer or impose any terms on any Covered Software in
+    Source Code form that alters or restricts the applicable version of
+    this License or the recipients' rights hereunder. You may choose to
+    offer, and to charge a fee for, warranty, support, indemnity or
+    liability obligations to one or more recipients of Covered Software.
+    However, you may do so only on Your own behalf, and not on behalf of
+    the Initial Developer or any Contributor. You must make it
+    absolutely clear that any such warranty, support, indemnity or
+    liability obligation is offered by You alone, and You hereby agree
+    to indemnify the Initial Developer and every Contributor for any
+    liability incurred by the Initial Developer or such Contributor as a
+    result of warranty, support, indemnity or liability terms You offer.
+
+    3.5. Distribution of Executable Versions.
+
+    You may distribute the Executable form of the Covered Software under
+    the terms of this License or under the terms of a license of Your
+    choice, which may contain terms different from this License,
+    provided that You are in compliance with the terms of this License
+    and that the license for the Executable form does not attempt to
+    limit or alter the recipient's rights in the Source Code form from
+    the rights set forth in this License. If You distribute the Covered
+    Software in Executable form under a different license, You must make
+    it absolutely clear that any terms which differ from this License
+    are offered by You alone, not by the Initial Developer or
+    Contributor. You hereby agree to indemnify the Initial Developer and
+    every Contributor for any liability incurred by the Initial
+    Developer or such Contributor as a result of any such terms You offer.
+
+    3.6. Larger Works.
+
+    You may create a Larger Work by combining Covered Software with
+    other code not governed by the terms of this License and distribute
+    the Larger Work as a single product. In such a case, You must make
+    sure the requirements of this License are fulfilled for the Covered
+    Software.
+
+4. Versions of the License.
+
+    4.1. New Versions.
+
+    Oracle is the initial license steward and may publish revised and/or
+    new versions of this License from time to time. Each version will be
+    given a distinguishing version number. Except as provided in Section
+    4.3, no one other than the license steward has the right to modify
+    this License.
+
+    4.2. Effect of New Versions.
+
+    You may always continue to use, distribute or otherwise make the
+    Covered Software available under the terms of the version of the
+    License under which You originally received the Covered Software. If
+    the Initial Developer includes a notice in the Original Software
+    prohibiting it from being distributed or otherwise made available
+    under any subsequent version of the License, You must distribute and
+    make the Covered Software available under the terms of the version
+    of the License under which You originally received the Covered
+    Software. Otherwise, You may also choose to use, distribute or
+    otherwise make the Covered Software available under the terms of any
+    subsequent version of the License published by the license steward.
+
+    4.3. Modified Versions.
+
+    When You are an Initial Developer and You want to create a new
+    license for Your Original Software, You may create and use a
+    modified version of this License if You: (a) rename the license and
+    remove any references to the name of the license steward (except to
+    note that the license differs from this License); and (b) otherwise
+    make it clear that the license contains terms which differ from this
+    License.
+
+5. DISCLAIMER OF WARRANTY.
+
+    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+    INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE
+    IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
+    NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+    THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
+    DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
+    OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
+    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+    ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
+    AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+    6.1. This License and the rights granted hereunder will terminate
+    automatically if You fail to comply with terms herein and fail to
+    cure such breach within 30 days of becoming aware of the breach.
+    Provisions which, by their nature, must remain in effect beyond the
+    termination of this License shall survive.
+
+    6.2. If You assert a patent infringement claim (excluding
+    declaratory judgment actions) against Initial Developer or a
+    Contributor (the Initial Developer or Contributor against whom You
+    assert such claim is referred to as "Participant") alleging that the
+    Participant Software (meaning the Contributor Version where the
+    Participant is a Contributor or the Original Software where the
+    Participant is the Initial Developer) directly or indirectly
+    infringes any patent, then any and all rights granted directly or
+    indirectly to You by such Participant, the Initial Developer (if the
+    Initial Developer is not the Participant) and all Contributors under
+    Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
+    from Participant terminate prospectively and automatically at the
+    expiration of such 60 day notice period, unless if within such 60
+    day period You withdraw Your claim with respect to the Participant
+    Software against such Participant either unilaterally or pursuant to
+    a written agreement with Participant.
+
+    6.3. If You assert a patent infringement claim against Participant
+    alleging that the Participant Software directly or indirectly
+    infringes any patent where such claim is resolved (such as by
+    license or settlement) prior to the initiation of patent
+    infringement litigation, then the reasonable value of the licenses
+    granted by such Participant under Sections 2.1 or 2.2 shall be taken
+    into account in determining the amount or value of any payment or
+    license.
+
+    6.4. In the event of termination under Sections 6.1 or 6.2 above,
+    all end user licenses that have been validly granted by You or any
+    distributor hereunder prior to termination (excluding licenses
+    granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+    INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+    COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
+    TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+    CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+    LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+    FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
+    LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
+    POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
+    APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
+    PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
+    LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+    LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
+    AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+    The Covered Software is a "commercial item," as that term is defined
+    in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+    software" (as that term is defined at 48 C.F.R. §
+    252.227-7014(a)(1)) and "commercial computer software documentation"
+    as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
+    with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+    (June 1995), all U.S. Government End Users acquire Covered Software
+    with only those rights set forth herein. This U.S. Government Rights
+    clause is in lieu of, and supersedes, any other FAR, DFAR, or other
+    clause or provision that addresses Government rights in computer
+    software under this License.
+
+9. MISCELLANEOUS.
+
+    This License represents the complete agreement concerning subject
+    matter hereof. If any provision of this License is held to be
+    unenforceable, such provision shall be reformed only to the extent
+    necessary to make it enforceable. This License shall be governed by
+    the law of the jurisdiction specified in a notice contained within
+    the Original Software (except to the extent applicable law, if any,
+    provides otherwise), excluding such jurisdiction's conflict-of-law
+    provisions. Any litigation relating to this License shall be subject
+    to the jurisdiction of the courts located in the jurisdiction and
+    venue specified in a notice contained within the Original Software,
+    with the losing party responsible for costs, including, without
+    limitation, court costs and reasonable attorneys' fees and expenses.
+    The application of the United Nations Convention on Contracts for
+    the International Sale of Goods is expressly excluded. Any law or
+    regulation which provides that the language of a contract shall be
+    construed against the drafter shall not apply to this License. You
+    agree that You alone are responsible for compliance with the United
+    States export administration regulations (and the export control
+    laws and regulation of any other countries) when You use, distribute
+    or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+    As between Initial Developer and the Contributors, each party is
+    responsible for claims and damages arising, directly or indirectly,
+    out of its utilization of rights under this License and You agree to
+    work with Initial Developer and Contributors to distribute such
+    responsibility on an equitable basis. Nothing herein is intended or
+    shall be deemed to constitute any admission of liability.
+
+------------------------------------------------------------------------
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the
+State of California (excluding conflict-of-law provisions). Any
+litigation relating to this License shall be subject to the jurisdiction
+of the Federal Courts of the Northern District of California and the
+state courts of the State of California, with venue lying in Santa Clara
+County, California.
+
+
+
+  The GNU General Public License (GPL) Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor
+Boston, MA 02110-1335
+USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public
+License applies to most of the Free Software Foundation's software and
+to any other program whose authors commit to using it. (Some other Free
+Software Foundation software is covered by the GNU Library General
+Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.
+Our General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this
+service if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone
+to deny you these rights or to ask you to surrender the rights. These
+restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis
+or for a fee, you must give the recipients all the rights that you have.
+You must make sure that they, too, receive or can get the source code.
+And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.
+We wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program
+proprietary. To prevent this, we have made it clear that any patent must
+be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a
+notice placed by the copyright holder saying it may be distributed under
+the terms of this General Public License. The "Program", below, refers
+to any such program or work, and a "work based on the Program" means
+either the Program or any derivative work under copyright law: that is
+to say, a work containing the Program or a portion of it, either
+verbatim or with modifications and/or translated into another language.
+(Hereinafter, translation is included without limitation in the term
+"modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of running
+the Program is not restricted, and the output from the Program is
+covered only if its contents constitute a work based on the Program
+(independent of having been made by running the Program). Whether that
+is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy an appropriate copyright notice
+and disclaimer of warranty; keep intact all the notices that refer to
+this License and to the absence of any warranty; and give any other
+recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of
+it, thus forming a work based on the Program, and copy and distribute
+such modifications or work under the terms of Section 1 above, provided
+that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any part
+    thereof, to be licensed as a whole at no charge to all third parties
+    under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this License.
+    (Exception: if the Program itself is interactive but does not
+    normally print such an announcement, your work based on the Program
+    is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program, and
+can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based on
+the Program, the distribution of the whole must be on the terms of this
+License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the
+scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your cost
+    of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code. (This alternative is allowed
+    only for noncommercial distribution and only if you received the
+    program in object code or executable form with such an offer, in
+    accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to control
+compilation and installation of the executable. However, as a special
+exception, the source code distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies the
+executable.
+
+If distribution of executable or object code is made by offering access
+to copy from a designated place, then offering equivalent access to copy
+the source code from the same place counts as distribution of the source
+code, even though third parties are not compelled to copy the source
+along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt otherwise
+to copy, modify, sublicense or distribute the Program is void, and will
+automatically terminate your rights under this License. However, parties
+who have received copies, or rights, from you under this License will
+not have their licenses terminated so long as such parties remain in
+full compliance.
+
+5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and all
+its terms and conditions for copying, distributing or modifying the
+Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further restrictions
+on the recipients' exercise of the rights granted herein. You are not
+responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot distribute
+so as to satisfy simultaneously your obligations under this License and
+any other pertinent obligations, then as a consequence you may not
+distribute the Program at all. For example, if a patent license would
+not permit royalty-free redistribution of the Program by all those who
+receive copies directly or indirectly through you, then the only way you
+could satisfy both it and this License would be to refrain entirely from
+distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is implemented
+by public license practices. Many people have made generous
+contributions to the wide range of software distributed through that
+system in reliance on consistent application of that system; it is up to
+the author/donor to decide if he or she is willing to distribute
+software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be
+a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License may
+add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among countries
+not thus excluded. In such case, this License incorporates the
+limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new
+versions of the General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version
+number of this License, you may choose any version ever published by the
+Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the
+author to ask for permission. For software which is copyrighted by the
+Free Software Foundation, write to the Free Software Foundation; we
+sometimes make exceptions for this. Our decision will be guided by the
+two goals of preserving the free status of all derivatives of our free
+software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+    Copyright (C)  
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+    `show w'. This is free software, and you are welcome to redistribute
+    it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the commands
+you use may be called something other than `show w' and `show c'; they
+could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the
+    program `Gnomovision' (which makes passes at compilers) written by
+    James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications
+with the library. If this is what you want to do, use the GNU Library
+General Public License instead of this License.
+
+#
+
+Certain source files distributed by Oracle America, Inc. and/or its
+affiliates are subject to the following clarification and special
+exception to the GPLv2, based on the GNU Project exception for its
+Classpath libraries, known as the GNU Classpath Exception, but only
+where Oracle has expressly included in the particular source file's
+header the words "Oracle designates this particular file as subject to
+the "Classpath" exception as provided by Oracle in the LICENSE file
+that accompanied this code."
+
+You should also note that Oracle includes multiple, independent
+programs in this software package. Some of those programs are provided
+under licenses deemed incompatible with the GPLv2 by the Free Software
+Foundation and others.  For example, the package includes programs
+licensed under the Apache License, Version 2.0.  Such programs are
+licensed to you under their original licenses.
+
+Oracle facilitates your further distribution of this package by adding
+the Classpath Exception to the necessary parts of its GPLv2 code, which
+permits you to use that code in combination with other independent
+modules not licensed under the GPLv2.  However, note that this would
+not permit you to commingle code under an incompatible license with
+Oracle's GPLv2 licensed code by, for example, cutting and pasting such
+code into a file also containing Oracle's GPLv2 licensed code and then
+distributing the result.  Additionally, if you were to remove the
+Classpath Exception from any of the files to which it applies and
+distribute the result, you would likely be required to license some or
+all of the other code in that distribution under the GPLv2 as well, and
+since the GPLv2 is incompatible with the license terms of some items
+included in the distribution by Oracle, removing the Classpath
+Exception could therefore effectively compromise your ability to
+further distribute the package.
+
+Proceed with caution and we recommend that you obtain the advice of a
+lawyer skilled in open source matters before removing the Classpath
+Exception or making modifications to this package which may
+subsequently be redistributed and/or involve the use of third party
+software.
+
+CLASSPATH EXCEPTION
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License version 2 cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from or
+based on this library.  If you modify this library, you may extend this
+exception to your version of the library, but you are not obligated to
+do so.  If you do not wish to do so, delete this exception statement
+from your version.

From ae4b1da0dd56c8c99c7b289d22135c7555864b17 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Mon, 24 Apr 2017 16:14:56 -0700
Subject: [PATCH 108/160] Update copyright-maven-plugin to work with Git

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6b2f7544..f49b3e23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,6 +315,8 @@
                 glassfish-copyright-maven-plugin
                 ${copyright-plugin.version}
                 
+                    git
+                    true
                     
                         ${basedir}/copyright-exclude
                     

From 42e99d0e55169191e3650892fce34f97fb73959b Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Mon, 24 Apr 2017 16:19:41 -0700
Subject: [PATCH 109/160] Create README.md

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..8a734a34
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+Servlet API
+===========
+
+Building
+--------
+
+Prerequisites:
+
+* JDK8+
+* Maven 3.0.3+
+
+Run the build:
+
+`mvn install`
+
+The build generates the jar, sources-jar and javadoc-jar by default.
+
+Checking findbugs
+-----------------
+
+`mvn -DskipTests-true -Dfindbugs.threshold=Low findbugs:findbugs`
+
+Checking copyright
+------------------
+
+`mvn -q org.glassfish.copyright:glassfish-copyright-maven-plugin:copyright`

From c277a96ad96b848b71d30339e5a785ba26b6b148 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 24 Apr 2017 16:25:55 -0700
Subject: [PATCH 110/160] do not return null for #getTrailers add .gitignore

---
 .gitignore                                    |  1 +
 .../servlet/http/HttpServletRequest.java      | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b83d2226
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index a869aacb..2ace993c 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -851,14 +851,22 @@ public  T  upgrade(Class handlerClass)
         throws IOException, ServletException;
 
     /**
-     * Get the request trailer.
-     * This method can only be called after the application reads all
-     * the request content.
+     * Get the request trailers.
+     *
+     * 
    The returned map is not backed by the {@code HttpServletRequest} object,
+     * so changes in the returned map are not reflected in the
+     * {@code HttpServletRequest} object, and vice-versa.
    
+     * 
+     * 
    This method should only be called after all the request content is read.
+     * Calling this method before that point will cause the action described in the
+     * throws clause below.
    
      *
      * @implSpec
-     * The default implementation returns null.
+     * The default implementation returns empty Map.
      * 
-     * @return A map of trailers or null if the request did not contain any
+     * @return A map of trailers in which all the keys are in lowercase,
+     * regardless of the case they had at the protocol level, or the empty map
+     * if there are no trailers or the underlying transport does not support trailers.
      *
      * @throws IllegalStateException if neither
      * {@link javax.servlet.ReadListener#onAllDataRead} has been called nor
@@ -868,6 +876,6 @@ public  T  upgrade(Class handlerClass)
      * @since Servlet 4.0
      */
     default public Map getTrailers() {
-        return null;
+        return Collections.emptyMap();
     }
 }

From 040064ce2743cdf4a11fc8ec602cedb90dd9a375 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Mon, 24 Apr 2017 17:03:49 -0700
Subject: [PATCH 111/160] remove download.java.net/maven/glassfish repository
 definition

---
 pom.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index f49b3e23..31630258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,17 +352,4 @@
             
         
     
-    
-    
-    
-    
-    
-        
-            glassfish-repository
-            http://download.java.net/maven/glassfish
-            
-                never
-            
-        
-    
 

From 58b0116b1558f5b284c2ef0f487a8d982746a298 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Mon, 24 Apr 2017 17:15:39 -0700
Subject: [PATCH 112/160] udpate copyright-exclude repair copyrights

---
 copyright-exclude                             | 29 ++++++++++---------
 exclude.xml                                   |  6 ++--
 pom.xml                                       |  8 ++---
 release.sh                                    |  6 ++--
 src/main/java/javax/servlet/AsyncContext.java |  6 ++--
 src/main/java/javax/servlet/AsyncEvent.java   |  6 ++--
 .../java/javax/servlet/AsyncListener.java     |  6 ++--
 .../java/javax/servlet/DispatcherType.java    |  6 ++--
 .../javax/servlet/FilterRegistration.java     |  6 ++--
 .../java/javax/servlet/GenericFilter.java     |  7 ++---
 .../javax/servlet/HttpConstraintElement.java  |  6 ++--
 .../servlet/HttpMethodConstraintElement.java  |  6 ++--
 .../javax/servlet/MultipartConfigElement.java |  6 ++--
 src/main/java/javax/servlet/ReadListener.java |  7 ++---
 src/main/java/javax/servlet/Registration.java |  6 ++--
 .../servlet/ServletContainerInitializer.java  |  6 ++--
 .../javax/servlet/ServletRegistration.java    |  6 ++--
 .../javax/servlet/ServletSecurityElement.java |  6 ++--
 .../javax/servlet/SessionCookieConfig.java    |  6 ++--
 .../javax/servlet/SessionTrackingMode.java    |  6 ++--
 .../java/javax/servlet/WriteListener.java     |  7 ++---
 .../servlet/annotation/HandlesTypes.java      |  6 ++--
 .../servlet/annotation/HttpConstraint.java    |  6 ++--
 .../annotation/HttpMethodConstraint.java      |  6 ++--
 .../servlet/annotation/MultipartConfig.java   |  6 ++--
 .../servlet/annotation/ServletSecurity.java   |  6 ++--
 .../javax/servlet/annotation/WebFilter.java   |  6 ++--
 .../servlet/annotation/WebInitParam.java      |  6 ++--
 .../javax/servlet/annotation/WebListener.java |  6 ++--
 .../javax/servlet/annotation/WebServlet.java  |  6 ++--
 .../javax/servlet/annotation/package.html     |  6 ++--
 .../descriptor/JspConfigDescriptor.java       |  6 ++--
 .../JspPropertyGroupDescriptor.java           |  6 ++--
 .../servlet/descriptor/TaglibDescriptor.java  |  6 ++--
 .../javax/servlet/descriptor/package.html     |  6 ++--
 .../java/javax/servlet/http/HttpFilter.java   |  7 ++---
 .../servlet/http/HttpSessionIdListener.java   |  7 ++---
 .../servlet/http/HttpUpgradeHandler.java      |  6 ++--
 .../java/javax/servlet/http/MappingMatch.java | 19 ++++++------
 src/main/java/javax/servlet/http/Part.java    |  6 ++--
 .../java/javax/servlet/http/PushBuilder.java  |  6 ++--
 .../javax/servlet/http/ServletMapping.java    | 20 ++++++-------
 .../javax/servlet/http/WebConnection.java     |  6 ++--
 src/main/javadoc/javax.servlet-api.css        |  6 ++--
 44 files changed, 158 insertions(+), 163 deletions(-)

diff --git a/copyright-exclude b/copyright-exclude
index b7dd755b..89636c8f 100644
--- a/copyright-exclude
+++ b/copyright-exclude
@@ -1,14 +1,15 @@
-javax.servlet/copyright-exclude
-javax.servlet/src/main/javadoc/doc-files/changed_added_4_0.png
-javax.servlet/src/main/javadoc/doc-files/changed_added_4_0_cursor.cur
-javax.servlet/src/main/javadoc/doc-files/changed_deleted_4_0.png
-javax.servlet/src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur
-javax.servlet/src/main/javadoc/doc-files/changed_modified_4_0.png
-javax.servlet/src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur
-javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-blank.graffle
-javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-blank.png
-javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
-javax.servlet/src/main/javadoc/doc-files/expert-draft-bg-non-blank.png
-javax.servlet/src/main/javadoc/doc-files/expert-draft-bg.png
-javax.servlet/src/main/javadoc/doc-files/speclicense.html
-javax.servlet/src/main/javadoc/javax.servlet-api.css
+copyright-exclude
+LICENSE
+README.md
+src/main/javadoc/doc-files/changed_added_4_0.png
+src/main/javadoc/doc-files/changed_added_4_0_cursor.cur
+src/main/javadoc/doc-files/changed_deleted_4_0.png
+src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur
+src/main/javadoc/doc-files/changed_modified_4_0.png
+src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur
+src/main/javadoc/doc-files/expert-draft-bg-blank.graffle
+src/main/javadoc/doc-files/expert-draft-bg-blank.png
+src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
+src/main/javadoc/doc-files/expert-draft-bg-non-blank.png
+src/main/javadoc/doc-files/expert-draft-bg.png
+src/main/javadoc/doc-files/speclicense.html
\ No newline at end of file
diff --git a/exclude.xml b/exclude.xml
index 5bcaa0bf..fbc31476 100644
--- a/exclude.xml
+++ b/exclude.xml
@@ -9,12 +9,12 @@
     and Distribution License("CDDL") (collectively, the "License").  You
     may not use this file except in compliance with the License.  You can
     obtain a copy of the License at
-    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-    or packager/legal/LICENSE.txt.  See the License for the specific
+    https://oss.oracle.com/licenses/CDDL+GPL-1.1
+    or LICENSE.txt.  See the License for the specific
     language governing permissions and limitations under the License.
 
     When distributing the software, include this License Header Notice in each
-    file and include the License file at packager/legal/LICENSE.txt.
+    file and include the License file at LICENSE.txt.
 
     GPL Classpath Exception:
     Oracle designates this particular file as subject to the "Classpath"
diff --git a/pom.xml b/pom.xml
index 31630258..73c2b9d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,12 +10,12 @@
     and Distribution License("CDDL") (collectively, the "License").  You
     may not use this file except in compliance with the License.  You can
     obtain a copy of the License at
-    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-    or packager/legal/LICENSE.txt.  See the License for the specific
+    https://oss.oracle.com/licenses/CDDL+GPL-1.1
+    or LICENSE.txt.  See the License for the specific
     language governing permissions and limitations under the License.
 
     When distributing the software, include this License Header Notice in each
-    file and include the License file at packager/legal/LICENSE.txt.
+    file and include the License file at LICENSE.txt.
 
     GPL Classpath Exception:
     Oracle designates this particular file as subject to the "Classpath"
@@ -67,7 +67,7 @@
         3.0.4
         exclude.xml
         Low
-        1.33
+        1.41
         
     Java Servlet API
 
diff --git a/release.sh b/release.sh
index bdc6dc87..6229b248 100755
--- a/release.sh
+++ b/release.sh
@@ -9,12 +9,12 @@
 # and Distribution License("CDDL") (collectively, the "License").  You
 # may not use this file except in compliance with the License.  You can
 # obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
+# https://oss.oracle.com/licenses/CDDL+GPL-1.1
+# or LICENSE.txt.  See the License for the specific
 # language governing permissions and limitations under the License.
 #
 # When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
+# file and include the License file at LICENSE.txt.
 #
 # GPL Classpath Exception:
 # Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java
index 1361ca52..77756976 100644
--- a/src/main/java/javax/servlet/AsyncContext.java
+++ b/src/main/java/javax/servlet/AsyncContext.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/AsyncEvent.java b/src/main/java/javax/servlet/AsyncEvent.java
index e94b0922..d1739ec1 100644
--- a/src/main/java/javax/servlet/AsyncEvent.java
+++ b/src/main/java/javax/servlet/AsyncEvent.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/AsyncListener.java b/src/main/java/javax/servlet/AsyncListener.java
index 8c6293c5..ebe6cb36 100644
--- a/src/main/java/javax/servlet/AsyncListener.java
+++ b/src/main/java/javax/servlet/AsyncListener.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/DispatcherType.java b/src/main/java/javax/servlet/DispatcherType.java
index f67e8445..65d1b18f 100644
--- a/src/main/java/javax/servlet/DispatcherType.java
+++ b/src/main/java/javax/servlet/DispatcherType.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/FilterRegistration.java b/src/main/java/javax/servlet/FilterRegistration.java
index 6128df96..99c95b9c 100644
--- a/src/main/java/javax/servlet/FilterRegistration.java
+++ b/src/main/java/javax/servlet/FilterRegistration.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/GenericFilter.java b/src/main/java/javax/servlet/GenericFilter.java
index f8161261..02e1e0fd 100644
--- a/src/main/java/javax/servlet/GenericFilter.java
+++ b/src/main/java/javax/servlet/GenericFilter.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
@@ -36,7 +36,6 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
- *
  */
 
 package javax.servlet;
diff --git a/src/main/java/javax/servlet/HttpConstraintElement.java b/src/main/java/javax/servlet/HttpConstraintElement.java
index e8985ede..47763a44 100644
--- a/src/main/java/javax/servlet/HttpConstraintElement.java
+++ b/src/main/java/javax/servlet/HttpConstraintElement.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/HttpMethodConstraintElement.java b/src/main/java/javax/servlet/HttpMethodConstraintElement.java
index 36ddf6ff..17bd88be 100644
--- a/src/main/java/javax/servlet/HttpMethodConstraintElement.java
+++ b/src/main/java/javax/servlet/HttpMethodConstraintElement.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/MultipartConfigElement.java b/src/main/java/javax/servlet/MultipartConfigElement.java
index 96e71116..dd36f826 100644
--- a/src/main/java/javax/servlet/MultipartConfigElement.java
+++ b/src/main/java/javax/servlet/MultipartConfigElement.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/ReadListener.java b/src/main/java/javax/servlet/ReadListener.java
index bf60a774..82a5449f 100644
--- a/src/main/java/javax/servlet/ReadListener.java
+++ b/src/main/java/javax/servlet/ReadListener.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
@@ -38,7 +38,6 @@
  * holder.
  */
 
-
 package javax.servlet;
 
 import java.io.IOException;
diff --git a/src/main/java/javax/servlet/Registration.java b/src/main/java/javax/servlet/Registration.java
index 63ecdf3f..26df0911 100644
--- a/src/main/java/javax/servlet/Registration.java
+++ b/src/main/java/javax/servlet/Registration.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/ServletContainerInitializer.java b/src/main/java/javax/servlet/ServletContainerInitializer.java
index b07bf954..a7e873e4 100644
--- a/src/main/java/javax/servlet/ServletContainerInitializer.java
+++ b/src/main/java/javax/servlet/ServletContainerInitializer.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/ServletRegistration.java b/src/main/java/javax/servlet/ServletRegistration.java
index d78e2dce..26037e3e 100644
--- a/src/main/java/javax/servlet/ServletRegistration.java
+++ b/src/main/java/javax/servlet/ServletRegistration.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/ServletSecurityElement.java b/src/main/java/javax/servlet/ServletSecurityElement.java
index d3de38e9..13950ef4 100644
--- a/src/main/java/javax/servlet/ServletSecurityElement.java
+++ b/src/main/java/javax/servlet/ServletSecurityElement.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/SessionCookieConfig.java b/src/main/java/javax/servlet/SessionCookieConfig.java
index e0bded68..2dd82f3f 100644
--- a/src/main/java/javax/servlet/SessionCookieConfig.java
+++ b/src/main/java/javax/servlet/SessionCookieConfig.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/SessionTrackingMode.java b/src/main/java/javax/servlet/SessionTrackingMode.java
index b207a08b..9c3a855b 100644
--- a/src/main/java/javax/servlet/SessionTrackingMode.java
+++ b/src/main/java/javax/servlet/SessionTrackingMode.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/WriteListener.java b/src/main/java/javax/servlet/WriteListener.java
index d96d2e89..6d50ecfd 100644
--- a/src/main/java/javax/servlet/WriteListener.java
+++ b/src/main/java/javax/servlet/WriteListener.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
@@ -38,7 +38,6 @@
  * holder.
  */
 
-
 package javax.servlet;
 
 import java.io.IOException;
diff --git a/src/main/java/javax/servlet/annotation/HandlesTypes.java b/src/main/java/javax/servlet/annotation/HandlesTypes.java
index bc15c61d..2be3cdbf 100644
--- a/src/main/java/javax/servlet/annotation/HandlesTypes.java
+++ b/src/main/java/javax/servlet/annotation/HandlesTypes.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/HttpConstraint.java b/src/main/java/javax/servlet/annotation/HttpConstraint.java
index 124635c1..093090f4 100644
--- a/src/main/java/javax/servlet/annotation/HttpConstraint.java
+++ b/src/main/java/javax/servlet/annotation/HttpConstraint.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java b/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
index fb2d79d3..e2218353 100644
--- a/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
+++ b/src/main/java/javax/servlet/annotation/HttpMethodConstraint.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/MultipartConfig.java b/src/main/java/javax/servlet/annotation/MultipartConfig.java
index 97298984..c3287b57 100644
--- a/src/main/java/javax/servlet/annotation/MultipartConfig.java
+++ b/src/main/java/javax/servlet/annotation/MultipartConfig.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/ServletSecurity.java b/src/main/java/javax/servlet/annotation/ServletSecurity.java
index bd592fb2..bbdf529f 100644
--- a/src/main/java/javax/servlet/annotation/ServletSecurity.java
+++ b/src/main/java/javax/servlet/annotation/ServletSecurity.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/WebFilter.java b/src/main/java/javax/servlet/annotation/WebFilter.java
index eff06964..46c4d3e4 100644
--- a/src/main/java/javax/servlet/annotation/WebFilter.java
+++ b/src/main/java/javax/servlet/annotation/WebFilter.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/WebInitParam.java b/src/main/java/javax/servlet/annotation/WebInitParam.java
index 4c3152e8..50586a15 100644
--- a/src/main/java/javax/servlet/annotation/WebInitParam.java
+++ b/src/main/java/javax/servlet/annotation/WebInitParam.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/WebListener.java b/src/main/java/javax/servlet/annotation/WebListener.java
index bfc5ed37..49acb194 100644
--- a/src/main/java/javax/servlet/annotation/WebListener.java
+++ b/src/main/java/javax/servlet/annotation/WebListener.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/WebServlet.java b/src/main/java/javax/servlet/annotation/WebServlet.java
index 363d25a5..aa32498b 100644
--- a/src/main/java/javax/servlet/annotation/WebServlet.java
+++ b/src/main/java/javax/servlet/annotation/WebServlet.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/annotation/package.html b/src/main/java/javax/servlet/annotation/package.html
index 2e116f61..11b7bb24 100644
--- a/src/main/java/javax/servlet/annotation/package.html
+++ b/src/main/java/javax/servlet/annotation/package.html
@@ -9,12 +9,12 @@
     and Distribution License("CDDL") (collectively, the "License").  You
     may not use this file except in compliance with the License.  You can
     obtain a copy of the License at
-    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-    or packager/legal/LICENSE.txt.  See the License for the specific
+    https://oss.oracle.com/licenses/CDDL+GPL-1.1
+    or LICENSE.txt.  See the License for the specific
     language governing permissions and limitations under the License.
 
     When distributing the software, include this License Header Notice in each
-    file and include the License file at packager/legal/LICENSE.txt.
+    file and include the License file at LICENSE.txt.
 
     GPL Classpath Exception:
     Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
index e6b84910..ac8281c7 100644
--- a/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
+++ b/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java b/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
index 1cedfbdf..b088cfa1 100644
--- a/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
+++ b/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java b/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
index 9434841b..19ee5307 100644
--- a/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
+++ b/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/descriptor/package.html b/src/main/java/javax/servlet/descriptor/package.html
index 4ff08bcd..d25c8457 100644
--- a/src/main/java/javax/servlet/descriptor/package.html
+++ b/src/main/java/javax/servlet/descriptor/package.html
@@ -12,12 +12,12 @@
     and Distribution License("CDDL") (collectively, the "License").  You
     may not use this file except in compliance with the License.  You can
     obtain a copy of the License at
-    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-    or packager/legal/LICENSE.txt.  See the License for the specific
+    https://oss.oracle.com/licenses/CDDL+GPL-1.1
+    or LICENSE.txt.  See the License for the specific
     language governing permissions and limitations under the License.
 
     When distributing the software, include this License Header Notice in each
-    file and include the License file at packager/legal/LICENSE.txt.
+    file and include the License file at LICENSE.txt.
 
     GPL Classpath Exception:
     Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/http/HttpFilter.java b/src/main/java/javax/servlet/http/HttpFilter.java
index a5e5087d..5b3635d8 100644
--- a/src/main/java/javax/servlet/http/HttpFilter.java
+++ b/src/main/java/javax/servlet/http/HttpFilter.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
@@ -36,7 +36,6 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
- *
  */
 
 package javax.servlet.http;
diff --git a/src/main/java/javax/servlet/http/HttpSessionIdListener.java b/src/main/java/javax/servlet/http/HttpSessionIdListener.java
index 635aedd8..412ea467 100644
--- a/src/main/java/javax/servlet/http/HttpSessionIdListener.java
+++ b/src/main/java/javax/servlet/http/HttpSessionIdListener.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
@@ -36,7 +36,6 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
- *
  */
 
 package javax.servlet.http;
diff --git a/src/main/java/javax/servlet/http/HttpUpgradeHandler.java b/src/main/java/javax/servlet/http/HttpUpgradeHandler.java
index 6a52dbf8..23e96891 100644
--- a/src/main/java/javax/servlet/http/HttpUpgradeHandler.java
+++ b/src/main/java/javax/servlet/http/HttpUpgradeHandler.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/http/MappingMatch.java b/src/main/java/javax/servlet/http/MappingMatch.java
index 90bbe189..4077cc57 100644
--- a/src/main/java/javax/servlet/http/MappingMatch.java
+++ b/src/main/java/javax/servlet/http/MappingMatch.java
@@ -1,30 +1,30 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
+ *
  * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- * 
+ *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
- * 
+ *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- * 
+ * file and include the License file at LICENSE.txt.
+ *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
  * exception as provided by Oracle in the GPL Version 2 section of the License
  * file that accompanied this code.
- * 
+ *
  * Modifications:
  * If applicable, add the following below the License Header, with the fields
  * enclosed by brackets [] replaced by your own identifying information:
  * "Portions Copyright [year] [name of copyright owner]"
- * 
+ *
  * Contributor(s):
  * If you wish your version of this file to be governed by only the CDDL or
  * only the GPL Version 2, indicate your decision by adding "[Contributor]
@@ -36,7 +36,6 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
-
  */
 
 package javax.servlet.http;
diff --git a/src/main/java/javax/servlet/http/Part.java b/src/main/java/javax/servlet/http/Part.java
index 7ba1ebc9..6df50833 100644
--- a/src/main/java/javax/servlet/http/Part.java
+++ b/src/main/java/javax/servlet/http/Part.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/http/PushBuilder.java b/src/main/java/javax/servlet/http/PushBuilder.java
index 865c67b2..08c68cd2 100644
--- a/src/main/java/javax/servlet/http/PushBuilder.java
+++ b/src/main/java/javax/servlet/http/PushBuilder.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/java/javax/servlet/http/ServletMapping.java b/src/main/java/javax/servlet/http/ServletMapping.java
index dbe0dbfc..0474afad 100644
--- a/src/main/java/javax/servlet/http/ServletMapping.java
+++ b/src/main/java/javax/servlet/http/ServletMapping.java
@@ -1,30 +1,30 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
+ *
  * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- * 
+ *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
- * 
+ *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- * 
+ * file and include the License file at LICENSE.txt.
+ *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
  * exception as provided by Oracle in the GPL Version 2 section of the License
  * file that accompanied this code.
- * 
+ *
  * Modifications:
  * If applicable, add the following below the License Header, with the fields
  * enclosed by brackets [] replaced by your own identifying information:
  * "Portions Copyright [year] [name of copyright owner]"
- * 
+ *
  * Contributor(s):
  * If you wish your version of this file to be governed by only the CDDL or
  * only the GPL Version 2, indicate your decision by adding "[Contributor]
@@ -36,8 +36,8 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
-
  */
+
 package javax.servlet.http;
 
 /**
diff --git a/src/main/java/javax/servlet/http/WebConnection.java b/src/main/java/javax/servlet/http/WebConnection.java
index 59cd66ea..cf208d50 100644
--- a/src/main/java/javax/servlet/http/WebConnection.java
+++ b/src/main/java/javax/servlet/http/WebConnection.java
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"
diff --git a/src/main/javadoc/javax.servlet-api.css b/src/main/javadoc/javax.servlet-api.css
index 28bb607d..532eb485 100644
--- a/src/main/javadoc/javax.servlet-api.css
+++ b/src/main/javadoc/javax.servlet-api.css
@@ -8,12 +8,12 @@
  * and Distribution License("CDDL") (collectively, the "License").  You
  * may not use this file except in compliance with the License.  You can
  * obtain a copy of the License at
- * https://glassfish.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
+ * https://oss.oracle.com/licenses/CDDL+GPL-1.1
+ * or LICENSE.txt.  See the License for the specific
  * language governing permissions and limitations under the License.
  *
  * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
+ * file and include the License file at LICENSE.txt.
  *
  * GPL Classpath Exception:
  * Oracle designates this particular file as subject to the "Classpath"

From 0ec244bf7c8e1cfcc8cfd116394b76c59269af00 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 24 Apr 2017 17:28:01 -0700
Subject: [PATCH 113/160] update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8a734a34..7f9cf300 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Servlet API
-===========
+Java Servlet API
+================
 
 Building
 --------

From a446277e1a2765cb3953b8b611c42ad74033e02a Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 24 Apr 2017 18:51:20 -0700
Subject: [PATCH 114/160] remote non-existing files

---
 copyright-exclude | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/copyright-exclude b/copyright-exclude
index 89636c8f..9d02f736 100644
--- a/copyright-exclude
+++ b/copyright-exclude
@@ -1,15 +1,9 @@
 copyright-exclude
 LICENSE
 README.md
-src/main/javadoc/doc-files/changed_added_4_0.png
-src/main/javadoc/doc-files/changed_added_4_0_cursor.cur
-src/main/javadoc/doc-files/changed_deleted_4_0.png
-src/main/javadoc/doc-files/changed_deleted_4_0_cursor.cur
-src/main/javadoc/doc-files/changed_modified_4_0.png
-src/main/javadoc/doc-files/changed_modified_4_0_cursor.cur
 src/main/javadoc/doc-files/expert-draft-bg-blank.graffle
 src/main/javadoc/doc-files/expert-draft-bg-blank.png
 src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
 src/main/javadoc/doc-files/expert-draft-bg-non-blank.png
 src/main/javadoc/doc-files/expert-draft-bg.png
-src/main/javadoc/doc-files/speclicense.html
\ No newline at end of file
+src/main/javadoc/doc-files/speclicense.html

From bde7513a95ee587f83a4e361175ae2068c6a1d43 Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Tue, 25 Apr 2017 13:52:56 -0400
Subject: [PATCH 115/160] Whitespace only change to test commit capability

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f9cf300..51b51c92 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Prerequisites:
 * JDK8+
 * Maven 3.0.3+
 
-Run the build:
+Run the build: 
 
 `mvn install`
 

From 584d33cd845f2d0fc0d6d27e6f746ce0dd94672a Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 1 May 2017 11:03:19 -0700
Subject: [PATCH 116/160] rename #get/setTrailers to #get/setTrailerFields

---
 .gitignore                                             | 10 ++++++++++
 .../java/javax/servlet/http/HttpServletRequest.java    |  8 ++++----
 .../javax/servlet/http/HttpServletRequestWrapper.java  |  6 +++---
 .../java/javax/servlet/http/HttpServletResponse.java   |  2 +-
 .../javax/servlet/http/HttpServletResponseWrapper.java |  6 +++---
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index b83d2226..026d13be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,11 @@
+*.ipr
+*.iml
+*.iws
+*.swp
+*~
 /target/
+.idea
+nbactions.xml
+.classpath
+.project
+.settings/
diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 2ace993c..a8a27f7d 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -851,7 +851,7 @@ public  T  upgrade(Class handlerClass)
         throws IOException, ServletException;
 
     /**
-     * Get the request trailers.
+     * Get the request trailer fields.
      *
      * 
    The returned map is not backed by the {@code HttpServletRequest} object,
      * so changes in the returned map are not reflected in the
@@ -864,9 +864,9 @@ public  T  upgrade(Class handlerClass)
      * @implSpec
      * The default implementation returns empty Map.
      * 
-     * @return A map of trailers in which all the keys are in lowercase,
+     * @return A map of trailer fields in which all the keys are in lowercase,
      * regardless of the case they had at the protocol level, or the empty map
-     * if there are no trailers or the underlying transport does not support trailers.
+     * if there is no trailer or the underlying transport does not support trailer.
      *
      * @throws IllegalStateException if neither
      * {@link javax.servlet.ReadListener#onAllDataRead} has been called nor
@@ -875,7 +875,7 @@ public  T  upgrade(Class handlerClass)
      *
      * @since Servlet 4.0
      */
-    default public Map getTrailers() {
+    default public Map getTrailerFields() {
         return Collections.emptyMap();
     }
 }
diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
index 03bb9153..f12b12a2 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -426,13 +426,13 @@ public PushBuilder newPushBuilder() {
     }
 
     /**
-     * The default behavior of this method is to call getTrailers on the
+     * The default behavior of this method is to call getTrailerFields on the
      * wrapped request object.
      *
      * @since Servlet 4.0
      */
     @Override
-    public Map getTrailers() {
-        return this._getHttpServletRequest().getTrailers();
+    public Map getTrailerFields() {
+        return this._getHttpServletRequest().getTrailerFields();
     }
 }
diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index 18c578bb..673d960d 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -472,7 +472,7 @@ public interface HttpServletResponse extends ServletResponse {
      *
      * @since Servlet 4.0
      */
-    default public void setTrailers(Supplier> supplier) {
+    default public void setTrailerFields(Supplier> supplier) {
     }
 
 
diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
index e4430162..44d45bae 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -330,13 +330,13 @@ public Collection getHeaderNames() {
 
     /**
      * The default behaviour of this method is to call
-     * {@link HttpServletResponse#setTrailers} on the wrapped response
+     * {@link HttpServletResponse#setTrailerFields} on the wrapped response
      * object.
      *
      * @since Servlet 4.0
      */
     @Override
-    public void setTrailers(Supplier> supplier) {
-        _getHttpServletResponse().setTrailers(supplier);
+    public void setTrailerFields(Supplier> supplier) {
+        _getHttpServletResponse().setTrailerFields(supplier);
     }
 }

From 540ac996d0ec5b601186396db8739ff52d647891 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 9 May 2017 16:45:40 -0700
Subject: [PATCH 117/160] add more javadoc for #setTrailerFields

---
 .../java/javax/servlet/http/HttpServletResponse.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index 673d960d..3906b24a 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -458,12 +458,16 @@ public interface HttpServletResponse extends ServletResponse {
 
     /**
      * Set the supplier of trailer headers.
-     * The supplier will be called within the scope of whatever thread/call
+     *
+     * 
    The trailer header field value is defined as a comma-separated list
+     * (see Section 3.2.2 and Section 4.1.2 of RFC 7230).
    
+     *
+     * 
    The supplier will be called within the scope of whatever thread/call
      * causes the response content to be completed. Typically this will
-     * be any thread calling close() on the output stream or writer.
+     * be any thread calling close() on the output stream or writer.
    
      *
-     * The trailers that run afoul of the provisions of section 4.1.2 of
-     * RFC 7230 are ignored.
+     * 
    The trailers that run afoul of the provisions of section 4.1.2 of
+     * RFC 7230 are ignored.
    
      *
      * @implSpec
      * The default implementation is a no-op.

From b133e876fc4709edbcafedba22477f146af228eb Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 10 May 2017 18:03:33 -0700
Subject: [PATCH 118/160] add description for getTrailerFields  when
 content-length = 0

---
 src/main/java/javax/servlet/http/HttpServletRequest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index a8a27f7d..7c2f451a 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -857,7 +857,8 @@ public  T  upgrade(Class handlerClass)
      * so changes in the returned map are not reflected in the
      * {@code HttpServletRequest} object, and vice-versa.
    
      * 
-     * 
    This method should only be called after all the request content is read.
+     * 
    This method should only be called after the application has read all
+     * the request data or there is no content to read, i.e. zero content length. 
      * Calling this method before that point will cause the action described in the
      * throws clause below.
    
      *

From f1d0b3c50b33a4cd4e91ea6f68b950e1859f6e02 Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Thu, 18 May 2017 14:55:25 -0400
Subject: [PATCH 119/160] Issue #176: Rename ServletMapping to
 HttpServletMapping, including callsites. 	modified:  
 src/main/java/javax/servlet/AsyncContext.java 	modified:  
 src/main/java/javax/servlet/RequestDispatcher.java 	renamed:   
 src/main/java/javax/servlet/http/ServletMapping.java ->
 src/main/java/javax/servlet/http/HttpServletMapping.java 	modified:  
 src/main/java/javax/servlet/http/HttpServletRequest.java 	modified:  
 src/main/java/javax/servlet/http/HttpServletRequestWrapper.java

---
 src/main/java/javax/servlet/AsyncContext.java  |  2 +-
 .../java/javax/servlet/RequestDispatcher.java  |  4 ++--
 ...letMapping.java => HttpServletMapping.java} |  6 +++---
 .../javax/servlet/http/HttpServletRequest.java | 18 +++++++++---------
 .../http/HttpServletRequestWrapper.java        |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename src/main/java/javax/servlet/http/{ServletMapping.java => HttpServletMapping.java} (97%)

diff --git a/src/main/java/javax/servlet/AsyncContext.java b/src/main/java/javax/servlet/AsyncContext.java
index 77756976..68e29e60 100644
--- a/src/main/java/javax/servlet/AsyncContext.java
+++ b/src/main/java/javax/servlet/AsyncContext.java
@@ -84,7 +84,7 @@ public interface AsyncContext {
 
     /**
      * The name of the request attribute under which the original
-     * {@link javax.servlet.http.ServletMapping} is made available to the target of a
+     * {@link javax.servlet.http.HttpServletMapping} is made available to the target of a
      * {@link #dispatch(String)} or {@link #dispatch(ServletContext,String)} 
      */
     static final String ASYNC_MAPPING = "javax.servlet.async.mapping";
diff --git a/src/main/java/javax/servlet/RequestDispatcher.java b/src/main/java/javax/servlet/RequestDispatcher.java
index 8aa2ed74..a90088e2 100644
--- a/src/main/java/javax/servlet/RequestDispatcher.java
+++ b/src/main/java/javax/servlet/RequestDispatcher.java
@@ -97,7 +97,7 @@ public interface RequestDispatcher {
 
     /**
      * The name of the request attribute under which the original
-     * {@link javax.servlet.http.ServletMapping} is made available
+     * {@link javax.servlet.http.HttpServletMapping} is made available
      * to the target of a 
      * {@link #forward(ServletRequest,ServletResponse) forward}
      * 
@@ -149,7 +149,7 @@ public interface RequestDispatcher {
 
     /**
      * The name of the request attribute under which the
-     * {@link javax.servlet.http.ServletMapping}
+     * {@link javax.servlet.http.HttpServletMapping}
      * of the target of an {@link #include(ServletRequest,ServletResponse)
      * include} is stored
      */
diff --git a/src/main/java/javax/servlet/http/ServletMapping.java b/src/main/java/javax/servlet/http/HttpServletMapping.java
similarity index 97%
rename from src/main/java/javax/servlet/http/ServletMapping.java
rename to src/main/java/javax/servlet/http/HttpServletMapping.java
index 0474afad..2d7a8a1a 100644
--- a/src/main/java/javax/servlet/http/ServletMapping.java
+++ b/src/main/java/javax/servlet/http/HttpServletMapping.java
@@ -44,8 +44,8 @@
  * 
    Allows runtime discovery of the manner in which the {@link
  * HttpServlet} for the current {@link HttpServletRequest} was invoked.
  * Invoking any of the methods must not block the caller.  The
- * implementation must be thread safe.  Instances are immetable and are
- * returned from {@link HttpServletRequest#getServletMapping}.
    
+ * implementation must be thread safe.  Instances are immutable and are
+ * returned from {@link HttpServletRequest#getHttpServletMapping}.
    
  *
  * 
    Following are some illustrative examples for various combinations
  * of mappings.  Consider the following Servlet declaration:
    
@@ -111,7 +111,7 @@
  * 
  * @since 4.0
  */
-public interface ServletMapping {
+public interface HttpServletMapping {
 
 
     
diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 7c2f451a..8551acc2 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -253,46 +253,46 @@ public interface HttpServletRequest extends ServletRequest {
     public int getIntHeader(String name);
 
     /**
-     * 
    Return the {@link ServletMapping} by which the {@link
+     * 
    Return the {@link HttpServletMapping} by which the {@link
      * HttpServlet} for this {@code HttpServletRequest} was invoked.
      * The mappings for any applicable {@link javax.servlet.Filter}s are
      * not indicated in the result.  If the currently active {@link
      * javax.servlet.Servlet} invocation was obtained by a call to
      * {@link ServletRequest#getRequestDispatcher} followed by a call to
      * {@link RequestDispatcher#forward}, the returned {@code
-     * ServletMapping} is the one corresponding to the path used to
+     * HttpServletMapping} is the one corresponding to the path used to
      * obtain the {@link RequestDispatcher}.  If the currently active
      * {@code Servlet} invocation was obtained by a call to {@link
      * ServletRequest#getRequestDispatcher} followed by a call to {@link
-     * RequestDispatcher#include}, the returned {@code ServletMapping}
+     * RequestDispatcher#include}, the returned {@code HttpServletMapping}
      * is the one corresponding path that caused the first {@code
      * Servlet} in the invocation sequence to be invoked.  If the
      * currently active {@code Servlet} invocation was obtained by a
      * call to {@link javax.servlet.AsyncContext#dispatch}, the returned
-     * {@code ServletMapping} is the one corresponding path that caused
+     * {@code HttpServletMapping} is the one corresponding path that caused
      * the first {@code Servlet} in the invocation sequence to be
      * invoked.  See {@link
      * javax.servlet.RequestDispatcher#FORWARD_MAPPING}, {@link
      * javax.servlet.RequestDispatcher#INCLUDE_MAPPING} and {@link
      * javax.servlet.AsyncContext#ASYNC_MAPPING} for additional request
-     * attributes related to {@code ServletMapping}.
    
+     * attributes related to {@code HttpServletMapping}.
    
      * 
      * 
    The returned object is immutable.  Servlet 4.0 compliant
      * implementations must override this method.
    
      * 
      * @implSpec The default implementation returns a {@code
-     * ServletMapping} that returns the empty string for the match
+     * HttpServletMapping} that returns the empty string for the match
      * value, pattern and servlet name and {@code null} for the match
      * type.
      *
-     * @return An instance of {@code ServletMapping} describing the manner in which
+     * @return An instance of {@code HttpServletMapping} describing the manner in which
      * the current request was invoked.
      * 
      * @since 4.0
      */
     
-    default public ServletMapping getServletMapping() {
-        return new ServletMapping() {
+    default public HttpServletMapping getHttpServletMapping() {
+        return new HttpServletMapping() {
             @Override
             public String getMatchValue() {
                 return "";
diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
index f12b12a2..948bf928 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -160,8 +160,8 @@ public int getIntHeader(String name) {
      * return getServletMapping() on the wrapped request object.
    
      */
      @Override
-     public ServletMapping getServletMapping() {
-        return this._getHttpServletRequest().getServletMapping();
+     public HttpServletMapping getHttpServletMapping() {
+        return this._getHttpServletRequest().getHttpServletMapping();
     }
 
     /**

From e7282222751d46ae11c94dddec5501b88138d85b Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 19 May 2017 15:53:27 -0700
Subject: [PATCH 120/160] add new API #isTrailerFieldsAvailable

---
 .../servlet/http/HttpServletRequest.java      | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 8551acc2..af475d30 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -857,26 +857,46 @@ public  T  upgrade(Class handlerClass)
      * so changes in the returned map are not reflected in the
      * {@code HttpServletRequest} object, and vice-versa.
    
      * 
-     * 
    This method should only be called after the application has read all
-     * the request data or there is no content to read, i.e. zero content length. 
-     * Calling this method before that point will cause the action described in the
-     * throws clause below.
    
+     * 
    {@link #isTrailerFieldsAvailable()} should be called first to determine
+     * if it is safe to call this method without causing an exception.
    
      *
      * @implSpec
-     * The default implementation returns empty Map.
+     * The default implementation throws IllegalStateException.
      * 
      * @return A map of trailer fields in which all the keys are in lowercase,
-     * regardless of the case they had at the protocol level, or the empty map
-     * if there is no trailer or the underlying transport does not support trailer.
+     * regardless of the case they had at the protocol level. If there are no
+     * trailer fields, yet {@link #isTrailerFieldsAvailable} is returning true,
+     * the empty map is returned.
      *
-     * @throws IllegalStateException if neither
-     * {@link javax.servlet.ReadListener#onAllDataRead} has been called nor
-     * an EOF indication has been returned from the 
-     * {@link #getReader} or {@link #getInputStream}
+     * @throws IllegalStateException if {@link #isTrailerFieldsAvailable()} is false
      *
      * @since Servlet 4.0
      */
     default public Map getTrailerFields() {
-        return Collections.emptyMap();
+        throw new IllegalStateException();
+    }
+
+    /**
+     * Return a boolean indicating whether trailer fields are available.
+     *
+     * This method returns true if and only if both of the following conditions
+     * are satisfied:
+     * 
      
+     *   
    1.  the application has read all the request data and an EOF
+     *        indication has been returned from the {@link #getReader}
+     *        or {@link #getInputStream}
+     *   
    2.  all the trailer fields sent by the client have been received.
+     *        Note that it is possible that the client has sent no trailer fields.
+     * 
    
+     *
+     * @implSpec
+     * The default implementation returns false.
+     *
+     * @return a boolean whether trailer fields are available
+     *
+     * @since Servlet 4.0
+     */
+    default public boolean isTrailerFieldsAvailable() {
+        return false;
     }
 }

From 8737b94340271887046ecf8cccbc889228f1c343 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 22 May 2017 16:52:10 -0700
Subject: [PATCH 121/160] rename #isTrailerFieldsAvailable to
 #isTrailerFieldsReady and change javadoc

---
 .../javax/servlet/http/HttpServletRequest.java    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index af475d30..e0981084 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -868,7 +868,7 @@ public  T  upgrade(Class handlerClass)
      * trailer fields, yet {@link #isTrailerFieldsAvailable} is returning true,
      * the empty map is returned.
      *
-     * @throws IllegalStateException if {@link #isTrailerFieldsAvailable()} is false
+     * @throws IllegalStateException if {@link #isTrailerFieldsReady()} is false
      *
      * @since Servlet 4.0
      */
@@ -877,14 +877,17 @@ default public Map getTrailerFields() {
     }
 
     /**
-     * Return a boolean indicating whether trailer fields are available.
+     * Return a boolean indicating whether trailer fields are ready to read
+     * using {@link #getTrailerFields}.
      *
-     * This method returns true if and only if both of the following conditions
+     * This method returns true if and only if all of the following conditions
      * are satisfied:
      * 
      
+     *   
    1.  the underlying protocol supports trailer fields. HTTP versions
+     *        less than 1.1 do not support trailer fields.
      *   
    2.  the application has read all the request data and an EOF
      *        indication has been returned from the {@link #getReader}
-     *        or {@link #getInputStream}
+     *        or {@link #getInputStream}, or the content length is zero,
      *   
    3.  all the trailer fields sent by the client have been received.
      *        Note that it is possible that the client has sent no trailer fields.
      * 
    
@@ -892,11 +895,11 @@ default public Map getTrailerFields() {
      * @implSpec
      * The default implementation returns false.
      *
-     * @return a boolean whether trailer fields are available
+     * @return a boolean whether trailer fields are ready to read
      *
      * @since Servlet 4.0
      */
-    default public boolean isTrailerFieldsAvailable() {
+    default public boolean isTrailerFieldsReady() {
         return false;
     }
 }

From ec4358e953ba2732acdc0a78396c9effd8b10654 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 22 May 2017 16:56:47 -0700
Subject: [PATCH 122/160] fix javadoc

---
 src/main/java/javax/servlet/http/HttpServletRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index e0981084..d876a407 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -857,7 +857,7 @@ public  T  upgrade(Class handlerClass)
      * so changes in the returned map are not reflected in the
      * {@code HttpServletRequest} object, and vice-versa.
    
      * 
-     * 
    {@link #isTrailerFieldsAvailable()} should be called first to determine
+     * 
    {@link #isTrailerFieldsReady()} should be called first to determine
      * if it is safe to call this method without causing an exception.
    
      *
      * @implSpec
@@ -865,7 +865,7 @@ public  T  upgrade(Class handlerClass)
      * 
      * @return A map of trailer fields in which all the keys are in lowercase,
      * regardless of the case they had at the protocol level. If there are no
-     * trailer fields, yet {@link #isTrailerFieldsAvailable} is returning true,
+     * trailer fields, yet {@link #isTrailerFieldsReady} is returning true,
      * the empty map is returned.
      *
      * @throws IllegalStateException if {@link #isTrailerFieldsReady()} is false

From 5a9aefb5dd0cc75888ceda06930472688b16c74d Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 22 May 2017 17:03:51 -0700
Subject: [PATCH 123/160] fix javadoc

---
 src/main/java/javax/servlet/http/HttpServletRequest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index d876a407..207d81ca 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -887,7 +887,7 @@ default public Map getTrailerFields() {
      *        less than 1.1 do not support trailer fields.
      *   
  •  the application has read all the request data and an EOF
      *        indication has been returned from the {@link #getReader}
-     *        or {@link #getInputStream}, or the content length is zero,
+     *        or {@link #getInputStream}, or the content length is zero.
      *   
  •  all the trailer fields sent by the client have been received.
      *        Note that it is possible that the client has sent no trailer fields.
      * 

From cf9f69c65efa294d66972406d69e0dd8141a6fda Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 23 May 2017 10:10:23 -0700
Subject: [PATCH 124/160] update conditions for isTrailerFieldsReady() returns
 true

---
 .../javax/servlet/http/HttpServletRequest.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 207d81ca..315c998c 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -861,7 +861,7 @@ public  T  upgrade(Class handlerClass)
      * if it is safe to call this method without causing an exception.
    
      *
      * @implSpec
-     * The default implementation throws IllegalStateException.
+     * The default implementation returns an empty map.
      * 
      * @return A map of trailer fields in which all the keys are in lowercase,
      * regardless of the case they had at the protocol level. If there are no
@@ -873,21 +873,23 @@ public  T  upgrade(Class handlerClass)
      * @since Servlet 4.0
      */
     default public Map getTrailerFields() {
-        throw new IllegalStateException();
+        return Collections.emptyMap();
     }
 
     /**
      * Return a boolean indicating whether trailer fields are ready to read
      * using {@link #getTrailerFields}.
      *
-     * This method returns true if and only if all of the following conditions
+     * This methods returns true immediately if it is known that there is no
+     * trailer in the request, for instance, the underlying protocol (such
+     * as HTTP 1.0) does not supports the trailer fields, or the request is
+     * not in chunked encoding in HTTP 1.1.
+     * And the method also returns true if both of the following conditions
      * are satisfied:
      * 
      
-     *   
    1.  the underlying protocol supports trailer fields. HTTP versions
-     *        less than 1.1 do not support trailer fields.
      *   
    2.  the application has read all the request data and an EOF
      *        indication has been returned from the {@link #getReader}
-     *        or {@link #getInputStream}, or the content length is zero.
+     *        or {@link #getInputStream}.
      *   
    3.  all the trailer fields sent by the client have been received.
      *        Note that it is possible that the client has sent no trailer fields.
      * 
    
@@ -900,6 +902,6 @@ default public Map getTrailerFields() {
      * @since Servlet 4.0
      */
     default public boolean isTrailerFieldsReady() {
-        return false;
+        return true;
     }
 }

From 4ef32158b731cf324521d2960f54bbd0ebabe008 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 23 May 2017 10:16:04 -0700
Subject: [PATCH 125/160] update developer info

---
 pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73c2b9d5..b1635c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,8 @@
             
         
         
-            swchan2
+            shingwaichan
             Shing Wai Chan
-            http://weblogs.java.net/blog/swchan2
             Oracle
             
                 lead

From b0c66141386481c76cdba0717f5ecf6b79cc56d2 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:37:01 -0700
Subject: [PATCH 126/160] udpate maven-release-plugin configuration

---
 pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b1635c20..6bf2e87b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,7 @@
                       
                     
                 
-                 
+            
             
                 org.codehaus.mojo
                 findbugs-maven-plugin
@@ -303,11 +303,19 @@
             
                 org.apache.maven.plugins
                 maven-release-plugin
+                2.5.3
                 
                     forked-path
                     false
                     ${release.arguments}
                 
+                
+                    
+                        org.apache.maven.scm
+                        maven-scm-provider-gitexe
+                        1.8.1
+                    
+                
             
             
                 org.glassfish.copyright

From fc3e2c490cc41633c0da3251a3942df0ebd5314a Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:45:45 -0700
Subject: [PATCH 127/160] Update pom.xml to fix references to java.net

---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6bf2e87b..aee0b78d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     
     Java Servlet API
 
-    http://servlet-spec.java.net
+    https://javaee.github.io/servlet-spec/
 
     
         
@@ -109,7 +109,7 @@
 
     
         GlassFish Community
-        https://glassfish.java.net
+        https://javaee.github.io
     
     
         
@@ -120,19 +120,19 @@
         
     
     
-        jira
-        http://java.net/jira/browse/SERVLET_SPEC
+        github
+        https://github.com/javaee/servlet-spec/issues
     
     
         
             Servlet Developer
-            users@servlet-spec.java.net
+            servlet-spec@javaee.groups.io
         
     
     
-        scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet
-        scm:svn:https://svn.java.net/svn/glassfish~svn/trunk/api/javaee-api/javax.servlet
-        http://java.net/projects/glassfish/sources/svn/show/trunk/api/javaee-api/javax.servlet
+        scm:git:https://github.com/javaee/servlet-spec.git
+        scm:git:git@github.com:javaee/servlet-spec.git
+        https://github.com/javaee/servlet-spec
     
 
     

From 621a7e536328ae49cbea5920b51486f7ce4bae81 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:46:09 -0700
Subject: [PATCH 128/160] [maven-release-plugin] prepare release
 javax.servlet-api-4.0.0-b06

---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index aee0b78d..53dee057 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b06-SNAPSHOT
+    4.0.0-b06
 
     
         4.0
@@ -133,7 +133,8 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-    
+      javax.servlet-api-4.0.0-b06
+  
 
     
         

From d0b83f7da7a76717602d4364acd25d57f3b6feb6 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:46:18 -0700
Subject: [PATCH 129/160] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53dee057..de7b6fcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b06
+    4.0.0-b07-SNAPSHOT
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      javax.servlet-api-4.0.0-b06
+      HEAD
   
 
     

From 8e0231f71fffeb949333abf3ce4490a8a8c1e4c7 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:50:38 -0700
Subject: [PATCH 130/160] attempt at producing better release tags names

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index de7b6fcf..345884ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -308,6 +308,7 @@
                 
                     forked-path
                     false
+                    @{project.version}
                     ${release.arguments}
                 
                 

From e232d0c9208412292516d6a351b3a7367e5ca71d Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:51:22 -0700
Subject: [PATCH 131/160] [maven-release-plugin] prepare release 4.0.0-b07

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 345884ca..405642af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b07-SNAPSHOT
+    4.0.0-b07
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      HEAD
+      4.0.0-b07
   
 
     

From cf9fd233fd824d264776731db07b0f0b063af178 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 14:51:32 -0700
Subject: [PATCH 132/160] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 405642af..17d1051e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b07
+    4.0.0-b08-SNAPSHOT
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      4.0.0-b07
+      HEAD
   
 
     

From 6eed0a28398088181f4b919f6a1fd54d1503def3 Mon Sep 17 00:00:00 2001
From: Romain Grecourt 
Date: Tue, 23 May 2017 15:05:00 -0700
Subject: [PATCH 133/160] revert version back to 4.0.0-b06

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 17d1051e..a8fd6b22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b08-SNAPSHOT
+    4.0.0-b06-SNAPSHOT
 
     
         4.0

From 443e4511ad2328e36ac8c6f1fc7e0a62e897ce93 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 23 May 2017 15:12:40 -0700
Subject: [PATCH 134/160] [maven-release-plugin] prepare release 4.0.0-b06

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8fd6b22..ad3cdf4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b06-SNAPSHOT
+    4.0.0-b06
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      HEAD
+      4.0.0-b06
   
 
     

From c2e32e85387b2019dc5b8de8aa04da7f1f83c0e6 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 23 May 2017 15:12:49 -0700
Subject: [PATCH 135/160] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad3cdf4b..345884ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b06
+    4.0.0-b07-SNAPSHOT
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      4.0.0-b06
+      HEAD
   
 
     

From b2b70918acddf923e436313c926168f860602b43 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 23 May 2017 15:20:17 -0700
Subject: [PATCH 136/160] rollback to b06 in pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 345884ca..a8fd6b22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b07-SNAPSHOT
+    4.0.0-b06-SNAPSHOT
 
     
         4.0

From 0f632a0620d7ba090b2d562e11fee505f87d1c0d Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 24 May 2017 08:48:55 -0700
Subject: [PATCH 137/160] add #isTrailerFieldsReady()

---
 .../javax/servlet/http/HttpServletRequestWrapper.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
index 948bf928..dea2cf52 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -435,4 +435,15 @@ public PushBuilder newPushBuilder() {
     public Map getTrailerFields() {
         return this._getHttpServletRequest().getTrailerFields();
     }
+
+    /**
+     * The default behavior of this method is to call isTrailerFieldsReady on the
+     * wrapped request object.
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public boolean isTrailerFieldsReady() {
+        return this._getHttpServletRequest().isTrailerFieldsReady();
+    }
 }

From efca23b6376d4b6dcec73d731d6a48f40ccaba7d Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 24 May 2017 09:00:10 -0700
Subject: [PATCH 138/160] [maven-release-plugin] prepare release 4.0.0-b06

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8fd6b22..ad3cdf4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b06-SNAPSHOT
+    4.0.0-b06
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      HEAD
+      4.0.0-b06
   
 
     

From 9c60a8db6ece8cc966fc8f3ac2a1fefbb78cfe8b Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Wed, 24 May 2017 09:00:25 -0700
Subject: [PATCH 139/160] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad3cdf4b..345884ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b06
+    4.0.0-b07-SNAPSHOT
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      4.0.0-b06
+      HEAD
   
 
     

From 76de60a8180ae0b8f42c73a7c93d09ff35b3348a Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 26 May 2017 12:04:33 -0700
Subject: [PATCH 140/160] add ISE javadoc for setTrailerFields

---
 src/main/java/javax/servlet/http/HttpServletResponse.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index 3906b24a..91a1ebde 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -474,6 +474,12 @@ public interface HttpServletResponse extends ServletResponse {
      *
      * @param supplier the supplier of trailer headers
      *
+     * @exception IllegalStateException if it is invoked after the response has
+     *         has been committed,
+     *         or the trailer is not supported in the request, for instance,
+     *         the underlying protocol is HTTP 1.0, or the response is not
+     *         in chunked encoding in HTTP 1.1.
+     *
      * @since Servlet 4.0
      */
     default public void setTrailerFields(Supplier> supplier) {

From 3f352c6ece6ec74d485559f685be2e5598412a93 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 30 May 2017 10:11:15 -0700
Subject: [PATCH 141/160] add #getTrailerFields to return supplier of trailer
 headers

---
 .../javax/servlet/http/HttpServletResponse.java  | 16 +++++++++++++++-
 .../servlet/http/HttpServletResponseWrapper.java | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index 91a1ebde..67560a32 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -457,7 +457,7 @@ public interface HttpServletResponse extends ServletResponse {
     public Collection getHeaderNames();
 
     /**
-     * Set the supplier of trailer headers.
+     * Sets the supplier of trailer headers.
      *
      * 
    The trailer header field value is defined as a comma-separated list
      * (see Section 3.2.2 and Section 4.1.2 of RFC 7230).
    
@@ -485,6 +485,20 @@ public interface HttpServletResponse extends ServletResponse {
     default public void setTrailerFields(Supplier> supplier) {
     }
 
+    /**
+     * Gets the supplier of trailer headers.
+     *
+     * @implSpec
+     * The default implememtation return null.
+     *
+     * @return Supplier of trailer headers
+     * 
+     * @since Servlet 4.0
+     */
+    default public Supplier> getTrailerFields() {
+        return null;
+    }
+
 
     /*
      * Server status codes; see RFC 2068.
diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
index 44d45bae..f381a0de 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -333,10 +333,26 @@ public Collection getHeaderNames() {
      * {@link HttpServletResponse#setTrailerFields} on the wrapped response
      * object.
      *
+     * @param supplier of trailer headers
+     *
      * @since Servlet 4.0
      */
     @Override
     public void setTrailerFields(Supplier> supplier) {
         _getHttpServletResponse().setTrailerFields(supplier);
     }
+
+    /**
+     * The default behaviour of this method is to call
+     * {@link HttpServletResponse#getTrailerFields} on the wrapped response
+     * object.
+     *
+     * @return supplier of trailer headers
+     *
+     * @since Servlet 4.0
+     */
+    @Override
+    public Supplier> getTrailerFields() {
+        return _getHttpServletResponse().getTrailerFields();
+    }
 }

From 59937323f9202d5f7230df08d085b8c2708c20d9 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 2 Jun 2017 11:18:24 -0700
Subject: [PATCH 142/160] [maven-release-plugin] prepare release 4.0.0-b07

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 345884ca..405642af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b07-SNAPSHOT
+    4.0.0-b07
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      HEAD
+      4.0.0-b07
   
 
     

From 2ead4eff4b4d51a5200d00f78d9ba776ed844877 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 2 Jun 2017 11:18:34 -0700
Subject: [PATCH 143/160] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 405642af..17d1051e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b07
+    4.0.0-b08-SNAPSHOT
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      4.0.0-b07
+      HEAD
   
 
     

From 892ed32848d760f245c6b6d93482c9a21d35c49e Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Mon, 5 Jun 2017 17:13:12 -0700
Subject: [PATCH 144/160] run copyright check by default

---
 README.md |  6 +-----
 pom.xml   | 10 ++++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 51b51c92..4c885534 100644
--- a/README.md
+++ b/README.md
@@ -13,14 +13,10 @@ Run the build:
 
 `mvn install`
 
-The build generates the jar, sources-jar and javadoc-jar by default.
+The build runs copyright check and generates the jar, sources-jar and javadoc-jar by default.
 
 Checking findbugs
 -----------------
 
 `mvn -DskipTests-true -Dfindbugs.threshold=Low findbugs:findbugs`
 
-Checking copyright
-------------------
-
-`mvn -q org.glassfish.copyright:glassfish-copyright-maven-plugin:copyright`
diff --git a/pom.xml b/pom.xml
index 17d1051e..6d39124a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,6 +330,16 @@
                         ${basedir}/copyright-exclude
                     
                 
+                
+                    
+                        check-copyright
+                        process-test-sources
+                        
+                            copyright
+                            check
+                        
+                    
+                
                 
         
         

From eee68d074031a9d6d9f081eb371c0fe0b63ba67e Mon Sep 17 00:00:00 2001
From: glassfishrobot 
Date: Wed, 14 Jun 2017 15:56:48 +0530
Subject: [PATCH 145/160] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..76309137
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,30 @@
+---
+
+---
+
+# Source Code Submissions 
+We welcome your contributions and look forward to collaborating with you. We can only accept source code repository 
+submissions from users who have signed and returned the Oracle 
+Contributor Agreement. You will find details and the agreement to sign at this OTN web page: 
+[Oracle Contributor Agreement](http://www.oracle.com/technetwork/community/oca-486395.html). 
+
+# Other Contributions
+For all project Submissions other than source code repository contributions, the following also applies: Oracle does 
+not claim ownership of Your Submissions. However, in order to fulfill 
+the purposes of this project, You must give Oracle and all Users 
+the right to post, access, discuss, use, publish, disseminate, and refine 
+Your Submissions. 
+
+In legalese: *You hereby grant to Oracle and all 
+Users a royalty-free, perpetual, irrevocable, worldwide, non-exclusive, 
+and fully sub-licensable right and license, under Your intellectual 
+property rights, to reproduce, modify, adapt, publish, translate, create 
+derivative works from, distribute, perform, display, and use Your 
+Submissions (in whole or part) and to incorporate or implement them in 
+other works in any form, media, or technology now known or later 
+developed, all subject to the obligation to retain any copyright notices 
+included in Your Submissions. All Users, Oracle, and their 
+sublicensees are responsible for any modifications they make to the 
+Submissions of others.*
+
+Copyright © 2017 Oracle and/or its affiliates. All rights reserved.

From c0aa2801f498d05b1ae6d9b3cb3347f77a335fe7 Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Thu, 15 Jun 2017 23:23:00 -0400
Subject: [PATCH 146/160] #73 Address what to do about the case of
 getNamedDispatcher() 	modified:   copyright-exclude 	modified:  
 src/main/java/javax/servlet/http/HttpServletRequest.java

---
 copyright-exclude                                        | 1 +
 src/main/java/javax/servlet/http/HttpServletRequest.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/copyright-exclude b/copyright-exclude
index 9d02f736..bcbbba62 100644
--- a/copyright-exclude
+++ b/copyright-exclude
@@ -1,6 +1,7 @@
 copyright-exclude
 LICENSE
 README.md
+CONTRIBUTING.md
 src/main/javadoc/doc-files/expert-draft-bg-blank.graffle
 src/main/javadoc/doc-files/expert-draft-bg-blank.png
 src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 315c998c..eaa32808 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -276,6 +276,10 @@ public interface HttpServletRequest extends ServletRequest {
      * javax.servlet.RequestDispatcher#INCLUDE_MAPPING} and {@link
      * javax.servlet.AsyncContext#ASYNC_MAPPING} for additional request
      * attributes related to {@code HttpServletMapping}.
    
+     *
+     * 
    If the {@code Servlet} corresponding to this request was
+     * obtained using {@link javax.servlet.ServletContext#getNamedDispatcher}, this
+     * method must return {@code null}.
    
      * 
      * 
    The returned object is immutable.  Servlet 4.0 compliant
      * implementations must override this method.
    

From d34aea2236fbd52da21abbaff862082b32991998 Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Mon, 26 Jun 2017 14:30:39 -0400
Subject: [PATCH 147/160] #177 #73 Text approved by Greg Wilkins

---
 src/main/java/javax/servlet/http/HttpServletRequest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index eaa32808..6647631d 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -278,8 +278,10 @@ public interface HttpServletRequest extends ServletRequest {
      * attributes related to {@code HttpServletMapping}.
    
      *
      * 
    If the {@code Servlet} corresponding to this request was
-     * obtained using {@link javax.servlet.ServletContext#getNamedDispatcher}, this
-     * method must return {@code null}.
    
+     * obtained using {@link
+     * javax.servlet.ServletContext#getNamedDispatcher}, the returned
+     * {@code HttpServletMapping} instance must have properties that
+     * reflect the mapping last applied to this request.
    
      * 
      * 
    The returned object is immutable.  Servlet 4.0 compliant
      * implementations must override this method.
    

From 12f2f52513fe3d1388e407f9fe52294a718f2c1b Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Mon, 3 Jul 2017 13:49:21 -0400
Subject: [PATCH 148/160] #177 #73

---
 .../servlet/http/HttpServletMapping.java      | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletMapping.java b/src/main/java/javax/servlet/http/HttpServletMapping.java
index 2d7a8a1a..f9a7fa9c 100644
--- a/src/main/java/javax/servlet/http/HttpServletMapping.java
+++ b/src/main/java/javax/servlet/http/HttpServletMapping.java
@@ -117,15 +117,14 @@ public interface HttpServletMapping {
     
     /**
      * 
    Return the portion of the URI path that caused this request to
-     * be matched or the empty String if not known or not knowable.  If
-     * the {@link getMappingMatch} value is {@code CONTEXT_ROOT} or
-     * {@code DEFAULT}, this method must return the empty string.  If
-     * the {@link getMappingMatch} value is {@code EXACT}, this method
-     * must return the portion of the path that matched the servlet,
-     * omitting any leading slash.  If the {@link getMappingMatch} value
-     * is {@code EXTENSION} or {@code PATH}, this method must return the
-     * value that matched the '*'.  See the class javadoc for
-     * examples. 
    
+     * be matched.  If the {@link getMappingMatch} value is {@code
+     * CONTEXT_ROOT} or {@code DEFAULT}, this method must return the
+     * empty string.  If the {@link getMappingMatch} value is {@code
+     * EXACT}, this method must return the portion of the path that
+     * matched the servlet, omitting any leading slash.  If the {@link
+     * getMappingMatch} value is {@code EXTENSION} or {@code PATH}, this
+     * method must return the value that matched the '*'.  See the class
+     * javadoc for examples. 
    
      * 
      * @return the match.
      * 
@@ -135,8 +134,7 @@ public interface HttpServletMapping {
 
     /**
      * 
    Return the String representation for the {@code url-pattern}
-     * for this mapping or the empty String if not known or not
-     * knowable.  If the {@link getMappingMatch} value is {@code
+     * for this mapping.  If the {@link getMappingMatch} value is {@code
      * CONTEXT_ROOT} or {@code DEFAULT}, this method must return the
      * empty string. If the {@link getMappingMatch} value is {@code
      * EXTENSION}, this method must return the pattern, without any
@@ -144,21 +142,19 @@ public interface HttpServletMapping {
      * exactly as specified in the descriptor or Java configuration.
    
      * 
      * @return the String representation for the
-     * {@code url-pattern} for this mapping or the empty String if not known
-     * or not knowable. 
+     * {@code url-pattern} for this mapping. 
      * 
      * @since 4.0
      */
     public String getPattern();
     
     /**
-     * 
    Return the String representation for the
-     * {@code servlet-name} for this mapping or the empty String if not known
-     * or not knowable.
    
+     * 
    Return the String representation for the {@code servlet-name}
+     * for this mapping.  In the case of a {@code DEFAULT MappingMatch},
+     * the return from this method is unspecified.
    
      * 
-     * @return the String representation for the
-     * {@code servlet-name} for this mapping or the empty String if not known
-     * or not knowable. 
+     * @return the String representation for the {@code servlet-name}
+     * for this mapping.
      * 
      * @since 4.0
      */

From 0aaa3ae043648fc2189c84e60aa706f77f2d9d11 Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Thu, 6 Jul 2017 16:30:34 -0400
Subject: [PATCH 149/160] After discussion with Shing-wai, arrive at wording
 for getServletName()

---
 src/main/java/javax/servlet/http/HttpServletMapping.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletMapping.java b/src/main/java/javax/servlet/http/HttpServletMapping.java
index f9a7fa9c..3e057e23 100644
--- a/src/main/java/javax/servlet/http/HttpServletMapping.java
+++ b/src/main/java/javax/servlet/http/HttpServletMapping.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -150,8 +150,9 @@ public interface HttpServletMapping {
     
     /**
      * 
    Return the String representation for the {@code servlet-name}
-     * for this mapping.  In the case of a {@code DEFAULT MappingMatch},
-     * the return from this method is unspecified.
    
+     * for this mapping.  If the Servlet providing the response is the
+     * default servlet, the return from this method is the name of the
+     * defautl servlet, which is container specific.
    
      * 
      * @return the String representation for the {@code servlet-name}
      * for this mapping.

From e6e1d2717acfccdfdc849e1930fa9457054208d5 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 14 Jul 2017 10:11:30 -0700
Subject: [PATCH 150/160] Clarify the user responsiblity of 'Trailer' header

---
 src/main/java/javax/servlet/http/HttpServletResponse.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index 67560a32..bd3d262e 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -469,6 +469,12 @@ public interface HttpServletResponse extends ServletResponse {
      * 
    The trailers that run afoul of the provisions of section 4.1.2 of
      * RFC 7230 are ignored.
    
      *
+     * 
    The RFC requires the name of every key that is to be in the
+     * supplied Map is included in the comma separated list that is the value
+     * of the "Trailer" response header.  The application is responsible for
+     * ensuring this requirement is met.  Failure to do so may lead to
+     * interoperability failures.
    
+     *
      * @implSpec
      * The default implementation is a no-op.
      *

From 8c36bee945b8b2f713be32ef5d5856c03d26d755 Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Wed, 19 Jul 2017 10:59:19 -0400
Subject: [PATCH 151/160] Fix typo.  Insert preposition "to" after
 "corresponding" as necessary.

modified:   src/main/java/javax/servlet/http/HttpServletRequest.java
---
 src/main/java/javax/servlet/http/HttpServletRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index 6647631d..d2f21dab 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -265,11 +265,11 @@ public interface HttpServletRequest extends ServletRequest {
      * {@code Servlet} invocation was obtained by a call to {@link
      * ServletRequest#getRequestDispatcher} followed by a call to {@link
      * RequestDispatcher#include}, the returned {@code HttpServletMapping}
-     * is the one corresponding path that caused the first {@code
+     * is the one corresponding to the path that caused the first {@code
      * Servlet} in the invocation sequence to be invoked.  If the
      * currently active {@code Servlet} invocation was obtained by a
      * call to {@link javax.servlet.AsyncContext#dispatch}, the returned
-     * {@code HttpServletMapping} is the one corresponding path that caused
+     * {@code HttpServletMapping} is the one corresponding to the path that caused
      * the first {@code Servlet} in the invocation sequence to be
      * invoked.  See {@link
      * javax.servlet.RequestDispatcher#FORWARD_MAPPING}, {@link

From 8ecb128589a8f2432cbe98448aaa6dfa7796c20d Mon Sep 17 00:00:00 2001
From: Ed Burns 
Date: Wed, 19 Jul 2017 18:31:42 -0400
Subject: [PATCH 152/160] Remove watermark, and add preposition where needed
 modified:   src/main/java/javax/servlet/http/HttpServletRequest.java

- Include "to" after "corresponding" as needed.

modified:   src/main/javadoc/javax.servlet-api.css

- Remove watermark.
---
 .gitignore                                    |  1 +
 .../servlet/http/HttpServletRequest.java      | 27 +++++++++----------
 src/main/javadoc/javax.servlet-api.css        |  3 ++-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 026d13be..5dcac45f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ nbactions.xml
 .classpath
 .project
 .settings/
+downloads/
diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index d2f21dab..ad0d3937 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -264,24 +264,23 @@ public interface HttpServletRequest extends ServletRequest {
      * obtain the {@link RequestDispatcher}.  If the currently active
      * {@code Servlet} invocation was obtained by a call to {@link
      * ServletRequest#getRequestDispatcher} followed by a call to {@link
-     * RequestDispatcher#include}, the returned {@code HttpServletMapping}
-     * is the one corresponding to the path that caused the first {@code
-     * Servlet} in the invocation sequence to be invoked.  If the
-     * currently active {@code Servlet} invocation was obtained by a
-     * call to {@link javax.servlet.AsyncContext#dispatch}, the returned
-     * {@code HttpServletMapping} is the one corresponding to the path that caused
-     * the first {@code Servlet} in the invocation sequence to be
+     * RequestDispatcher#include}, the returned {@code
+     * HttpServletMapping} is the one corresponding to the path that
+     * caused the first {@code Servlet} in the invocation sequence to be
+     * invoked.  If the currently active {@code Servlet} invocation was
+     * obtained by a call to {@link
+     * javax.servlet.AsyncContext#dispatch}, the returned {@code
+     * HttpServletMapping} is the one corresponding to the path that
+     * caused the first {@code Servlet} in the invocation sequence to be
      * invoked.  See {@link
      * javax.servlet.RequestDispatcher#FORWARD_MAPPING}, {@link
      * javax.servlet.RequestDispatcher#INCLUDE_MAPPING} and {@link
      * javax.servlet.AsyncContext#ASYNC_MAPPING} for additional request
-     * attributes related to {@code HttpServletMapping}.
    
-     *
-     * 
    If the {@code Servlet} corresponding to this request was
-     * obtained using {@link
-     * javax.servlet.ServletContext#getNamedDispatcher}, the returned
-     * {@code HttpServletMapping} instance must have properties that
-     * reflect the mapping last applied to this request.
    
+     * attributes related to {@code HttpServletMapping}. If the
+     * currently active {@code Servlet} invocation was obtained by a
+     * call to {@link javax.servlet.ServletContext#getNamedDispatcher},
+     * the returned {@code HttpServletMapping} is the one corresponding
+     * to the path for the mapping last applied to this request.
    
      * 
      * 
    The returned object is immutable.  Servlet 4.0 compliant
      * implementations must override this method.
    
diff --git a/src/main/javadoc/javax.servlet-api.css b/src/main/javadoc/javax.servlet-api.css
index 532eb485..4062a9fc 100644
--- a/src/main/javadoc/javax.servlet-api.css
+++ b/src/main/javadoc/javax.servlet-api.css
@@ -45,9 +45,10 @@ Overall document style
 
 @import url('resources/fonts/dejavu.css');
 
+/*    background: url(doc-files/expert-draft-bg.png); */
+
 body {
     background-color:#ffffff;
-    background: url(doc-files/expert-draft-bg.png); 
     color:#353833;
     font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
     font-size:14px;

From 779f3245062a4e1f04a428550612641383c30418 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Fri, 28 Jul 2017 15:57:37 -0700
Subject: [PATCH 153/160] fix typo in skip test

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c885534..5cd7451d 100644
--- a/README.md
+++ b/README.md
@@ -18,5 +18,5 @@ The build runs copyright check and generates the jar, sources-jar and javadoc-ja
 Checking findbugs
 -----------------
 
-`mvn -DskipTests-true -Dfindbugs.threshold=Low findbugs:findbugs`
+`mvn -DskipTests -Dfindbugs.threshold=Low findbugs:findbugs`
 

From 10f86f36c02e6fec8cf55c180ba967959fe25703 Mon Sep 17 00:00:00 2001
From: Edward Burns 
Date: Wed, 2 Aug 2017 15:57:01 -0700
Subject: [PATCH 154/160] Update Bundle-License MANIFEST.MF property

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6d39124a..2ff7733f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
     
         
             CDDL + GPLv2 with classpath exception
-            https://glassfish.java.net/nonav/public/CDDL+GPL.html
+            https://oss.oracle.com/licenses/CDDL+GPL-1.1
             repo
             A business-friendly OSS license
         

From 62e5c3981993ac5683111a02e3197006a5d6efa6 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 15 Aug 2017 10:57:39 -0700
Subject: [PATCH 155/160] update the version to 4.0.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ff7733f..abc3ed72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-b08-SNAPSHOT
+    4.0.0-SNAPSHOT
 
     
         4.0

From ef2740a68cefc1abd70860d26a6eb450bde8dd16 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 15 Aug 2017 10:58:47 -0700
Subject: [PATCH 156/160] [maven-release-plugin] prepare release 4.0.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index abc3ed72..60e7d000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0-SNAPSHOT
+    4.0.0
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      HEAD
+      4.0.0
   
 
     

From 9a27193187705844371446cc15c3bfdcc96eee61 Mon Sep 17 00:00:00 2001
From: Shing Wai Chan 
Date: Tue, 15 Aug 2017 10:58:56 -0700
Subject: [PATCH 157/160] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60e7d000..fabc8102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.0
+    4.0.1-SNAPSHOT
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      4.0.0
+      HEAD
   
 
     

From 7265df0dca6923b5d925ec1f85850e2f58f65b9b Mon Sep 17 00:00:00 2001
From: Sumasri Uppala 
Date: Wed, 7 Mar 2018 09:29:06 +0530
Subject: [PATCH 158/160] Copyright changes. (#192)

---
 src/main/java/javax/servlet/Filter.java       | 43 +-----------------
 src/main/java/javax/servlet/FilterChain.java  | 43 +-----------------
 src/main/java/javax/servlet/FilterConfig.java | 43 +-----------------
 .../java/javax/servlet/GenericServlet.java    | 43 +-----------------
 .../javax/servlet/LocalStrings.properties     | 43 +-----------------
 .../javax/servlet/LocalStrings_fr.properties  | 43 +-----------------
 .../javax/servlet/LocalStrings_ja.properties  | 43 +-----------------
 .../java/javax/servlet/RequestDispatcher.java | 43 +-----------------
 src/main/java/javax/servlet/Servlet.java      | 43 +-----------------
 .../java/javax/servlet/ServletConfig.java     | 43 +-----------------
 .../java/javax/servlet/ServletContext.java    | 43 +-----------------
 .../servlet/ServletContextAttributeEvent.java | 43 +-----------------
 .../ServletContextAttributeListener.java      | 43 +-----------------
 .../javax/servlet/ServletContextEvent.java    | 43 +-----------------
 .../javax/servlet/ServletContextListener.java | 43 +-----------------
 .../java/javax/servlet/ServletException.java  | 43 +-----------------
 .../javax/servlet/ServletInputStream.java     | 43 +-----------------
 .../javax/servlet/ServletOutputStream.java    | 43 +-----------------
 .../java/javax/servlet/ServletRequest.java    | 43 +-----------------
 .../servlet/ServletRequestAttributeEvent.java | 43 +-----------------
 .../ServletRequestAttributeListener.java      | 43 +-----------------
 .../javax/servlet/ServletRequestEvent.java    | 44 +------------------
 .../javax/servlet/ServletRequestListener.java | 43 +-----------------
 .../javax/servlet/ServletRequestWrapper.java  | 43 +-----------------
 .../java/javax/servlet/ServletResponse.java   | 43 +-----------------
 .../javax/servlet/ServletResponseWrapper.java | 43 +-----------------
 .../java/javax/servlet/SingleThreadModel.java | 43 +-----------------
 .../javax/servlet/UnavailableException.java   | 43 +-----------------
 src/main/java/javax/servlet/http/Cookie.java  | 43 +-----------------
 .../java/javax/servlet/http/HttpServlet.java  | 43 +-----------------
 .../servlet/http/HttpServletRequest.java      | 43 +-----------------
 .../http/HttpServletRequestWrapper.java       | 43 +-----------------
 .../servlet/http/HttpServletResponse.java     | 43 +-----------------
 .../http/HttpServletResponseWrapper.java      | 43 +-----------------
 .../java/javax/servlet/http/HttpSession.java  | 43 +-----------------
 .../http/HttpSessionActivationListener.java   | 43 +-----------------
 .../http/HttpSessionAttributeListener.java    | 43 +-----------------
 .../servlet/http/HttpSessionBindingEvent.java | 43 +-----------------
 .../http/HttpSessionBindingListener.java      | 43 +-----------------
 .../servlet/http/HttpSessionContext.java      | 43 +-----------------
 .../javax/servlet/http/HttpSessionEvent.java  | 43 +-----------------
 .../servlet/http/HttpSessionListener.java     | 43 +-----------------
 .../java/javax/servlet/http/HttpUtils.java    | 43 +-----------------
 .../servlet/http/LocalStrings.properties      | 43 +-----------------
 .../servlet/http/LocalStrings_es.properties   | 43 +-----------------
 .../servlet/http/LocalStrings_fr.properties   | 43 +-----------------
 .../servlet/http/LocalStrings_ja.properties   | 43 +-----------------
 src/main/java/javax/servlet/http/package.html | 43 +-----------------
 src/main/java/javax/servlet/package.html      | 43 +-----------------
 .../doc-files/expert-draft-bg-blank.graffle   | 42 ++++++++++++++++++
 .../expert-draft-bg-non-blank.graffle         | 42 ++++++++++++++++++
 51 files changed, 134 insertions(+), 2058 deletions(-)

diff --git a/src/main/java/javax/servlet/Filter.java b/src/main/java/javax/servlet/Filter.java
index 0b579fb0..7f67f46c 100644
--- a/src/main/java/javax/servlet/Filter.java
+++ b/src/main/java/javax/servlet/Filter.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/FilterChain.java b/src/main/java/javax/servlet/FilterChain.java
index cafc0632..cefe3872 100644
--- a/src/main/java/javax/servlet/FilterChain.java
+++ b/src/main/java/javax/servlet/FilterChain.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/FilterConfig.java b/src/main/java/javax/servlet/FilterConfig.java
index 4265b61d..95ce0a17 100644
--- a/src/main/java/javax/servlet/FilterConfig.java
+++ b/src/main/java/javax/servlet/FilterConfig.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/GenericServlet.java b/src/main/java/javax/servlet/GenericServlet.java
index c82760f7..4a51a5bf 100644
--- a/src/main/java/javax/servlet/GenericServlet.java
+++ b/src/main/java/javax/servlet/GenericServlet.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/LocalStrings.properties b/src/main/java/javax/servlet/LocalStrings.properties
index dc368276..7a478e0d 100644
--- a/src/main/java/javax/servlet/LocalStrings.properties
+++ b/src/main/java/javax/servlet/LocalStrings.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/LocalStrings_fr.properties b/src/main/java/javax/servlet/LocalStrings_fr.properties
index 1abd2eb0..af9a2f07 100644
--- a/src/main/java/javax/servlet/LocalStrings_fr.properties
+++ b/src/main/java/javax/servlet/LocalStrings_fr.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/LocalStrings_ja.properties b/src/main/java/javax/servlet/LocalStrings_ja.properties
index 84980abf..7d557854 100644
--- a/src/main/java/javax/servlet/LocalStrings_ja.properties
+++ b/src/main/java/javax/servlet/LocalStrings_ja.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/RequestDispatcher.java b/src/main/java/javax/servlet/RequestDispatcher.java
index a90088e2..19cdacc0 100644
--- a/src/main/java/javax/servlet/RequestDispatcher.java
+++ b/src/main/java/javax/servlet/RequestDispatcher.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/Servlet.java b/src/main/java/javax/servlet/Servlet.java
index c0bf45d8..abb0250c 100644
--- a/src/main/java/javax/servlet/Servlet.java
+++ b/src/main/java/javax/servlet/Servlet.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletConfig.java b/src/main/java/javax/servlet/ServletConfig.java
index 312e7484..2140916e 100644
--- a/src/main/java/javax/servlet/ServletConfig.java
+++ b/src/main/java/javax/servlet/ServletConfig.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletContext.java b/src/main/java/javax/servlet/ServletContext.java
index 9e381486..3bd5431d 100644
--- a/src/main/java/javax/servlet/ServletContext.java
+++ b/src/main/java/javax/servlet/ServletContext.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletContextAttributeEvent.java b/src/main/java/javax/servlet/ServletContextAttributeEvent.java
index 3413ca4f..8ebc5fd2 100644
--- a/src/main/java/javax/servlet/ServletContextAttributeEvent.java
+++ b/src/main/java/javax/servlet/ServletContextAttributeEvent.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletContextAttributeListener.java b/src/main/java/javax/servlet/ServletContextAttributeListener.java
index 749a568f..2e10f8eb 100644
--- a/src/main/java/javax/servlet/ServletContextAttributeListener.java
+++ b/src/main/java/javax/servlet/ServletContextAttributeListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletContextEvent.java b/src/main/java/javax/servlet/ServletContextEvent.java
index 7db29b6f..8e3eca26 100644
--- a/src/main/java/javax/servlet/ServletContextEvent.java
+++ b/src/main/java/javax/servlet/ServletContextEvent.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletContextListener.java b/src/main/java/javax/servlet/ServletContextListener.java
index 0f95d48f..d37e58d0 100644
--- a/src/main/java/javax/servlet/ServletContextListener.java
+++ b/src/main/java/javax/servlet/ServletContextListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletException.java b/src/main/java/javax/servlet/ServletException.java
index bf85c2dd..375bb298 100644
--- a/src/main/java/javax/servlet/ServletException.java
+++ b/src/main/java/javax/servlet/ServletException.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletInputStream.java b/src/main/java/javax/servlet/ServletInputStream.java
index f7b12da7..a0369ab4 100644
--- a/src/main/java/javax/servlet/ServletInputStream.java
+++ b/src/main/java/javax/servlet/ServletInputStream.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletOutputStream.java b/src/main/java/javax/servlet/ServletOutputStream.java
index 2e5192fb..efcd1e51 100644
--- a/src/main/java/javax/servlet/ServletOutputStream.java
+++ b/src/main/java/javax/servlet/ServletOutputStream.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletRequest.java b/src/main/java/javax/servlet/ServletRequest.java
index 8300c9d2..979898e3 100644
--- a/src/main/java/javax/servlet/ServletRequest.java
+++ b/src/main/java/javax/servlet/ServletRequest.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletRequestAttributeEvent.java b/src/main/java/javax/servlet/ServletRequestAttributeEvent.java
index bcb8403d..1f59887f 100644
--- a/src/main/java/javax/servlet/ServletRequestAttributeEvent.java
+++ b/src/main/java/javax/servlet/ServletRequestAttributeEvent.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletRequestAttributeListener.java b/src/main/java/javax/servlet/ServletRequestAttributeListener.java
index 7b5821da..f17ab03a 100644
--- a/src/main/java/javax/servlet/ServletRequestAttributeListener.java
+++ b/src/main/java/javax/servlet/ServletRequestAttributeListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletRequestEvent.java b/src/main/java/javax/servlet/ServletRequestEvent.java
index 64bef29d..c4db8faa 100644
--- a/src/main/java/javax/servlet/ServletRequestEvent.java
+++ b/src/main/java/javax/servlet/ServletRequestEvent.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package javax.servlet;
 
 /** 
diff --git a/src/main/java/javax/servlet/ServletRequestListener.java b/src/main/java/javax/servlet/ServletRequestListener.java
index c76cdb04..d65edf9e 100644
--- a/src/main/java/javax/servlet/ServletRequestListener.java
+++ b/src/main/java/javax/servlet/ServletRequestListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletRequestWrapper.java b/src/main/java/javax/servlet/ServletRequestWrapper.java
index 9433473a..bf8c95b3 100644
--- a/src/main/java/javax/servlet/ServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/ServletRequestWrapper.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletResponse.java b/src/main/java/javax/servlet/ServletResponse.java
index 63f2abd4..7b1c38dd 100644
--- a/src/main/java/javax/servlet/ServletResponse.java
+++ b/src/main/java/javax/servlet/ServletResponse.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/ServletResponseWrapper.java b/src/main/java/javax/servlet/ServletResponseWrapper.java
index ec979e93..b861f848 100644
--- a/src/main/java/javax/servlet/ServletResponseWrapper.java
+++ b/src/main/java/javax/servlet/ServletResponseWrapper.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/SingleThreadModel.java b/src/main/java/javax/servlet/SingleThreadModel.java
index 6516b311..2572d3f9 100644
--- a/src/main/java/javax/servlet/SingleThreadModel.java
+++ b/src/main/java/javax/servlet/SingleThreadModel.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/UnavailableException.java b/src/main/java/javax/servlet/UnavailableException.java
index 9bc169d7..f529aaf6 100644
--- a/src/main/java/javax/servlet/UnavailableException.java
+++ b/src/main/java/javax/servlet/UnavailableException.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/Cookie.java b/src/main/java/javax/servlet/http/Cookie.java
index e511ee28..cfd85829 100644
--- a/src/main/java/javax/servlet/http/Cookie.java
+++ b/src/main/java/javax/servlet/http/Cookie.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpServlet.java b/src/main/java/javax/servlet/http/HttpServlet.java
index 42b161d2..46f16f08 100644
--- a/src/main/java/javax/servlet/http/HttpServlet.java
+++ b/src/main/java/javax/servlet/http/HttpServlet.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpServletRequest.java b/src/main/java/javax/servlet/http/HttpServletRequest.java
index ad0d3937..3f0a0d0b 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequest.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequest.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
index dea2cf52..cb2393e6 100644
--- a/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletRequestWrapper.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpServletResponse.java b/src/main/java/javax/servlet/http/HttpServletResponse.java
index bd3d262e..08888aca 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponse.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponse.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
index f381a0de..ee922539 100644
--- a/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
+++ b/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSession.java b/src/main/java/javax/servlet/http/HttpSession.java
index 95a857d2..158d0bc1 100644
--- a/src/main/java/javax/servlet/http/HttpSession.java
+++ b/src/main/java/javax/servlet/http/HttpSession.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java
index 7d6b709e..32069275 100644
--- a/src/main/java/javax/servlet/http/HttpSessionActivationListener.java
+++ b/src/main/java/javax/servlet/http/HttpSessionActivationListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java
index 285b5983..2a1eceb0 100644
--- a/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java
+++ b/src/main/java/javax/servlet/http/HttpSessionAttributeListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java
index 0497b023..2538817f 100644
--- a/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java
+++ b/src/main/java/javax/servlet/http/HttpSessionBindingEvent.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java
index f21cb9fa..9dd95db4 100644
--- a/src/main/java/javax/servlet/http/HttpSessionBindingListener.java
+++ b/src/main/java/javax/servlet/http/HttpSessionBindingListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionContext.java b/src/main/java/javax/servlet/http/HttpSessionContext.java
index 5c8ee8f5..e9ef0980 100644
--- a/src/main/java/javax/servlet/http/HttpSessionContext.java
+++ b/src/main/java/javax/servlet/http/HttpSessionContext.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionEvent.java b/src/main/java/javax/servlet/http/HttpSessionEvent.java
index 9ed0329b..7a348b8d 100644
--- a/src/main/java/javax/servlet/http/HttpSessionEvent.java
+++ b/src/main/java/javax/servlet/http/HttpSessionEvent.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpSessionListener.java b/src/main/java/javax/servlet/http/HttpSessionListener.java
index 63e66454..9b4dc8c7 100644
--- a/src/main/java/javax/servlet/http/HttpSessionListener.java
+++ b/src/main/java/javax/servlet/http/HttpSessionListener.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/HttpUtils.java b/src/main/java/javax/servlet/http/HttpUtils.java
index f63e72c7..372f0565 100644
--- a/src/main/java/javax/servlet/http/HttpUtils.java
+++ b/src/main/java/javax/servlet/http/HttpUtils.java
@@ -1,46 +1,5 @@
 /*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License.  You can
- * obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
- * or packager/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at packager/legal/LICENSE.txt.
- *
- * GPL Classpath Exception:
- * Oracle designates this particular file as subject to the "Classpath"
- * exception as provided by Oracle in the GPL Version 2 section of the License
- * file that accompanied this code.
- *
- * Modifications:
- * If applicable, add the following below the License Header, with the fields
- * enclosed by brackets [] replaced by your own identifying information:
- * "Portions Copyright [year] [name of copyright owner]"
- *
- * Contributor(s):
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
+ * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/LocalStrings.properties b/src/main/java/javax/servlet/http/LocalStrings.properties
index e74ddcdf..e52aa45c 100644
--- a/src/main/java/javax/servlet/http/LocalStrings.properties
+++ b/src/main/java/javax/servlet/http/LocalStrings.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/LocalStrings_es.properties b/src/main/java/javax/servlet/http/LocalStrings_es.properties
index 395c8fee..65367d98 100644
--- a/src/main/java/javax/servlet/http/LocalStrings_es.properties
+++ b/src/main/java/javax/servlet/http/LocalStrings_es.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/LocalStrings_fr.properties b/src/main/java/javax/servlet/http/LocalStrings_fr.properties
index 88c8c508..0c3f5d60 100644
--- a/src/main/java/javax/servlet/http/LocalStrings_fr.properties
+++ b/src/main/java/javax/servlet/http/LocalStrings_fr.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/LocalStrings_ja.properties b/src/main/java/javax/servlet/http/LocalStrings_ja.properties
index 4e785ead..eec21481 100644
--- a/src/main/java/javax/servlet/http/LocalStrings_ja.properties
+++ b/src/main/java/javax/servlet/http/LocalStrings_ja.properties
@@ -1,46 +1,5 @@
 #
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-# or packager/legal/LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at packager/legal/LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-#
-# This file incorporates work covered by the following copyright and
-# permission notice:
-#
+# Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved.
 # Copyright 2004 The Apache Software Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/javax/servlet/http/package.html b/src/main/java/javax/servlet/http/package.html
index d11c0687..831ffad3 100644
--- a/src/main/java/javax/servlet/http/package.html
+++ b/src/main/java/javax/servlet/http/package.html
@@ -1,47 +1,6 @@
 
+
 
 
 	ActiveLayerIndex
diff --git a/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle b/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
index 7707a65f..63b54c2f 100644
--- a/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
+++ b/src/main/javadoc/doc-files/expert-draft-bg-non-blank.graffle
@@ -1,5 +1,47 @@
 
 
+
+
 
 
 	ActiveLayerIndex

From 6430adae88c7be1c4d750adee995c221bc39ebbc Mon Sep 17 00:00:00 2001
From: Vinay Vishal 
Date: Fri, 20 Apr 2018 12:45:31 +0530
Subject: [PATCH 159/160] Update pom with latest copyright plugin version

---
 copyright-exclude | 2 +-
 pom.xml           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/copyright-exclude b/copyright-exclude
index bcbbba62..2430b60f 100644
--- a/copyright-exclude
+++ b/copyright-exclude
@@ -1,6 +1,6 @@
 copyright-exclude
 LICENSE
-README.md
+README
 CONTRIBUTING.md
 src/main/javadoc/doc-files/expert-draft-bg-blank.graffle
 src/main/javadoc/doc-files/expert-draft-bg-blank.png
diff --git a/pom.xml b/pom.xml
index fabc8102..5999970f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         3.0.4
         exclude.xml
         Low
-        1.41
+        1.49
     
     Java Servlet API
 
@@ -329,6 +329,7 @@
                     
                         ${basedir}/copyright-exclude
                     
+                    true
                 
                 
                     

From 5574e9b39d806120ac4d3539826a75b2cea0165a Mon Sep 17 00:00:00 2001
From: Vinay Vishal 
Date: Fri, 20 Apr 2018 12:46:09 +0530
Subject: [PATCH 160/160] [maven-release-plugin] prepare release 4.0.1

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5999970f..1a1198e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
     javax.servlet
     javax.servlet-api
     jar
-    4.0.1-SNAPSHOT
+    4.0.1
 
     
         4.0
@@ -133,7 +133,7 @@
         scm:git:https://github.com/javaee/servlet-spec.git
         scm:git:git@github.com:javaee/servlet-spec.git
         https://github.com/javaee/servlet-spec
-      HEAD
+      4.0.1