Squashed 'apache-el/src/main/' changes from 3e8bb9a..d9a7077

d9a7077 Add non SSL version of the frame test.
10e526c Use a regular processSocket to cleanup after an error, so that the connection is removed, etc.
7bbef5a Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56246 Fix NullPointerException in MemoryRealm when authenticating an unknown user.
c9473af Switch to a semaphore here (for the flush, since the previous one would have issues if run after non blocking writes).
6ec8484 Fix an Eclipse nag now the received message is used.
729d7a2 Clean-up. No functional change.
25cde82 Add some progress info to the websockets frame test.
581cf61 Fix whitespace.
c0426ac Add methods of get the idle time from last client access time to org.apache.catalina.Session.
da8427a Add support for LAST_ACCESS_AT_START system property to Manager web application.
4231dd4 Revert timeout change (no effect).
d3dec7b - Harmonize with the NIO1 connector for upgrade close. - Actually understand where the (cosmetic) async close traces were coming from.
e9fbf3f - Fix SSL output with blocking writes when a handshake occurs during the flow. - Fix relevant test as pointed out by Konstantin.
4a7a9be Increase the write timeout (5s -> 10s) to see how the test reacts (or if it's a deadlock somewhere), I see some significant spikes in my own testing if I put some load on my computer.
e05cdf7 Add a work-around for XML documents (often TLDs) that only refer to J2EE schemas by file name
fa9b538 Correct a typo
2d58105 Document the "execute.test.nio2" option.
f86c6e3 Rephrase changelog message
8ec8d93 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56244 Fix MBeans descriptor for WebappClassLoader MBean: The jarPath property on WebappClassLoader has been removed in Tomcat 8.
e891fa7 Use the behavior of the NIO connector if there is a pending write when attempting a SSL close (= throw an IOE and expect a real close).
d028b5d Fixed java.lang.NegativeArraySizeException when execute the command of Expire sessions of manager web application to context in which the session timeout is disabled.
8cda930 Entropy attribute for Manager gone since TC 7.
70ad7c4 - Closing is not an async operation, but needs to be performed, so ignore errors if some pending things are going on with SSL. - Also fix some warnings.
27b2ef3 CheckStyle: fix order of imports
9985841 Try to see the testsuite state ...
643febf Stop using writeTimeout for now (I don't see the point at the moment).
6b44dd9 Add code to do a clean close of all current connections.
da37000 Fix a couple of Javadoc nags
f6d674b Fix reported boxing warnings.
bb680ac Fix AJP NIO2 protocol selection.
8dbe6df Fix NIO2 mbean names tested by the registration test, it would otherwise use the NIO1 names.
01bd301 Checkstyle: tab character
ca4b92f Checkstyle: 1. Trailing whitespace 2. Unused import
07f32f0 Followup to r1575905: svn:eol-style=native for new files
84ebae3 Followup to r1575885 Do not hold writeLock when calling onError().
27ac126 Add experimental NIO2 connector. Based on code developed by Nabil Benothman.
a5384a0 Add more comments to explain the locks. Reduce scope of the writeLock in onWritePossible
c6b3cb3 Add harmonized util methods for the five listener events.
347a503 Add isBlocking util method, like in AbstractOutputBuffer.
0a051cb Javadoc typo.
37c8c9f Improve the robustness of web application undeployment based on some code analysis triggered by the report for BZ 54315

git-subtree-dir: apache-el/src/main
git-subtree-split: d9a70777abe38b9a2cf2572b5a6f1a3b980bfbb9
Merge commit '01e6124235e140d8ddf3b38e1e082da6a4118502'

Conflicts:
	apache-el/src/main/BUILDING.txt
	apache-el/src/main/build.properties.default
	apache-el/src/main/build.xml
	apache-el/src/main/java/org/apache/catalina/Session.java
	apache-el/src/main/java/org/apache/catalina/core/StandardContext.java
	apache-el/src/main/java/org/apache/catalina/core/StandardWrapper.java
	apache-el/src/main/java/org/apache/catalina/ha/session/DeltaSession.java
	apache-el/src/main/java/org/apache/catalina/loader/mbeans-descriptors.xml
	apache-el/src/main/java/org/apache/catalina/manager/DummyProxySession.java
	apache-el/src/main/java/org/apache/catalina/manager/ManagerServlet.java
	apache-el/src/main/java/org/apache/catalina/realm/MemoryRealm.java
	apache-el/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
	apache-el/src/main/java/org/apache/catalina/session/PersistentManagerBase.java
	apache-el/src/main/java/org/apache/catalina/session/StandardSession.java
	apache-el/src/main/java/org/apache/catalina/session/package.html
	apache-el/src/main/java/org/apache/catalina/storeconfig/server-registry.xml
	apache-el/src/main/java/org/apache/coyote/http11/AbstractHttp11Processor.java
	apache-el/src/main/java/org/apache/coyote/http11/AbstractInputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/LocalStrings.properties
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/LocalResolver.java
	apache-el/src/main/java/org/apache/tomcat/util/net/SocketProperties.java
	apache-el/src/main/test/org/apache/catalina/mbeans/TestRegistration.java
	apache-el/src/main/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
	apache-el/src/main/test/org/apache/tomcat/util/net/TestSsl.java
	apache-el/src/main/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
	apache-el/src/main/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
	apache-el/src/main/webapps/docs/changelog.xml
	apache-el/src/main/webapps/docs/config/ajp.xml
	apache-el/src/main/webapps/docs/config/http.xml
	apache-el/src/main/webapps/docs/funcspecs/fs-admin-objects.xml
	apache-el/src/main/webapps/docs/security-howto.xml
Squashed 'apache-jsp/src/main/' changes from 3e8bb9a..d9a7077

d9a7077 Add non SSL version of the frame test.
10e526c Use a regular processSocket to cleanup after an error, so that the connection is removed, etc.
7bbef5a Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56246 Fix NullPointerException in MemoryRealm when authenticating an unknown user.
c9473af Switch to a semaphore here (for the flush, since the previous one would have issues if run after non blocking writes).
6ec8484 Fix an Eclipse nag now the received message is used.
729d7a2 Clean-up. No functional change.
25cde82 Add some progress info to the websockets frame test.
581cf61 Fix whitespace.
c0426ac Add methods of get the idle time from last client access time to org.apache.catalina.Session.
da8427a Add support for LAST_ACCESS_AT_START system property to Manager web application.
4231dd4 Revert timeout change (no effect).
d3dec7b - Harmonize with the NIO1 connector for upgrade close. - Actually understand where the (cosmetic) async close traces were coming from.
e9fbf3f - Fix SSL output with blocking writes when a handshake occurs during the flow. - Fix relevant test as pointed out by Konstantin.
4a7a9be Increase the write timeout (5s -> 10s) to see how the test reacts (or if it's a deadlock somewhere), I see some significant spikes in my own testing if I put some load on my computer.
e05cdf7 Add a work-around for XML documents (often TLDs) that only refer to J2EE schemas by file name
fa9b538 Correct a typo
2d58105 Document the "execute.test.nio2" option.
f86c6e3 Rephrase changelog message
8ec8d93 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56244 Fix MBeans descriptor for WebappClassLoader MBean: The jarPath property on WebappClassLoader has been removed in Tomcat 8.
e891fa7 Use the behavior of the NIO connector if there is a pending write when attempting a SSL close (= throw an IOE and expect a real close).
d028b5d Fixed java.lang.NegativeArraySizeException when execute the command of Expire sessions of manager web application to context in which the session timeout is disabled.
8cda930 Entropy attribute for Manager gone since TC 7.
70ad7c4 - Closing is not an async operation, but needs to be performed, so ignore errors if some pending things are going on with SSL. - Also fix some warnings.
27b2ef3 CheckStyle: fix order of imports
9985841 Try to see the testsuite state ...
643febf Stop using writeTimeout for now (I don't see the point at the moment).
6b44dd9 Add code to do a clean close of all current connections.
da37000 Fix a couple of Javadoc nags
f6d674b Fix reported boxing warnings.
bb680ac Fix AJP NIO2 protocol selection.
8dbe6df Fix NIO2 mbean names tested by the registration test, it would otherwise use the NIO1 names.
01bd301 Checkstyle: tab character
ca4b92f Checkstyle: 1. Trailing whitespace 2. Unused import
07f32f0 Followup to r1575905: svn:eol-style=native for new files
84ebae3 Followup to r1575885 Do not hold writeLock when calling onError().
27ac126 Add experimental NIO2 connector. Based on code developed by Nabil Benothman.
a5384a0 Add more comments to explain the locks. Reduce scope of the writeLock in onWritePossible
c6b3cb3 Add harmonized util methods for the five listener events.
347a503 Add isBlocking util method, like in AbstractOutputBuffer.
0a051cb Javadoc typo.
37c8c9f Improve the robustness of web application undeployment based on some code analysis triggered by the report for BZ 54315

git-subtree-dir: apache-jsp/src/main
git-subtree-split: d9a70777abe38b9a2cf2572b5a6f1a3b980bfbb9
Merge commit 'ba4c7b9e1557e8cdf3989e241b4b4ee6292b40ba'

Conflicts:
	apache-jsp/src/main/BUILDING.txt
	apache-jsp/src/main/build.properties.default
	apache-jsp/src/main/build.xml
	apache-jsp/src/main/java/org/apache/catalina/Session.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardContext.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardWrapper.java
	apache-jsp/src/main/java/org/apache/catalina/ha/session/DeltaSession.java
	apache-jsp/src/main/java/org/apache/catalina/loader/mbeans-descriptors.xml
	apache-jsp/src/main/java/org/apache/catalina/manager/DummyProxySession.java
	apache-jsp/src/main/java/org/apache/catalina/manager/ManagerServlet.java
	apache-jsp/src/main/java/org/apache/catalina/realm/MemoryRealm.java
	apache-jsp/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
	apache-jsp/src/main/java/org/apache/catalina/session/PersistentManagerBase.java
	apache-jsp/src/main/java/org/apache/catalina/session/StandardSession.java
	apache-jsp/src/main/java/org/apache/catalina/session/package.html
	apache-jsp/src/main/java/org/apache/catalina/storeconfig/server-registry.xml
	apache-jsp/src/main/java/org/apache/coyote/http11/AbstractHttp11Processor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/AbstractInputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/SocketProperties.java
	apache-jsp/src/main/test/org/apache/catalina/mbeans/TestRegistration.java
	apache-jsp/src/main/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
	apache-jsp/src/main/test/org/apache/tomcat/util/net/TestSsl.java
	apache-jsp/src/main/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
	apache-jsp/src/main/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
	apache-jsp/src/main/webapps/docs/changelog.xml
	apache-jsp/src/main/webapps/docs/config/ajp.xml
	apache-jsp/src/main/webapps/docs/config/http.xml
	apache-jsp/src/main/webapps/docs/funcspecs/fs-admin-objects.xml
	apache-jsp/src/main/webapps/docs/security-howto.xml