------------------------------------------------------------------------ r64749 | edburns | 2017-03-10 08:55:30 -0800 (Fri, 10 Mar 2017) | 44 lines SERVLET_SPEC-73/GLASSFISH-21670 MappingDiscovery Author: Ed Burns with help from Ryan Lubke Reviewers: Shing-wai chan Passed all web devtests on Solaris 11 and Oracle Linux 7.2. Index: appserver/security/webintegration/src/main/java/com/sun/web/security/RequestFacadeWrapper.java + public ServletMapping getServletMapping() { + return servletRequest.getServletMapping(); + } Index: appserver/web/web-core/src/main/java/org/apache/catalina/connector/MappingImpl.java - Take advantage of changes in Grizzly 2.3.29 to enable Mapping Discovery. - Thanks to Shing-wai for the thorough code review with bounds checking. - Use LogFacade. Index: appserver/web/web-core/src/main/java/org/apache/catalina/connector/Request.java - The most important method. Here's where the new MappingImpl is instantiated. Index: appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java - Use LogFacade. Index: appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java - Modify ctor to take ServletMapping, to pass down to ApplicationHttpRequest. Index: appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java - Account for new request parameters, especially the very subtle case of includes and forwards. Index: appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java - Account for changes to ApplicationDispatcher ctor, especially passing in a special MappingImpl that wraps the mappingData before it is recycled. ------------------------------------------------------------------------ r64750 | rlubke | 2017-03-10 16:00:57 -0800 (Fri, 10 Mar 2017) | 5 lines Integrate Grizzly 2.3.30. - Remove experimental SPDY code. - Remove Http2 dom element. HTTP2 attributes migrated to http dom attribute. ------------------------------------------------------------------------ r64751 | rlubke | 2017-03-10 16:12:07 -0800 (Fri, 10 Mar 2017) | 3 lines Removed Spdy dom element. ------------------------------------------------------------------------ r64752 | rlubke | 2017-03-10 16:13:35 -0800 (Fri, 10 Mar 2017) | 3 lines Missed import. ------------------------------------------------------------------------ r64753 | jungicz | 2017-03-10 16:32:14 -0800 (Fri, 10 Mar 2017) | 1 line integrate jsonp-1.1.0-M2 ------------------------------------------------------------------------