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

adc36cf Formatting.
00eb735 Refactoring. Switch from a boolean to an Enum for error state so we can differentiate between an error that requires the connection is closed after the current response is completed and an error that requires that the connection is closed immediately. This commit should be a NO-OP. While the different error states are set, the only the presence of an error (or not) is tested - i.e. no change from the implementation prior to this commit. Try to be consistent when an error occurs. Set the status code first (if required), then set the error state and finally log (if required).
84388c0 Clean-up
68046fa Add a (currently disabled) test for errors with a chunked response after the response has been committed.
d9c49e3 https://issues.apache.org/bugzilla/show_bug.cgi?id=56582#c1 Implement DISPATCH_EXECUTE action for AJP connector.
2501e4a Tiny bit of de-duplication. Add reference to RFC2616 for case insensitivity of transfer encoding names.
8c8ee41 Reduce duplicate by moving error handling into addInputFilter. Also makes error handling consistent. Reduce visibility of addInputFilter()
1477d58 Align code with comment and use a 500 response (internal server error) as per the comment rather than a 400 response.
80a63d0 As per RFC2616, an unknown expect header should result in a 417 response.
0ef06bb Tweak comments
92080bf Pull up error flag
e451d48 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56582 Convert implementations of ActionHook.action(..) to use switch(enum) operator. Third and the last part: AJP processors.
8fe3fe1 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56582 Convert implementations of ActionHook.action(..) to use switch(enum) operator. Second part: HTTP processors.
6cd38df Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56582 Convert implementations of ActionHook.action(..) to use switch(enum) operator. First, SpdyProcessor.
2d03001 Fix IDE warning
b730f9f Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56555 which, after further discussion, was classed as INVALID.
78c437e Avoid having an import.
0b41baf Add some info and disable the async test (one CVE saved hehe).
3fd9750 Fix regression with the websockets examples after fixing the testing. The initial notification is still problematic.
86bd703 Followup to r1598483:
1033b8d Add CVE numbers, correct a typo.
82c53cc Typos.
13f1e24 - Test autobahn myself, add two new echo endpoints and my example config. - Issues with the async endpoint, 9.7 and 9.8.
bd73fea Remove listener calls optimizations, they skip a lot of things which could be useful and ultimately it doesn't work that well.
e739a3a More formatting changes
cc52137 Trivial format tweaks
cd1194d Trivial format fix
d1a3389 Simplify logic Call Response.recycle() from Response.reset() rather than in Response.reset():  - doing ~half of what recycle() does  - calling ActionCode.RESET which resets the OutputBuffer which in turn calls Response.recycle()
db632b1 Check committed before changing any field values Remove various incorrect comments
997cdcb Less fuzzy way to call onDataAvailable (no real fix though).
6bf75cb Formatting clean-up No functional change
05cf2f3 Better comments Formatting (use longer line lengths)
7605a45 Remove unnecessary method
ede4f77 Remove Response methods where the only function is to call action() and call action() directly.
782e977 Fix indent
c225e52 No need for the expectation check in an error state as the connection will be closed any way.
a1cfdac Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56555 When Tomcat closes the connection based on the HTTP status code of the response, ensure that only one connection header is sent to the client.
9f2ab03 Fix copy/paste error and return a 500 rather 400 response
aa21852 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55282 o.a.t.util.descriptor.web.ApplicationListener overrides equals and hashCode methods.
b0bfbd8 Discern the first and the second requests in the test case.
bc81c83 Add license header
f532e85 Add license header
bd11d06 Add license header
752385d Refactor test to enable a clean server shutdown. This prevents the web application class loader complaining about a still running thread on server stop.
f87d779 ISE is expected when using AsyncChannels. Handle it the same way an IOException is handled rather than expecting the client code to catch and handle it.
76297b4 Simplify available() and isFinished() as current implementation broke Comet chat example.
1338db8 Implement third part of pull request from Greg Wilkins to make Jasper more independent from Tomcat. Add support for using an existing list of TLDs rather than scanning for them This closes #4
d5c3143 Implement second part of pull request from Greg Wilkins to make Jasper more independent from Tomcat. Add ServiceLoader based discovery support to the JULI LogFactory
ddf941b Implement first part of pull request from Greg Wilkins to make Jasper more independent from Tomcat.
4a128a2 Keep change log to max 80 chars wide
75728d4 Fix a TODO Only set the JspFactory if not already set
d77e116 https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 Followup to r1597532: check the output of the new test.
2125a39 Set bugtraq:logregex property on the root directory. This allows TortoiseSVN to parse arbitrary references to Bugzilla issues in addition to those that follow "Fix ..." template. Just the issue URL or "BZ + number" is enough.
e049aa7 Update changelog.
c1e9f84 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 Fixed NoSuchElementException when an attribute has empty string as value
7462b98 If the SSL reneg test only fails on MacOs, it would be better to continue running it on the other platforms.
2b48138 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55975 Apply consistent escaping for " and \
93be55d hopefully fixed timing issue in TestStuckThreadDetectionValve when the test is run on ASF buildbot...
0cdfed5 Apply patch 12 from jboynes to improve cookie handling. Move header-specific parsing code into a separate class associated with that header type. This is in anticipation of adding new header parsers, starting with Cookie The patch should be safe since the logic is unchanged.
a7f0bc9 Whitespace police after merge from Commons
28f030f DBCP updates
c037d7c Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56546 Avoid stack trace with org.apache.catalina.connector.TestMaxConnections Ensure request processing has finished by increasing unload delay to allow request that was waiting in the accept queue to be processed before shutdown completes.
1eaada8 Apply patch 11 from jboynes to improve cookie handling. Eliminate an unneeded StringBuilder. I also added to TODO marker. The patch should be safe since the logic is unchanged.
a22bf83 Apply patch 10 from jboynes to improve cookie handling. Separate the code that determines whether a value should be quoted in Set-Cookie from the checks that are performed when parsing a Cookie header sent by a client. I also did a small amount of clean up. The patch should be safe since the logic is unchanged.
2a3a288 Apply patch 09 from jboynes to improve cookie handling. Code cleanup. I did not remove the final markers from the static methods as I see no need to remove them and good reasons to keep them. The patch should be safe since the logic is unchanged.
4ebf728 Apply patch 08 from jboynes to improve cookie handling. Encapsulate use of ALWAYS_ADD_EXPIRES as it only applies to Set-Cookie generation. The patch should be safe since the logic is unchanged.
cb090ba Apply patch 07 from jboynes to improve cookie handling. Simplify code that detects if we need to upgrade a cookie from V0 to V1 The patch should be safe since the logic is unchanged.
3e8dcee Apply patch 06 from jboynes to improve cookie handling. Remove duplicate code. The patch should be safe since the logic is unchanged.
a15b016 Apply patch 05 from jboynes to improve cookie handling. Simplify logic for detecting cookie upgrades. I made a few additional changes.  - s/isnt/isNot/ in method names  - whitespace clean-up  - correct some comments The patch should be safe since the logic is unchanged.
2daf167 Apply patch 04 from jboynes to improve cookie handling. Prevent V0 cookies using '=' in cookie names I've checked back though the archives and I can find no record of a user asking for this feature. Also, given the known behaviour of browsers it is unlikely to have worked any way. On that basis, this should be safe.
796cf33 FindBugs Fix false positive
d28c1b9 Apply patch 03 from jboynes to improve cookie handling. Allow V0 cookies to use names that start with $. Add a (currently unused) RFC6265 Cookie validator. Patch should be safe since it relaxes the current behaviour.
dd0573b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543 Followup to r1596227 Update POM and IDE files to the new ECJ version
2f4998e Apply patch 02 from jboynes to improve cookie handling. Refactor cookie tests to test each CookieNameValidator directly. I made a few additional changes. The patch should be safe since it only impacts the unit tests.
0de4035 Apply patch 01 from jboynes to improve cookie handling. Allow attribute names as cookie names. Patch should be safe since it relaxes the current behaviour.
e8ba504 Use ISO 8601 date format, like it was done for earlier versions
4b27c5c Add release date
5ddc58a fixed timing and enclosed thread.join in a finally to avoid stopping the webapp before the request is finished (in case of assertion failure)
1449538 Correct comment
bf3072b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56521 Implement a TODO Reuse the async write buffer between writes to reduce allocation and GC overhead. Based on a patch by leonzhx. Also:  - don't re-allocate the buffer / move the data in the buffer if the buffer is partially written on a subsequent write  - make the buffer size configurable, defaulting to 8k
5c54b47 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543 Update JDT to 4.4.RC1
43895c0 Improve handling of Throwable. Add changelog entry.
d68b45e Further simplify the code Merge two try/catch inside two branches of if/else. factoryClass cannot be null after loadClass()/Class.forName() calls.
32126ac Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56545 Pre-load two more classes to avoid exceptions when running under a security manager
16d7b9c Simplify
b102edf Fix logic error
ce70051 FindBugs setup() vs setUp()
f8d813f Experiment with the Simbian duplicate code detection tool. Remove 100+ lines of duplicate code
1d149b2 FindBugs. Remove unnecessary null check
a24d70d Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56545 Pre-load an additional class if running under a security manager
f49e855 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56546 Reduce logging level for stack traces from SEVERE to INFO.
55a7381 Correct indent
350a8c2 svn:eol-style=native
91f599d Follow up to r1596004. Actually throw the exception.
bcadac2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56387 Refactor handling of class loading attempts after web application stop.
d515307 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56446 Clearer handling of exceptions when calling a method on a POJO based WebSocket endpoint. Based on a suggestion by Eugene Chung.
d2a78d0 Code clean-up. No functional change. Merge exception handling blocks were code is identical. Spotted while reviewing use of ExceptionUtils.unwrapInvocationTargetException()
0a982ce Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56399 Improve implementation of CoyoteAdapter.checkRecycled() to do not use an exception for flow control.
0fcfda8 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56461 New option to make context startup fail if a load-on-startup servlet fails
029d8d5 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Followup to r1595230 Minor improvement to the testcase: check the actual response produced by test JSP page.
88a90ec Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 Followup to r1595331: correct version number in changelog. (Tomcat 8.0.8 has been tagged an hour earlier).
dc55eb0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 Improved StuckThreadDetectionValve to allow to interrupt stuck threads.
5cb017c Prep for next release
4c55887 Whitespace
4e244f3 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Review of r1595174: 1. Call iterator() once. It creates an object, so it is better do not waste such calls. 2. Style issues: - "" does not make sense as 'generic' default for textAttributeValue. It makes sense for this specific case only. - 3 spaces indent -> 4 spaces
1a8a56d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56536 Ensure that HttpSessionBindingListener.valueUnbound() uses the correct class loader when the <code>SingleSignOn</code> valve is used.
c221051 Update changelog
f1a7ea7 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Test case for attributes with empty string values in custom tags.
2d76023 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Fixed NoSuchElementException while handling attributes with empty string value in custom tags. Patch provided by Hariprasad Manchi.
20d5a9e Prep for next release
b2732a9 Prep for next release
4827fa7 Copy missing resources file from Apache Commons DBCP 2 to packaged renamed copy of DBCP 2
0f35a2c Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56399 Simplify. Reduce logging level. Update changelog (this change was omitted from 8.0.6).
fd94c05 Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56516
45208f4 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56523 When using SPNEGO authentication, log the exceptions associated with failed user logins at debug level rather than error level.
69132e1 Add BZ 56516 to changelog
2ca5eae Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56522 When setting a value for a ValueExpression, ensure that the expected coercions take place such as a null string being coerced to an empty string.
e4b4858 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56516 Place declarations for all scripting variables marked with declare=true at the start of the page so they are always visible to the entire page.
f5197f3 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56399 When recycling a Coyote request, ensure that Catalina request have been recycled.
aa7c749 Whitespace police
fc6e98b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56518 Refactor NIO's SocketProcessor to use KeyAtrtachment rather than Socket to align it with the other implementations. This enables a number of attachment->socket->attachment transitions to be skipped which appears to resolve the root cause of BZ 56518. Since the wrapper is available and can be processed, it becomes possible to reduce the connection count when the socket is closed by the interrupt.
e87d654 Remove duplicate method
c5a6d04 Remove unused code
f07ce51 Consistent naming
60f0477 Pull up common async code
fe84524 Align code across the Processors Note for NIO that the socketWrapper is the KeyAttachment which allows the NIO code to be simplified
5c508d1 Remove unnecessary casts
7e83b76 Merge processSocket() and dispatchForEvent()
165b3e1 Return value is never used (and is hard coded to true anyway) so change return type to void.
237b7fd Keep Checkstyle happy
65837f8 Replace looped String-concatenation with StringBuilder. No functional change.
bf9ee86 Require RuntimePermission when introducing a new token.
9b2d57e Give the thread shutting down the existing connections a chance to finish before forcibly closing them and triggering an exception on each connection that is forcibly closed.
77799f5 Address root cause of ReadPendingException rather than swallowing it.
e23f634 Whitespace police
0f1c865 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56513 Make it crystal clear that using sendfile will disable any compression that might otherwise have been used.
9d2a736 Follow up to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 - Update description of DBCP packaging in buidling.txt - remove DBCP2 and Pool2 versions from build.properties.default - update svn-merge docs - remove external tomcat-dbcp.jar from sample Eclipse class path - remove reference in Javadoc to class that does not exist
3c55418 Update filter after split into two classes
204dddd Fix FindBugs false positive
38908a1 Fix double checked locking issue identified by FindBugs
3daa5a6 Correct typos in class name
2e2770c Correct regression introduced in r797162 that broke authentication of users when using the JAASMemoryLoginModule.
cbf22ab Fix regression introduced in r1239520 that broke loading of users from tomcat-users.xml when using the JAASMemoryLoginModule
4923c02 Fix tests failing at Buildbot and make them more friendly to Git.
4e53ef8 - ThreadLocalLeakPreventionListener: Trigger thread renewals for StandardContext only. (Do not trigger them for FailedContext and similar). - StandardThreadExecutor: Pass 'threadRenewalDelay' to the thread pool executor. Otherwise this setting configured at initialization time is effectively ignored. - Improve documentation.
ca8143d Simplify. No functional change.
649c598 Followup to r1593773: Explicitly create the logs directory. JUnit fails when the directory where it writes its reports does not exist. It happened at Apache Gump.
6e9183f In tests: allow to configure directory where JUnit reports and access log are written to. This is useful for Apache Gump, where BIO, NIO and NIO2 test runs are configured separately.
9ed34b7 Remove svn keywords from forked Apache Commons Pool2 and DBCP2
d84c366 Fix broken javadoc links. Noted when reviewing results of 'ant release' step from buildbot.
a1fe47d Split into two paragraphs, so that note is more visible.
b6e1943 Revert part of r1593563 Restore original comment. (Tomcat JDBC pool can be tested against original Commons DBCP, if someone wants.)
898c64a Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56501 HttpServletRequest.getContextPath() should return the undecoded context path used by the user agent.
30bcf27 Remove unused code. unparsedURIMB was written but never read.
3032d0e Better change log entry for DBCP changes
c63b807 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 Switch to svn copy for DBCP2 and Pool2
2297156 Update package renamed Apache Commons Codec to r1586336 to pick up some Javadoc fixes and some code clean up.
459bf9c Update package renamed Apache Commons FileUpload to r1569132 to pick up some small improvements (e.g. better <code>null</code> protection) and some code clean up.
4ea2380 Simplify
ca39900 Update package renamed Apache Commons BCEL to r1593495 to pick up some additional changes for Java 7 support and some code clean up.
d84776a Testing with Java 9 early access. UTF-8 issues resolved.
bcc3b57 Work around intermittent unit test failures on OSX.
8000f8e Small optimization: move "getRegistry(null, null)" call out of the loop.
72135ab Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56472#c1
09a6f97 Review of r1593288: Do not forget to call the symmetrical unset method on stop.
9012939 Fix test failure with NIO2 where additional, unexpected access log entry was being created during connector shutdown.
f53c5a1 Update changelog
43aa494 Update changelog
64431dc Retain the order the URLs were added in when calculating the result for getURLs()
5539009 - Improve comet keepalive cleanup (if a read pending it is not possible to interrupt it), and do the same for async.
d7a8a82 +=o.a.naming
a0d8527 Alphabetical order
0093619 Make naming context tokens for containers more robust by using a separate object
f1f5eb7 No functional change. Rename fields and variables and update comments to reflect current usage
0f18751 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Document ErrorReportValve's new property 'showReport' on the "security HowTO" page.
7f79151 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56463 Property for disabling server information is added to the DefaultServlet.
4ec992c Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492 Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its threads
ee1e4e2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56481 Work around case insensitivity issue in URLClassLoader
a42eafb - Fix possible (very rare) corruption doing keepalive after a Comet request. - Stop ignoring read pending exceptions.
ea33b07 - Add setTimeout, for handling of the upload timeout. - Cleanup.
af3cec6 Correct unit tests now EL Parser has been fixed to correctly parse "\$" as "$".
a69c40b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Additional tests and fixes Includes the following:
4b3b546 Correct the handling of back-slash escaping in the EL parser and no longer require that "\$" or "\#" must be followed by "{" in order for the back-slash escaping to take effect.
ea102d1 Document JspAttribute.isDynamic() and correct wrong value of this flag for "omit" attribute of <jsp:attribute> action.
3a0b913 Clarify
1973226 Drop useless null checks.
77a3610 Fix Javadoc warnings
a292b28 Need even larger writes to keep test happy on Windows VM
2bc8fad Increase length of text written so expected exception is triggered on client disconnect with NIO2.
8a70af8 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Reviewing r1587887: s/ attrs.getValue(i) / attributeValue / in the messages as well, so that the actual expression text that is processed is printed in the message.
67ec9da Fix broken link. I noted it when backporting r1519668 to TC7.
7b28ec8 Improving valves documentation. Move valves implementing an Authenticator into new section "Authentication".
f84cc53 Improving valves documentation. Move RemoteIpValve and SSLValve into new section "Proxies Support".
fbe13b9 Improving valves documentation. Wrap RemoteAddrValve and RemoteHostValve valves into a distinct section.
35996c8 Improving valves documentation. Wrap Access Logging valves into a distinct section.
5d126ee Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Document the new feature on the "security HowTO" page. Move error valve documentation lower in the valves list (access log valves and access control valves should be the first ones there).
b8d50a1 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Use non-empty title when both showServerInfo and showReport are false.
72da645 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Review of r1589994: - Reduce visibility of fields that have getter methods - Do not print <h3></h3> line if showServerInfo is turned off
94683a3 Review of r1590378: Simplify: instanceof operator does not-null check
d041cd5 Followup to r1590377 s/Wait/Waited/ and be more detailed
aac01a3 Since I looked at the traces, replace exception wrap with unwrap for IOException.
e8c6397 Cleanup the test output (mixing out and err is confusing), add some info and wait more (somehow NIO2 gets an exception later).
8ae6851 Correct a typo
70c1fac Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Follow-up to r1590300: Introduce a constant.
746aa1d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56441 Minor improvements for r1590285: Do not omit stacktrace on InvocationTargetException in a getter. Better wording for changelog.
9a82078 Correct formatting and a few minor typos. No substantial changes to the text.
886aa4b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Improve documentation, update changelog.
cad63cc Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Correct errors in StandardJarScanFilter documentation.
78f22fa Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Reviewing and fixing StandardJarScanFilter implementation: 1. Do not parse the same system property 3 times. Once per class is enough. 2. In check() method do not do defensive copying of HashMap for each jar name that we are filtering. It is unlikely that check() and setXxx() methods were called concurrently. If they were, then one can wait for the other to complete.
d87e68e Move filters into their own menu section in Documentation webapp.
aada00e Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Alternative implementation for the new values of FIPSMode option in AprLifecycleListener
912dff9 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56441 Raise the visibility of exceptions thrown when a problem is encountered calling a getter or setter on a component attribute from debug to warning.
1e8eddc Whitespace police
0ed51fb Follow-Up to r1590120: Simplify code by using Integer.compare(int, int) which is available since Java 1.7.
78639e9 Stop threads used for secure WebSocket client connections when they are no longer required and give them better names for easier debugging while they are running.
66642e9 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56425  Improve method matching for EL expressions. When looking for matching methods, an exact match between parameter types is preferred followed by an assignable match followed by a coercible match.
d8fc6df Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56418 Ensure that the Manager web application does not report success for a web application deployment that fails. Based on a patch by slaurent.
d93a871 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56458 Report WebSocket sessions that are created over secure connections as secure rather than as not secure.
766ff3d Add javadoc for AbstractReplicatedMap ctr parameters added in r1498820 That feature is controlled via "terminateOnStartFailure" option of BackupManager.
50311be Add new constant missed in previous commit
fa6e9ff A quotation mark is missing.
5aae132 More defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak.
3a625da Return the type attribute in the <style>. Removed by mistake with the previous commit.
ebe5c16 Parser uses lazy init so move creation of parser inside the block that uses the container class loader.
ad3b34a Fix indents and copy/paste errors
5517c55 More defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak.
4132b15 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Properties for disabling server information and error report are added to the o.a.catalina.valves.ErrorReportValve. Based on the patch provided by Nick Bunn.
2c4c0ce More refactoring to reduce code duplication.
769477b Add some defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak.
e31233a Refactoring to reduce code duplication.
93930c1 Fix text
d3984d6 Minor optimisation
edf07ef Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56416 Document correct default for socket linger.
8dda192 Revert 1589666. Default linger setting is required.
aa563a0 With the linger change, I am now getting async close exceptions on the accept on shutdown. Ignore exceptions when not running and cleanup.
6388d56 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56382 Add information about finished deployment and its execution time to the logs. Patch provided by Danila Galimov.
6764c16 Fixed broken links to java.sun.com. Issue reported via comments.apache.org
3d17772 Align the AJP and HTTP connector implementations with the documented behaviour and use JVM defaults for socket linger.
5211679 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56430 Extend checks for suspicious URL patterns to include patterns of the form <code>*.a.b</code> which are not valid patterns for extension mappings.
b386759 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56449 When creating a new session, add the message handlers to the session before calling Endpoint.onOpen() so the message handlers are in place should the onOpen() method trigger the sending of any messages.
3a43ebb Whitespace police
e2de5a3 Add session ID to the exception message to aid debugging.
3855c7d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56348 Fix slow async reads on non-container thread. Align code with APR. Ensure that selector is woken up when a socket is registered for a new event
a63c63e Disable SSL renegotiation test for NIO
7012937 Do 10 requests even if the listener is complete, to check if everything is still fine after the handshake.
d1c438b Additional information for debugging the test: log on which iteration it failed.
65f2c92 Windows OK. Seeing failures on Linux - add debug code.
9169faa Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 Re-write renegotiation test to test that renegotiation works rather than to test that an exception is not triggered it it is attempted.
617c217 Restore accidently commented out code
97c967d Tomcat 8 uses Java 7 where RFC 5746 is supported in all versions so remove unused/unnecessary code.
36880ca Correct a typo Add changelog entry for Tomcat Native upgrade
0b3aac0 Reviewing r1589103 s/J2EE/JavaEE/ in a message
81d79b0 Whitespace police
970cd9f Update changelog
4444768 Ensure that threads created to support WebSocket clients are stopped when those clients no longer need them. Note that while this happens automatically for WebSocket client calls made by web applications, stand-along clients must call the Tomcat specific method WsWebSocketContainer.destroy().
2653cea Refactor server container shutdown into the destroy method Destroy the thread group on shutdown Log a warning if the thread group can't be destroyed
578a06c WebSocket has own section in changelog.
01ccd26 Increase the default maximum size of the executor used for async writes
0ca96a0 When not inline, do not use a new thread since the completion handler is already run in a new thread.
e870287 Minor flush tweaks.
fb073db Allow some method override since it is a bit too convoluted with NIO2.
3c4ffb8 Update Javadoc, as addValve/removeValve methods belong to Pipeline.
d7db4dd Simplify code (apparently unused parameters and methods).
ff5973f Followup to r1588299: svn:eol-style=native
aacc874 - The input buffer is the place where there was code duplication between the two NIO connectors. Resolve that, there should now be no meaningful code duplication elsewhere. - Note that the NIO2 code is the one shared (some additional "1" state for the parsing state - should be transparent for NIO - and use flush(boolean) in the shared code). - Testsuite for NIO and NIO 2 looks ok.
ddf7c54 Avoid StackOverflowError on non-Windows systems if a file named '\' is encountered when scanning for TLDs.
999ca93 Modify generic exception handling so that StackOverflowError is not treated as a fatal error and can handled and/or logged as required.
279b859 Update changelog
c73c2e4 Ensure <th> elements have the same text-align property on every browser.
ce70ee6 Small optimisation. The resolver and the factory are only used when running under a security manager so only load them in this case. Also avoid a possible memory leak when creating these objects.
804fec8 Whitespace police
1a18e3f Fix an Eclipse nag
818bd66 Update changelog
4a16365 Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 Fixes the locking of a JAR file when obtaining last modified time of a TLD within the JAR
cd1379b Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 Fixes locking of JARs that do not contain TLDs.
9e92678 Improve implementation of Lifecycle for WebappClassLoader. State is now correctly reported rather than always reporting as NEW.
ead3f7c Better debugging. Makes it clear if one listener or all listeners failed.
e40e3c0 Fix test failures
3a07e07 Add i18n error messages
c35249b Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
613820e Remove duplicated lines
4dcd0d3 Fixed documentation, added changelog.
74e5527 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Add more nuanced support for entering/requiring FIPS mode when using APR connector.
061ea26 Updated required version of tcnative to 1.1.30.
ad3020e Print a warning in case if neither server nor client jvm is found by service.bat. Fix comments (addresses sebb's note in "Re: r1000718").
ec14c3f Align DisplayName of Tomcat service installed by service.bat with one installed by the *.exe installer: Use "X.0" version number in both instead of "X".
50c85de Followup to r1586897 : Apply the same not-null optimization to removeAttributeChangeNotificationListener method.
e7f76ff Improve a bit the changelog.
8d12005 Correct message displayed by service.bat for an invalid command.
d2e1e4f Remove debug code
0a5bb1f Align with 7.0.x
43048bd Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56405 Restore directory listings
c711f65 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55483#c4 Return exact match as soon as it is found. Note without the change the same method is returned it just takes a little longer
008fe78 svn:eol-style = native
c40d58d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56369 Ensure that removing an MBean notification listener reverts all the operations performed when adding an MBean notification listener.
f8a4481 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Correct double backslash escaping in attributes
1dea9f3 Since nobody apparently objects, and with the testsuite passing 100% very reliably, upgrade NIO2 to beta.
a4eefef - Possible SSL NIO2 fixes for gather (if there are more than two buffers, which doesn't really happen) and incomplete netOutBuffer writes (which also shouldn't happen). - Try again the SSL test, just in case.
a0a1616 Correct windows-service-howto.xml according to Apache Commons Daemon procrun documentation. E.g. the default value for LogPath option was documented incorrectly.
5546f32 Replace double space with single one.
253e870 Ensure that the static resource cache is able to detect when a cache entry is invalidated by being overridden by a new resource in a different WebResourceSet
ad43712 Does not fix the testsuite run, so revert.
864c7d5 - Add possibly missing notification. - Try again the SSL websocket test, will revert the commit if not fixed.
954511d Fix Javadoc warning
fda29fd Correct a typo
9dd0299 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Simplify file name matching code in StandardJarScanFilter.
70af3aa Minor cleanups, improve logic (less returns) and possibly fix a scenario where failed could be called twice in SSL.
e3d99f1 Fix the logic (although it shouldn't actually cause any issue).
0ac6f7f Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56327 Enable AJP as well as HTTP connectors to be created via JMX. Patch by kiran.
8c0b14b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56343 Avoid NPE if WebSocket API JAR from RI is used.
8c53cd7 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56339 Avoid an infinite loop if an application calls session.invalidate() from the session destroyed event for that session.
e275520 Fix trigger of the read event (so registerForEvent is actually useful).
70c82a9 Port i18n to the NIO1 connector, for consistency.
501dfa4 Code cleanups and i18n in NIO2.
e891a47 changelog for r1584507.
9c89a23 Set null rather than this.
5150ca8 Simplify the code of o.a.c.ha.tcp.SimpleTcpCluster. In order to add or remove cluster valve to Container, use pipeline instead of IntrospectionUtils.
4a1399c ois is closed in finally block - no need to close it in catch blocks as well.
e76786e Revert changes from r1581820 as it triggers an IOE
8605533 Move to org.apache.catalina.ha.session.ClusterManagerBase common logics of org.apache.catalina.ha.session.BackupManager and org.apache.catalina.ha.session.DeltaManager.
9c1acf2 Remove the unnecessary cross context check. It does not matter whether the context that is referenced by other context is set to crossContext=true. The context that refers to the different context must be set to crossContext=true.
27e0ab6 Add support for cross context session replication to BackupManager.
79ee452 Remove cluster and replicationValve from cluster manager template. These instance are not necessary to template.
52e434a Still failed.
a0dbbe5 - Handle incomplete writes as it is very easy to do, just in case (it never happens for me though). - Try again that SSL test.
156791f Remove useless methods.
6f12e3e 56336: Fix apparent AJP output issue [untested and unverified, no test case].
11ec562 Cleanup waiting async connections on shutdown, to avoid any abrupt close if everything is well behaved.
60a3832 Remove the implementation of org.apache.catalina.LifecycleListener from org.apache.catalina.ha.tcp.SimpleTcpCluster. SimpleTcpCluster does not work as LifecycleListener, it works as nested components of Host or Engine.
4587d33 Add release date
74ed41d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56321 hen a WAR is modified, undeploy the web application before deleting any expanded directory as the undeploy process may refer to classes that need to be loaded from the expanded directory. If the expanded directory is deleted first, any attempt to load a new class during undeploy will fail.
f5fe620 Restore optimisation removed in r1549711 Refactor so InputStream is never opened if sendfile is used Add lots of comments
06db876 Clean-up. No functional change.
e453cec Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56320 Fix fd leak when sendfile is used
d63aff9 Whitespace police
dbb3260 Ensure that "name" request parameter is used as a application base of host if "webapps" request parameter is not set when adding host in HostManager Application.
eba7297 Add Support for copyXML attribute of Host to Host Manager.
267ed14 Update changelog for try-with-resources
f3aa45d Complete first pass of try-with-resources
c9920b8 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1582009 13f79535-47bb-0310-9956-ffa450edef68
f22976e More try-with-resources
0b7354e More try-with-resources
48cb3d9 Locks should be outside try/finally
c43da6e Locks should be outside try/finally
83494e2 More try-with-resources
4fc8eaf Locks should be outside try/finally
43f7c97 Locks should be outside try/finally
76da780 More try-with-resources
1f2c1d8 More try-with-resources
a82b875 Fix Javadoc
031b525 More try-with-resources
900d77a More try-with-resources
96b5a35 - Remove useless IOE on flush. - Remove nearly all extra fields from the socket wrapper.
f9a87dd Update with progress
9ba73eb Code review - use multicatch to reduce code duplication - use Util.handleThrowable() to reduce code duplication
a6ce9cf Code review - lock outside try/catch/finally
a717e79 Review changes
a882c87 Another package
54f5caf Update progress
cc30938 try with resources
d029ca8 try with resources
5e9e013 Try with resources
303fdec Lock outside try/catch/finally
0894712 Lock ouside try/catch/finally
3330bbb Lock outside try/catch/finally
3fb1f45 try with resources
959e968 Try with resources for javax.*
2d88a11 Locks should be outside try/catch/finally block.
115e8cc Fix Java 8 compatibility (order of elements is reversed, which does not seem wrong, it is probably undefined).
6d3c686 Refactor - remove unnecessary null check - use try-with-resources
0c61ee8 Fix extension validation for the new resources implementation
2f09f15 Specify that Apache Ant version 1.8.2 or later is required for building Tomcat.
3da9772 8.0.4 didn't make it
096f1cf Prep for next release.
8f6579d Another unit test run failure on OSX and a more careful review. Handle the case where timeout completes request before the Runnable's error handling does.
fc8fd23 Review after unexpected failed test on OSX - completed needs to be volatile - prevent infinite loop
f6df9f3 Whitespace police
8cb57c5 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56304 WebSocket + BIO HTTP + Production = bad idea
7bbefb6 Fix bug in example
ff43767 Fix typos spotted by Cyril Bonté.
6fac310 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56293 Cache resources loaded by the class loader from /META-INF/services/ for better performance for repeated look ups.
7d65bbf Minor clean-up
8861e05 Allow web applications to package tomcat-jdbc.jar and their JDBC driver of choice in the web application.
dd6e68b Add the bug reference.
b750840 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56273 If the Manager web application does not perform an operation because the web application is already being serviced, report an error rather than reporting success.
4d7ab12 Make exception handling more robust - review by remm.
79263fa Fix changelog
40e58dc Rework the fix for 56190 as the previous fix did not recycle the request in all cases leading to mis-routing of requests.
abce6d7 Remove more unused code. Reduce visibility of static fields
c995a1a Remove unused code.
ceafec5 Forgot to check the return value for blocking writes as all other places do, oops (some platforms could be returning a negative value after a disconnect rather than throw an exception).
22fa799 Improve trigger of the onWritePossible notification.
07d4063 - Actually follow the instructions on proper NIO2 shutdown. Much cleaner indeed. - The downside is that the executor is exclusive to the thread group (no way around this), so it cannot be shared with other connectors. - Add a warning if using a shared executor.
72da3ac Improve test so that it cannot hang forever (it will check it gets an exception and completed, instead).
895d5cd Fix time in test (oops).
2c722ec Add missing clear after writing the buffers (in practice this shouldn't be needed though). If an exception occurs the response will be recycled so no need for a finally.
e136bd0 - Reliably allow blocking following non blocking if some flushing is needed on end. - Use debug log level in case of a rejected execution, which can occur on shutdown.
c905c6f Handle possible status line i18n in tests.
9fea3bf Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54475 Add Java 8 support to SMAP generation for JSPs. Patch by Robbie Gibson.
b3df2fe Prep for next release
bb5112b whitespace police
62d2aa6 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56283 Add issue number for r1579174
8d405bd Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56265 Do not escape values of dynamic tag attributes containing EL expressions Patch by kkolinko
e90f48d Update JDT to P20140317-1600 to add Java 8 support and enable "1.8" as a valid option for source and target JVM versions for JSPs.
231af58 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1579170 13f79535-47bb-0310-9956-ffa450edef68
66cee30 Followup to r1578260 Amend javadoc for the new option. Move Ant task changes from "Web applications" to "Other" section of changelog.
00a1f65 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56268 Specify the default value of the ${build} in the build section.
0cadfb8 Fix properties
fffd63a Fix possible overflow when parsing long values from a byte array.
313ba52 Corrected link to Tomcat 8.0 documentation. Issue is reported via comments at apache.org
1ab2a5a Update changelog
913d94b Prevent user supplied XSLTs from defining external entities
970c23b Redefine globalXsltFile as relative to CATALINA_BASE/conf or CATALINA_HOME/conf
03d1f33 Whitespace police
8884dae Correct regression introduced in 8.0.0-RC2 as part of the Servlet 3.1 non-blocking IO support that broke handling of requests with an explicit content length of zero.
f646a5a Improve processing of chuck size from chunked headers. Avoid overflow and use a bit shift instead of a multiplication as it is marginally faster.
e8cc1e6 Make upload process more robust. If upload fails and it was going to update an existing WAR, don't remove the existing WAR.
79c2a5d Review from kkolinko The filename of a tagged war file should be  versioned + tag + baseName.war.  The "tag" part was lost.
39f694b Add the option to ignore the constraint of the first line of the response message that must be "OK -". Default is false.
499ad3b Implement org.apache.catalina.ant.VminfoTask, org.apache.catalina.ant.ThreaddumpTask and org.apache.catalina.ant.SslConnectorCiphersTask.
8a3cb6f Add definition of org.apache.catalina.ant.FindLeaksTask.
73ebfd8 Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
8a7744f Clean an IDE warning about unthrown exception. Since r1577757 the setSSLEngine() method is a pure setter, it no longer calls reset() and no longer throws an IOException.
c467264 Followup to r1577831 Clarify the new socket.directSslBuffer option.
d3cd026 Followup to r1576628: correct typo in a message
b98b7d3 Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
5c35790 - Cleanup and prefer non direct buffers for SSL by default (32KB of direct buffers per connection looks a bit too much). - Give up on the SSL test for now.
b93291d Implement the read/write pending contract in the SSL channel (not doing so would likely still trigger the exception, but would add corruption).
9eea841 Properly delete %TEMP%/ser{number}.tmp temporary file that was used to test serialization of a Principal.
74d4d2c 1. Do not hardcode the path to output directory. It can be controlled via build.properties. 2. Cleanup after the test.
44ad7f4 Make sure the byte buffer passed as a parameter is used in all read/write operations (come code is from the NIO1 which forces using the main read/write buffers).
4c057bf Correct typo in the message
432e8ec Add missing code to retry if no bytes are written (handshake) like for blocking IO, and use EOFException instead.
5a436bc Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
1d9c1ba Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
2022777 Improve the FutureWrite logic so that writing starts when creating it, and then will recurse on get until the content is actually written.
9a05595 Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
1d59d9d Experiment some more with this test and NIO2 (sorry for the noise).
f29331a Add a couple more tests based on a report on the users list (There tests pass, the problem looks to be elsewhere)
1cf1508 Start harmonizing exception types (todo: same thing for completion handlers).
c8d8cf7 Fix trailing whitespace. Sorry for the noise.
2befbbd Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56236 Add issue number
5534eed Review by kkolinko Avoid adding nulls to the map Log a warning for problems in addSelf() as well as add()
fda374f With the writeLock in use in the superclass, remove the useless extra locking (after testing).
b03c75b Simplify
6cdad68 Enable Tomcat to work in a OSGI environment with alternative Servlet and JSP API JARs.
149e5aa Whitespace police
87b3f16 Clean-up / consistency
c8cf65c Correct some errors in r1577182
1f9b47e Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56248 Allow the deployer to update an existing WAR file without undeploying the existing application if the update flag is set. This allows any existing custom context.xml for the application to be retained. To update an application and remove any existing context.xml simply undeploy the old version of the application before deploying the new version.
4ff8248 Disable SSL websocket "firehose" test for now on NIO2, since a legitimate explanation for the failure has been found.
ce1de3f Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56253 When listing resources that are provided by a JAR, fix possible StringIndexOutOfBoundsExceptions. Add some unit tests for this and similar scenarios and fix the additional issues those unit tests identified. Based on a patch by Larry Isaacs.
8ea00e6 Reduce calls to getManager(). (That is not a simple getter, but it performs some locking).
6152635 Set eol prop.
b6a3bcc Remove unused imports
1d5aa34 The test now uses too much memory for the test server, so split it SSL / non SSL.
1429c2a Better Javadoc
f9b55b4 Correct comment

git-subtree-dir: apache-el/src/main
git-subtree-split: adc36cf7ab36303dc1d8eb2fa7e516a76167f518
Merge commit '8663a8572f694968a92533f3ddb1b36b909abb74'

Conflicts:
	apache-el/src/main/BUILDING.txt
	apache-el/src/main/SVN-MERGE.txt
	apache-el/src/main/TOMCAT-NEXT.txt
	apache-el/src/main/bin/service.bat
	apache-el/src/main/build.properties.default
	apache-el/src/main/build.xml
	apache-el/src/main/conf/catalina.properties
	apache-el/src/main/conf/web.xml
	apache-el/src/main/java/javax/servlet/http/Cookie.java
	apache-el/src/main/java/org/apache/catalina/Container.java
	apache-el/src/main/java/org/apache/catalina/Context.java
	apache-el/src/main/java/org/apache/catalina/Server.java
	apache-el/src/main/java/org/apache/catalina/ant/AbstractCatalinaTask.java
	apache-el/src/main/java/org/apache/catalina/ant/antlib.xml
	apache-el/src/main/java/org/apache/catalina/ant/catalina.tasks
	apache-el/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java
	apache-el/src/main/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
	apache-el/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
	apache-el/src/main/java/org/apache/catalina/connector/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/connector/OutputBuffer.java
	apache-el/src/main/java/org/apache/catalina/connector/Request.java
	apache-el/src/main/java/org/apache/catalina/connector/Response.java
	apache-el/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java
	apache-el/src/main/java/org/apache/catalina/core/AprLifecycleListener.java
	apache-el/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
	apache-el/src/main/java/org/apache/catalina/core/ContainerBase.java
	apache-el/src/main/java/org/apache/catalina/core/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/core/NamingContextListener.java
	apache-el/src/main/java/org/apache/catalina/core/StandardContext.java
	apache-el/src/main/java/org/apache/catalina/core/StandardEngine.java
	apache-el/src/main/java/org/apache/catalina/core/StandardHost.java
	apache-el/src/main/java/org/apache/catalina/core/StandardServer.java
	apache-el/src/main/java/org/apache/catalina/core/StandardThreadExecutor.java
	apache-el/src/main/java/org/apache/catalina/core/StandardWrapper.java
	apache-el/src/main/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
	apache-el/src/main/java/org/apache/catalina/deploy/NamingResourcesImpl.java
	apache-el/src/main/java/org/apache/catalina/ha/session/BackupManager.java
	apache-el/src/main/java/org/apache/catalina/ha/session/ClusterManagerBase.java
	apache-el/src/main/java/org/apache/catalina/ha/session/DeltaManager.java
	apache-el/src/main/java/org/apache/catalina/ha/session/DeltaSession.java
	apache-el/src/main/java/org/apache/catalina/ha/tcp/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
	apache-el/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
	apache-el/src/main/java/org/apache/catalina/loader/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/loader/LocalStrings_es.properties
	apache-el/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
	apache-el/src/main/java/org/apache/catalina/loader/WebappLoader.java
	apache-el/src/main/java/org/apache/catalina/manager/HTMLManagerServlet.java
	apache-el/src/main/java/org/apache/catalina/manager/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/manager/ManagerServlet.java
	apache-el/src/main/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
	apache-el/src/main/java/org/apache/catalina/manager/host/HostManagerServlet.java
	apache-el/src/main/java/org/apache/catalina/manager/host/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/mapper/Mapper.java
	apache-el/src/main/java/org/apache/catalina/mapper/MappingData.java
	apache-el/src/main/java/org/apache/catalina/mbeans/ServiceMBean.java
	apache-el/src/main/java/org/apache/catalina/realm/DataSourceRealm.java
	apache-el/src/main/java/org/apache/catalina/realm/JAASCallbackHandler.java
	apache-el/src/main/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
	apache-el/src/main/java/org/apache/catalina/realm/JDBCRealm.java
	apache-el/src/main/java/org/apache/catalina/security/SecurityClassLoad.java
	apache-el/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
	apache-el/src/main/java/org/apache/catalina/servlets/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/session/FileStore.java
	apache-el/src/main/java/org/apache/catalina/session/JDBCStore.java
	apache-el/src/main/java/org/apache/catalina/session/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/session/LocalStrings_es.properties
	apache-el/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties
	apache-el/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties
	apache-el/src/main/java/org/apache/catalina/session/StandardManager.java
	apache-el/src/main/java/org/apache/catalina/session/StandardSession.java
	apache-el/src/main/java/org/apache/catalina/startup/Catalina.java
	apache-el/src/main/java/org/apache/catalina/startup/ContextConfig.java
	apache-el/src/main/java/org/apache/catalina/startup/ExpandWar.java
	apache-el/src/main/java/org/apache/catalina/startup/FailedContext.java
	apache-el/src/main/java/org/apache/catalina/startup/HostConfig.java
	apache-el/src/main/java/org/apache/catalina/startup/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/startup/Tomcat.java
	apache-el/src/main/java/org/apache/catalina/storeconfig/StandardContextSF.java
	apache-el/src/main/java/org/apache/catalina/storeconfig/StoreConfig.java
	apache-el/src/main/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
	apache-el/src/main/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
	apache-el/src/main/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
	apache-el/src/main/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
	apache-el/src/main/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
	apache-el/src/main/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
	apache-el/src/main/java/org/apache/catalina/tribes/transport/nio/NioSender.java
	apache-el/src/main/java/org/apache/catalina/users/MemoryUserDatabase.java
	apache-el/src/main/java/org/apache/catalina/util/ExtensionValidator.java
	apache-el/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
	apache-el/src/main/java/org/apache/catalina/valves/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
	apache-el/src/main/java/org/apache/catalina/valves/mbeans-descriptors.xml
	apache-el/src/main/java/org/apache/catalina/valves/rewrite/RewriteValve.java
	apache-el/src/main/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
	apache-el/src/main/java/org/apache/catalina/webresources/CachedResource.java
	apache-el/src/main/java/org/apache/catalina/webresources/JarResourceRoot.java
	apache-el/src/main/java/org/apache/catalina/webresources/LocalStrings.properties
	apache-el/src/main/java/org/apache/catalina/webresources/StandardRoot.java
	apache-el/src/main/java/org/apache/coyote/AbstractProcessor.java
	apache-el/src/main/java/org/apache/coyote/Adapter.java
	apache-el/src/main/java/org/apache/coyote/AsyncContextCallback.java
	apache-el/src/main/java/org/apache/coyote/AsyncStateMachine.java
	apache-el/src/main/java/org/apache/coyote/Request.java
	apache-el/src/main/java/org/apache/coyote/Response.java
	apache-el/src/main/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
	apache-el/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java
	apache-el/src/main/java/org/apache/coyote/ajp/AjpNio2Processor.java
	apache-el/src/main/java/org/apache/coyote/ajp/AjpNioProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/AbstractHttp11Processor.java
	apache-el/src/main/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
	apache-el/src/main/java/org/apache/coyote/http11/AbstractInputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/AbstractOutputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11Nio2Processor.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11Nio2Protocol.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11Processor.java
	apache-el/src/main/java/org/apache/coyote/http11/Http11Protocol.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalAprInputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalInputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
	apache-el/src/main/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
	apache-el/src/main/java/org/apache/coyote/http11/filters/VoidInputFilter.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/AprProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/BioProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/NioProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
	apache-el/src/main/java/org/apache/coyote/spdy/SpdyProcessor.java
	apache-el/src/main/java/org/apache/jasper/compiler/Compiler.java
	apache-el/src/main/java/org/apache/jasper/compiler/ELFunctionMapper.java
	apache-el/src/main/java/org/apache/jasper/compiler/ELParser.java
	apache-el/src/main/java/org/apache/jasper/compiler/Generator.java
	apache-el/src/main/java/org/apache/jasper/compiler/JDTCompiler.java
	apache-el/src/main/java/org/apache/jasper/compiler/JavacErrorDetail.java
	apache-el/src/main/java/org/apache/jasper/compiler/JspDocumentParser.java
	apache-el/src/main/java/org/apache/jasper/compiler/Node.java
	apache-el/src/main/java/org/apache/jasper/compiler/ParserController.java
	apache-el/src/main/java/org/apache/jasper/compiler/ServletWriter.java
	apache-el/src/main/java/org/apache/jasper/compiler/SmapUtil.java
	apache-el/src/main/java/org/apache/jasper/compiler/TagPluginManager.java
	apache-el/src/main/java/org/apache/jasper/compiler/TldCache.java
	apache-el/src/main/java/org/apache/jasper/compiler/Validator.java
	apache-el/src/main/java/org/apache/jasper/resources/LocalStrings.properties
	apache-el/src/main/java/org/apache/jasper/servlet/JasperInitializer.java
	apache-el/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
	apache-el/src/main/java/org/apache/jasper/servlet/TldScanner.java
	apache-el/src/main/java/org/apache/jasper/util/ExceptionUtils.java
	apache-el/src/main/java/org/apache/juli/FileHandler.java
	apache-el/src/main/java/org/apache/juli/logging/LogFactory.java
	apache-el/src/main/java/org/apache/naming/ContextAccessController.java
	apache-el/src/main/java/org/apache/naming/ContextBindings.java
	apache-el/src/main/java/org/apache/naming/factory/EjbFactory.java
	apache-el/src/main/java/org/apache/naming/factory/ResourceEnvFactory.java
	apache-el/src/main/java/org/apache/naming/factory/ResourceFactory.java
	apache-el/src/main/java/org/apache/naming/factory/TransactionFactory.java
	apache-el/src/main/java/org/apache/tomcat/buildutil/CheckEol.java
	apache-el/src/main/java/org/apache/tomcat/jni/SSL.java
	apache-el/src/main/java/org/apache/tomcat/util/ExceptionUtils.java
	apache-el/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/Constants.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/Code.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/Constant.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/classfile/Utility.java
	apache-el/src/main/java/org/apache/tomcat/util/bcel/package.html
	apache-el/src/main/java/org/apache/tomcat/util/bcel/util/package.html
	apache-el/src/main/java/org/apache/tomcat/util/buf/Ascii.java
	apache-el/src/main/java/org/apache/tomcat/util/buf/Utf8Decoder.java
	apache-el/src/main/java/org/apache/tomcat/util/codec/binary/Base64.java
	apache-el/src/main/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/Constants.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/LocalStrings.properties
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/web/ApplicationListener.java
	apache-el/src/main/java/org/apache/tomcat/util/file/Matcher.java
	apache-el/src/main/java/org/apache/tomcat/util/http/CookieSupport.java
	apache-el/src/main/java/org/apache/tomcat/util/http/SetCookieSupport.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
	apache-el/src/main/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
	apache-el/src/main/java/org/apache/tomcat/util/http/parser/HttpParser.java
	apache-el/src/main/java/org/apache/tomcat/util/http/parser/MediaType.java
	apache-el/src/main/java/org/apache/tomcat/util/http/parser/MediaTypeCache.java
	apache-el/src/main/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
	apache-el/src/main/java/org/apache/tomcat/util/modeler/NotificationInfo.java
	apache-el/src/main/java/org/apache/tomcat/util/modeler/OperationInfo.java
	apache-el/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java
	apache-el/src/main/java/org/apache/tomcat/util/net/Nio2Channel.java
	apache-el/src/main/java/org/apache/tomcat/util/net/Nio2Endpoint.java
	apache-el/src/main/java/org/apache/tomcat/util/net/NioBlockingSelector.java
	apache-el/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
	apache-el/src/main/java/org/apache/tomcat/util/net/SecureNio2Channel.java
	apache-el/src/main/java/org/apache/tomcat/util/net/SecureNioChannel.java
	apache-el/src/main/java/org/apache/tomcat/util/net/SocketProperties.java
	apache-el/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
	apache-el/src/main/java/org/apache/tomcat/util/net/res/LocalStrings.properties
	apache-el/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
	apache-el/src/main/java/org/apache/tomcat/util/scan/Jar.java
	apache-el/src/main/java/org/apache/tomcat/util/scan/StandardJarScanFilter.java
	apache-el/src/main/java/org/apache/tomcat/util/security/PrivilegedGetTccl.java
	apache-el/src/main/java/org/apache/tomcat/util/threads/TaskThread.java
	apache-el/src/main/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
	apache-el/src/main/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
	apache-el/src/main/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
	apache-el/src/main/java/org/apache/tomcat/websocket/LocalStrings.properties
	apache-el/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
	apache-el/src/main/java/org/apache/tomcat/websocket/WsSession.java
	apache-el/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
	apache-el/src/main/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
	apache-el/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
	apache-el/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
	apache-el/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
	apache-el/src/main/java/org/apache/tomcat/websocket/server/LocalStrings.properties
	apache-el/src/main/java/org/apache/tomcat/websocket/server/WsContextListener.java
	apache-el/src/main/java/org/apache/tomcat/websocket/server/WsServerContainer.java
	apache-el/src/main/modules/jdbc-pool/doc/jdbc-pool.xml
	apache-el/src/main/res/checkstyle/org-import-control.xml
	apache-el/src/main/res/findbugs/filter-false-positives.xml
	apache-el/src/main/res/ide-support/eclipse/eclipse.classpath
	apache-el/src/main/res/ide-support/netbeans/nb-tomcat-build.properties
	apache-el/src/main/res/ide-support/netbeans/project.xml
	apache-el/src/main/res/maven/mvn.properties.default
	apache-el/src/main/res/maven/tomcat-embed-jasper.pom
	apache-el/src/main/res/maven/tomcat-jasper.pom
	apache-el/src/main/res/rat/rat-excludes.txt
	apache-el/src/main/res/tomcat.nsi
	apache-el/src/main/test/javax/el/TestELProcessor.java
	apache-el/src/main/test/javax/el/TestResourceBundleELResolver.java
	apache-el/src/main/test/javax/el/TestUtil.java
	apache-el/src/main/test/javax/servlet/http/TestCookie.java
	apache-el/src/main/test/javax/servlet/http/TestCookieStrict.java
	apache-el/src/main/test/org/apache/catalina/comet/TestCometProcessor.java
	apache-el/src/main/test/org/apache/catalina/connector/TestCoyoteAdapter.java
	apache-el/src/main/test/org/apache/catalina/connector/TestMaxConnections.java
	apache-el/src/main/test/org/apache/catalina/connector/TestRequest.java
	apache-el/src/main/test/org/apache/catalina/core/TestStandardContext.java
	apache-el/src/main/test/org/apache/catalina/core/TestStandardContextResources.java
	apache-el/src/main/test/org/apache/catalina/core/TesterContext.java
	apache-el/src/main/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
	apache-el/src/main/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
	apache-el/src/main/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
	apache-el/src/main/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
	apache-el/src/main/test/org/apache/catalina/servlets/TestDefaultServlet.java
	apache-el/src/main/test/org/apache/catalina/startup/SimpleHttpClient.java
	apache-el/src/main/test/org/apache/catalina/startup/TestTomcat.java
	apache-el/src/main/test/org/apache/catalina/startup/TomcatBaseTest.java
	apache-el/src/main/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
	apache-el/src/main/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
	apache-el/src/main/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
	apache-el/src/main/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
	apache-el/src/main/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
	apache-el/src/main/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
	apache-el/src/main/test/org/apache/el/TestELEvaluation.java
	apache-el/src/main/test/org/apache/el/TestELInJsp.java
	apache-el/src/main/test/org/apache/el/TestValueExpressionImpl.java
	apache-el/src/main/test/org/apache/jasper/TestJspC.java
	apache-el/src/main/test/org/apache/jasper/compiler/TestELParser.java
	apache-el/src/main/test/org/apache/jasper/compiler/TestGenerator.java
	apache-el/src/main/test/org/apache/jasper/compiler/TestParser.java
	apache-el/src/main/test/org/apache/tomcat/util/buf/TestUtf8.java
	apache-el/src/main/test/org/apache/tomcat/util/http/TestSetCookieSupport.java
	apache-el/src/main/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
	apache-el/src/main/test/org/apache/tomcat/util/http/parser/TestMediaType.java
	apache-el/src/main/test/org/apache/tomcat/util/net/TestClientCert.java
	apache-el/src/main/test/org/apache/tomcat/util/net/TestCustomSsl.java
	apache-el/src/main/test/org/apache/tomcat/util/net/TestSsl.java
	apache-el/src/main/test/org/apache/tomcat/util/net/TesterSupport.java
	apache-el/src/main/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
	apache-el/src/main/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
	apache-el/src/main/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
	apache-el/src/main/test/webapp/WEB-INF/bug53545.tld
	apache-el/src/main/test/webapp/WEB-INF/bugs.tld
	apache-el/src/main/test/webapp/WEB-INF/tags/bug55198.tagx
	apache-el/src/main/test/webapp/bug45nnn/bug45451.jspf
	apache-el/src/main/test/webapp/bug5nnnn/bug53545.html
	apache-el/src/main/test/webresources/dir2/d1/.ignore-me.txt
	apache-el/src/main/webapps/docs/aio.xml
	apache-el/src/main/webapps/docs/changelog.xml
	apache-el/src/main/webapps/docs/config/ajp.xml
	apache-el/src/main/webapps/docs/config/context.xml
	apache-el/src/main/webapps/docs/config/engine.xml
	apache-el/src/main/webapps/docs/config/executor.xml
	apache-el/src/main/webapps/docs/config/globalresources.xml
	apache-el/src/main/webapps/docs/config/host.xml
	apache-el/src/main/webapps/docs/config/http.xml
	apache-el/src/main/webapps/docs/config/jar-scan-filter.xml
	apache-el/src/main/webapps/docs/config/jar-scanner.xml
	apache-el/src/main/webapps/docs/config/listeners.xml
	apache-el/src/main/webapps/docs/config/project.xml
	apache-el/src/main/webapps/docs/config/systemprops.xml
	apache-el/src/main/webapps/docs/config/valve.xml
	apache-el/src/main/webapps/docs/default-servlet.xml
	apache-el/src/main/webapps/docs/deployer-howto.xml
	apache-el/src/main/webapps/docs/funcspecs/fs-admin-apps.xml
	apache-el/src/main/webapps/docs/funcspecs/fs-jdbc-realm.xml
	apache-el/src/main/webapps/docs/funcspecs/fs-jndi-realm.xml
	apache-el/src/main/webapps/docs/images/docs-stylesheet.css
	apache-el/src/main/webapps/docs/jndi-datasource-examples-howto.xml
	apache-el/src/main/webapps/docs/jndi-resources-howto.xml
	apache-el/src/main/webapps/docs/logging.xml
	apache-el/src/main/webapps/docs/realm-howto.xml
	apache-el/src/main/webapps/docs/security-howto.xml
	apache-el/src/main/webapps/docs/security-manager-howto.xml
	apache-el/src/main/webapps/docs/tribes/introduction.xml
	apache-el/src/main/webapps/docs/web-socket-howto.xml
	apache-el/src/main/webapps/docs/windows-service-howto.xml
	apache-el/src/main/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java
	apache-el/src/main/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
Squashed 'apache-jsp/src/main/' changes from d9a7077..adc36cf

adc36cf Formatting.
00eb735 Refactoring. Switch from a boolean to an Enum for error state so we can differentiate between an error that requires the connection is closed after the current response is completed and an error that requires that the connection is closed immediately. This commit should be a NO-OP. While the different error states are set, the only the presence of an error (or not) is tested - i.e. no change from the implementation prior to this commit. Try to be consistent when an error occurs. Set the status code first (if required), then set the error state and finally log (if required).
84388c0 Clean-up
68046fa Add a (currently disabled) test for errors with a chunked response after the response has been committed.
d9c49e3 https://issues.apache.org/bugzilla/show_bug.cgi?id=56582#c1 Implement DISPATCH_EXECUTE action for AJP connector.
2501e4a Tiny bit of de-duplication. Add reference to RFC2616 for case insensitivity of transfer encoding names.
8c8ee41 Reduce duplicate by moving error handling into addInputFilter. Also makes error handling consistent. Reduce visibility of addInputFilter()
1477d58 Align code with comment and use a 500 response (internal server error) as per the comment rather than a 400 response.
80a63d0 As per RFC2616, an unknown expect header should result in a 417 response.
0ef06bb Tweak comments
92080bf Pull up error flag
e451d48 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56582 Convert implementations of ActionHook.action(..) to use switch(enum) operator. Third and the last part: AJP processors.
8fe3fe1 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56582 Convert implementations of ActionHook.action(..) to use switch(enum) operator. Second part: HTTP processors.
6cd38df Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56582 Convert implementations of ActionHook.action(..) to use switch(enum) operator. First, SpdyProcessor.
2d03001 Fix IDE warning
b730f9f Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56555 which, after further discussion, was classed as INVALID.
78c437e Avoid having an import.
0b41baf Add some info and disable the async test (one CVE saved hehe).
3fd9750 Fix regression with the websockets examples after fixing the testing. The initial notification is still problematic.
86bd703 Followup to r1598483:
1033b8d Add CVE numbers, correct a typo.
82c53cc Typos.
13f1e24 - Test autobahn myself, add two new echo endpoints and my example config. - Issues with the async endpoint, 9.7 and 9.8.
bd73fea Remove listener calls optimizations, they skip a lot of things which could be useful and ultimately it doesn't work that well.
e739a3a More formatting changes
cc52137 Trivial format tweaks
cd1194d Trivial format fix
d1a3389 Simplify logic Call Response.recycle() from Response.reset() rather than in Response.reset():  - doing ~half of what recycle() does  - calling ActionCode.RESET which resets the OutputBuffer which in turn calls Response.recycle()
db632b1 Check committed before changing any field values Remove various incorrect comments
997cdcb Less fuzzy way to call onDataAvailable (no real fix though).
6bf75cb Formatting clean-up No functional change
05cf2f3 Better comments Formatting (use longer line lengths)
7605a45 Remove unnecessary method
ede4f77 Remove Response methods where the only function is to call action() and call action() directly.
782e977 Fix indent
c225e52 No need for the expectation check in an error state as the connection will be closed any way.
a1cfdac Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56555 When Tomcat closes the connection based on the HTTP status code of the response, ensure that only one connection header is sent to the client.
9f2ab03 Fix copy/paste error and return a 500 rather 400 response
aa21852 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55282 o.a.t.util.descriptor.web.ApplicationListener overrides equals and hashCode methods.
b0bfbd8 Discern the first and the second requests in the test case.
bc81c83 Add license header
f532e85 Add license header
bd11d06 Add license header
752385d Refactor test to enable a clean server shutdown. This prevents the web application class loader complaining about a still running thread on server stop.
f87d779 ISE is expected when using AsyncChannels. Handle it the same way an IOException is handled rather than expecting the client code to catch and handle it.
76297b4 Simplify available() and isFinished() as current implementation broke Comet chat example.
1338db8 Implement third part of pull request from Greg Wilkins to make Jasper more independent from Tomcat. Add support for using an existing list of TLDs rather than scanning for them This closes #4
d5c3143 Implement second part of pull request from Greg Wilkins to make Jasper more independent from Tomcat. Add ServiceLoader based discovery support to the JULI LogFactory
ddf941b Implement first part of pull request from Greg Wilkins to make Jasper more independent from Tomcat.
4a128a2 Keep change log to max 80 chars wide
75728d4 Fix a TODO Only set the JspFactory if not already set
d77e116 https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 Followup to r1597532: check the output of the new test.
2125a39 Set bugtraq:logregex property on the root directory. This allows TortoiseSVN to parse arbitrary references to Bugzilla issues in addition to those that follow "Fix ..." template. Just the issue URL or "BZ + number" is enough.
e049aa7 Update changelog.
c1e9f84 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56561 Fixed NoSuchElementException when an attribute has empty string as value
7462b98 If the SSL reneg test only fails on MacOs, it would be better to continue running it on the other platforms.
2b48138 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55975 Apply consistent escaping for " and \
93be55d hopefully fixed timing issue in TestStuckThreadDetectionValve when the test is run on ASF buildbot...
0cdfed5 Apply patch 12 from jboynes to improve cookie handling. Move header-specific parsing code into a separate class associated with that header type. This is in anticipation of adding new header parsers, starting with Cookie The patch should be safe since the logic is unchanged.
a7f0bc9 Whitespace police after merge from Commons
28f030f DBCP updates
c037d7c Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56546 Avoid stack trace with org.apache.catalina.connector.TestMaxConnections Ensure request processing has finished by increasing unload delay to allow request that was waiting in the accept queue to be processed before shutdown completes.
1eaada8 Apply patch 11 from jboynes to improve cookie handling. Eliminate an unneeded StringBuilder. I also added to TODO marker. The patch should be safe since the logic is unchanged.
a22bf83 Apply patch 10 from jboynes to improve cookie handling. Separate the code that determines whether a value should be quoted in Set-Cookie from the checks that are performed when parsing a Cookie header sent by a client. I also did a small amount of clean up. The patch should be safe since the logic is unchanged.
2a3a288 Apply patch 09 from jboynes to improve cookie handling. Code cleanup. I did not remove the final markers from the static methods as I see no need to remove them and good reasons to keep them. The patch should be safe since the logic is unchanged.
4ebf728 Apply patch 08 from jboynes to improve cookie handling. Encapsulate use of ALWAYS_ADD_EXPIRES as it only applies to Set-Cookie generation. The patch should be safe since the logic is unchanged.
cb090ba Apply patch 07 from jboynes to improve cookie handling. Simplify code that detects if we need to upgrade a cookie from V0 to V1 The patch should be safe since the logic is unchanged.
3e8dcee Apply patch 06 from jboynes to improve cookie handling. Remove duplicate code. The patch should be safe since the logic is unchanged.
a15b016 Apply patch 05 from jboynes to improve cookie handling. Simplify logic for detecting cookie upgrades. I made a few additional changes.  - s/isnt/isNot/ in method names  - whitespace clean-up  - correct some comments The patch should be safe since the logic is unchanged.
2daf167 Apply patch 04 from jboynes to improve cookie handling. Prevent V0 cookies using '=' in cookie names I've checked back though the archives and I can find no record of a user asking for this feature. Also, given the known behaviour of browsers it is unlikely to have worked any way. On that basis, this should be safe.
796cf33 FindBugs Fix false positive
d28c1b9 Apply patch 03 from jboynes to improve cookie handling. Allow V0 cookies to use names that start with $. Add a (currently unused) RFC6265 Cookie validator. Patch should be safe since it relaxes the current behaviour.
dd0573b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543 Followup to r1596227 Update POM and IDE files to the new ECJ version
2f4998e Apply patch 02 from jboynes to improve cookie handling. Refactor cookie tests to test each CookieNameValidator directly. I made a few additional changes. The patch should be safe since it only impacts the unit tests.
0de4035 Apply patch 01 from jboynes to improve cookie handling. Allow attribute names as cookie names. Patch should be safe since it relaxes the current behaviour.
e8ba504 Use ISO 8601 date format, like it was done for earlier versions
4b27c5c Add release date
5ddc58a fixed timing and enclosed thread.join in a finally to avoid stopping the webapp before the request is finished (in case of assertion failure)
1449538 Correct comment
bf3072b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56521 Implement a TODO Reuse the async write buffer between writes to reduce allocation and GC overhead. Based on a patch by leonzhx. Also:  - don't re-allocate the buffer / move the data in the buffer if the buffer is partially written on a subsequent write  - make the buffer size configurable, defaulting to 8k
5c54b47 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543 Update JDT to 4.4.RC1
43895c0 Improve handling of Throwable. Add changelog entry.
d68b45e Further simplify the code Merge two try/catch inside two branches of if/else. factoryClass cannot be null after loadClass()/Class.forName() calls.
32126ac Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56545 Pre-load two more classes to avoid exceptions when running under a security manager
16d7b9c Simplify
b102edf Fix logic error
ce70051 FindBugs setup() vs setUp()
f8d813f Experiment with the Simbian duplicate code detection tool. Remove 100+ lines of duplicate code
1d149b2 FindBugs. Remove unnecessary null check
a24d70d Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56545 Pre-load an additional class if running under a security manager
f49e855 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56546 Reduce logging level for stack traces from SEVERE to INFO.
55a7381 Correct indent
350a8c2 svn:eol-style=native
91f599d Follow up to r1596004. Actually throw the exception.
bcadac2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56387 Refactor handling of class loading attempts after web application stop.
d515307 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56446 Clearer handling of exceptions when calling a method on a POJO based WebSocket endpoint. Based on a suggestion by Eugene Chung.
d2a78d0 Code clean-up. No functional change. Merge exception handling blocks were code is identical. Spotted while reviewing use of ExceptionUtils.unwrapInvocationTargetException()
0a982ce Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56399 Improve implementation of CoyoteAdapter.checkRecycled() to do not use an exception for flow control.
0fcfda8 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56461 New option to make context startup fail if a load-on-startup servlet fails
029d8d5 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Followup to r1595230 Minor improvement to the testcase: check the actual response produced by test JSP page.
88a90ec Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 Followup to r1595331: correct version number in changelog. (Tomcat 8.0.8 has been tagged an hour earlier).
dc55eb0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56526 Improved StuckThreadDetectionValve to allow to interrupt stuck threads.
5cb017c Prep for next release
4c55887 Whitespace
4e244f3 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Review of r1595174: 1. Call iterator() once. It creates an object, so it is better do not waste such calls. 2. Style issues: - "" does not make sense as 'generic' default for textAttributeValue. It makes sense for this specific case only. - 3 spaces indent -> 4 spaces
1a8a56d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56536 Ensure that HttpSessionBindingListener.valueUnbound() uses the correct class loader when the <code>SingleSignOn</code> valve is used.
c221051 Update changelog
f1a7ea7 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Test case for attributes with empty string values in custom tags.
2d76023 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56529 Fixed NoSuchElementException while handling attributes with empty string value in custom tags. Patch provided by Hariprasad Manchi.
20d5a9e Prep for next release
b2732a9 Prep for next release
4827fa7 Copy missing resources file from Apache Commons DBCP 2 to packaged renamed copy of DBCP 2
0f35a2c Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56399 Simplify. Reduce logging level. Update changelog (this change was omitted from 8.0.6).
fd94c05 Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56516
45208f4 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56523 When using SPNEGO authentication, log the exceptions associated with failed user logins at debug level rather than error level.
69132e1 Add BZ 56516 to changelog
2ca5eae Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56522 When setting a value for a ValueExpression, ensure that the expected coercions take place such as a null string being coerced to an empty string.
e4b4858 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56516 Place declarations for all scripting variables marked with declare=true at the start of the page so they are always visible to the entire page.
f5197f3 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56399 When recycling a Coyote request, ensure that Catalina request have been recycled.
aa7c749 Whitespace police
fc6e98b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56518 Refactor NIO's SocketProcessor to use KeyAtrtachment rather than Socket to align it with the other implementations. This enables a number of attachment->socket->attachment transitions to be skipped which appears to resolve the root cause of BZ 56518. Since the wrapper is available and can be processed, it becomes possible to reduce the connection count when the socket is closed by the interrupt.
e87d654 Remove duplicate method
c5a6d04 Remove unused code
f07ce51 Consistent naming
60f0477 Pull up common async code
fe84524 Align code across the Processors Note for NIO that the socketWrapper is the KeyAttachment which allows the NIO code to be simplified
5c508d1 Remove unnecessary casts
7e83b76 Merge processSocket() and dispatchForEvent()
165b3e1 Return value is never used (and is hard coded to true anyway) so change return type to void.
237b7fd Keep Checkstyle happy
65837f8 Replace looped String-concatenation with StringBuilder. No functional change.
bf9ee86 Require RuntimePermission when introducing a new token.
9b2d57e Give the thread shutting down the existing connections a chance to finish before forcibly closing them and triggering an exception on each connection that is forcibly closed.
77799f5 Address root cause of ReadPendingException rather than swallowing it.
e23f634 Whitespace police
0f1c865 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56513 Make it crystal clear that using sendfile will disable any compression that might otherwise have been used.
9d2a736 Follow up to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 - Update description of DBCP packaging in buidling.txt - remove DBCP2 and Pool2 versions from build.properties.default - update svn-merge docs - remove external tomcat-dbcp.jar from sample Eclipse class path - remove reference in Javadoc to class that does not exist
3c55418 Update filter after split into two classes
204dddd Fix FindBugs false positive
38908a1 Fix double checked locking issue identified by FindBugs
3daa5a6 Correct typos in class name
2e2770c Correct regression introduced in r797162 that broke authentication of users when using the JAASMemoryLoginModule.
cbf22ab Fix regression introduced in r1239520 that broke loading of users from tomcat-users.xml when using the JAASMemoryLoginModule
4923c02 Fix tests failing at Buildbot and make them more friendly to Git.
4e53ef8 - ThreadLocalLeakPreventionListener: Trigger thread renewals for StandardContext only. (Do not trigger them for FailedContext and similar). - StandardThreadExecutor: Pass 'threadRenewalDelay' to the thread pool executor. Otherwise this setting configured at initialization time is effectively ignored. - Improve documentation.
ca8143d Simplify. No functional change.
649c598 Followup to r1593773: Explicitly create the logs directory. JUnit fails when the directory where it writes its reports does not exist. It happened at Apache Gump.
6e9183f In tests: allow to configure directory where JUnit reports and access log are written to. This is useful for Apache Gump, where BIO, NIO and NIO2 test runs are configured separately.
9ed34b7 Remove svn keywords from forked Apache Commons Pool2 and DBCP2
d84c366 Fix broken javadoc links. Noted when reviewing results of 'ant release' step from buildbot.
a1fe47d Split into two paragraphs, so that note is more visible.
b6e1943 Revert part of r1593563 Restore original comment. (Tomcat JDBC pool can be tested against original Commons DBCP, if someone wants.)
898c64a Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56501 HttpServletRequest.getContextPath() should return the undecoded context path used by the user agent.
30bcf27 Remove unused code. unparsedURIMB was written but never read.
3032d0e Better change log entry for DBCP changes
c63b807 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 Switch to svn copy for DBCP2 and Pool2
2297156 Update package renamed Apache Commons Codec to r1586336 to pick up some Javadoc fixes and some code clean up.
459bf9c Update package renamed Apache Commons FileUpload to r1569132 to pick up some small improvements (e.g. better <code>null</code> protection) and some code clean up.
4ea2380 Simplify
ca39900 Update package renamed Apache Commons BCEL to r1593495 to pick up some additional changes for Java 7 support and some code clean up.
d84776a Testing with Java 9 early access. UTF-8 issues resolved.
bcc3b57 Work around intermittent unit test failures on OSX.
8000f8e Small optimization: move "getRegistry(null, null)" call out of the loop.
72135ab Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56472#c1
09a6f97 Review of r1593288: Do not forget to call the symmetrical unset method on stop.
9012939 Fix test failure with NIO2 where additional, unexpected access log entry was being created during connector shutdown.
f53c5a1 Update changelog
43aa494 Update changelog
64431dc Retain the order the URLs were added in when calculating the result for getURLs()
5539009 - Improve comet keepalive cleanup (if a read pending it is not possible to interrupt it), and do the same for async.
d7a8a82 +=o.a.naming
a0d8527 Alphabetical order
0093619 Make naming context tokens for containers more robust by using a separate object
f1f5eb7 No functional change. Rename fields and variables and update comments to reflect current usage
0f18751 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Document ErrorReportValve's new property 'showReport' on the "security HowTO" page.
7f79151 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56463 Property for disabling server information is added to the DefaultServlet.
4ec992c Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56492 Avoid eclipse debugger pausing on uncaught exceptions when tomcat renews its threads
ee1e4e2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56481 Work around case insensitivity issue in URLClassLoader
a42eafb - Fix possible (very rare) corruption doing keepalive after a Comet request. - Stop ignoring read pending exceptions.
ea33b07 - Add setTimeout, for handling of the upload timeout. - Cleanup.
af3cec6 Correct unit tests now EL Parser has been fixed to correctly parse "\$" as "$".
a69c40b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Additional tests and fixes Includes the following:
4b3b546 Correct the handling of back-slash escaping in the EL parser and no longer require that "\$" or "\#" must be followed by "{" in order for the back-slash escaping to take effect.
ea102d1 Document JspAttribute.isDynamic() and correct wrong value of this flag for "omit" attribute of <jsp:attribute> action.
3a0b913 Clarify
1973226 Drop useless null checks.
77a3610 Fix Javadoc warnings
a292b28 Need even larger writes to keep test happy on Windows VM
2bc8fad Increase length of text written so expected exception is triggered on client disconnect with NIO2.
8a70af8 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Reviewing r1587887: s/ attrs.getValue(i) / attributeValue / in the messages as well, so that the actual expression text that is processed is printed in the message.
67ec9da Fix broken link. I noted it when backporting r1519668 to TC7.
7b28ec8 Improving valves documentation. Move valves implementing an Authenticator into new section "Authentication".
f84cc53 Improving valves documentation. Move RemoteIpValve and SSLValve into new section "Proxies Support".
fbe13b9 Improving valves documentation. Wrap RemoteAddrValve and RemoteHostValve valves into a distinct section.
35996c8 Improving valves documentation. Wrap Access Logging valves into a distinct section.
5d126ee Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Document the new feature on the "security HowTO" page. Move error valve documentation lower in the valves list (access log valves and access control valves should be the first ones there).
b8d50a1 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Use non-empty title when both showServerInfo and showReport are false.
72da645 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Review of r1589994: - Reduce visibility of fields that have getter methods - Do not print <h3></h3> line if showServerInfo is turned off
94683a3 Review of r1590378: Simplify: instanceof operator does not-null check
d041cd5 Followup to r1590377 s/Wait/Waited/ and be more detailed
aac01a3 Since I looked at the traces, replace exception wrap with unwrap for IOException.
e8c6397 Cleanup the test output (mixing out and err is confusing), add some info and wait more (somehow NIO2 gets an exception later).
8ae6851 Correct a typo
70c1fac Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Follow-up to r1590300: Introduce a constant.
746aa1d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56441 Minor improvements for r1590285: Do not omit stacktrace on InvocationTargetException in a getter. Better wording for changelog.
9a82078 Correct formatting and a few minor typos. No substantial changes to the text.
886aa4b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Improve documentation, update changelog.
cad63cc Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Correct errors in StandardJarScanFilter documentation.
78f22fa Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Reviewing and fixing StandardJarScanFilter implementation: 1. Do not parse the same system property 3 times. Once per class is enough. 2. In check() method do not do defensive copying of HashMap for each jar name that we are filtering. It is unlikely that check() and setXxx() methods were called concurrently. If they were, then one can wait for the other to complete.
d87e68e Move filters into their own menu section in Documentation webapp.
aada00e Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Alternative implementation for the new values of FIPSMode option in AprLifecycleListener
912dff9 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56441 Raise the visibility of exceptions thrown when a problem is encountered calling a getter or setter on a component attribute from debug to warning.
1e8eddc Whitespace police
0ed51fb Follow-Up to r1590120: Simplify code by using Integer.compare(int, int) which is available since Java 1.7.
78639e9 Stop threads used for secure WebSocket client connections when they are no longer required and give them better names for easier debugging while they are running.
66642e9 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56425  Improve method matching for EL expressions. When looking for matching methods, an exact match between parameter types is preferred followed by an assignable match followed by a coercible match.
d8fc6df Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56418 Ensure that the Manager web application does not report success for a web application deployment that fails. Based on a patch by slaurent.
d93a871 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56458 Report WebSocket sessions that are created over secure connections as secure rather than as not secure.
766ff3d Add javadoc for AbstractReplicatedMap ctr parameters added in r1498820 That feature is controlled via "terminateOnStartFailure" option of BackupManager.
50311be Add new constant missed in previous commit
fa6e9ff A quotation mark is missing.
5aae132 More defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak.
3a625da Return the type attribute in the <style>. Removed by mistake with the previous commit.
ebe5c16 Parser uses lazy init so move creation of parser inside the block that uses the container class loader.
ad3b34a Fix indents and copy/paste errors
5517c55 More defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak.
4132b15 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Properties for disabling server information and error report are added to the o.a.catalina.valves.ErrorReportValve. Based on the patch provided by Nick Bunn.
2c4c0ce More refactoring to reduce code duplication.
769477b Add some defensive coding around some XML activities that are triggered by web applications and are therefore at potential risk of a memory leak.
e31233a Refactoring to reduce code duplication.
93930c1 Fix text
d3984d6 Minor optimisation
edf07ef Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56416 Document correct default for socket linger.
8dda192 Revert 1589666. Default linger setting is required.
aa563a0 With the linger change, I am now getting async close exceptions on the accept on shutdown. Ignore exceptions when not running and cleanup.
6388d56 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56382 Add information about finished deployment and its execution time to the logs. Patch provided by Danila Galimov.
6764c16 Fixed broken links to java.sun.com. Issue reported via comments.apache.org
3d17772 Align the AJP and HTTP connector implementations with the documented behaviour and use JVM defaults for socket linger.
5211679 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56430 Extend checks for suspicious URL patterns to include patterns of the form <code>*.a.b</code> which are not valid patterns for extension mappings.
b386759 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56449 When creating a new session, add the message handlers to the session before calling Endpoint.onOpen() so the message handlers are in place should the onOpen() method trigger the sending of any messages.
3a43ebb Whitespace police
e2de5a3 Add session ID to the exception message to aid debugging.
3855c7d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56348 Fix slow async reads on non-container thread. Align code with APR. Ensure that selector is woken up when a socket is registered for a new event
a63c63e Disable SSL renegotiation test for NIO
7012937 Do 10 requests even if the listener is complete, to check if everything is still fine after the handshake.
d1c438b Additional information for debugging the test: log on which iteration it failed.
65f2c92 Windows OK. Seeing failures on Linux - add debug code.
9169faa Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 Re-write renegotiation test to test that renegotiation works rather than to test that an exception is not triggered it it is attempted.
617c217 Restore accidently commented out code
97c967d Tomcat 8 uses Java 7 where RFC 5746 is supported in all versions so remove unused/unnecessary code.
36880ca Correct a typo Add changelog entry for Tomcat Native upgrade
0b3aac0 Reviewing r1589103 s/J2EE/JavaEE/ in a message
81d79b0 Whitespace police
970cd9f Update changelog
4444768 Ensure that threads created to support WebSocket clients are stopped when those clients no longer need them. Note that while this happens automatically for WebSocket client calls made by web applications, stand-along clients must call the Tomcat specific method WsWebSocketContainer.destroy().
2653cea Refactor server container shutdown into the destroy method Destroy the thread group on shutdown Log a warning if the thread group can't be destroyed
578a06c WebSocket has own section in changelog.
01ccd26 Increase the default maximum size of the executor used for async writes
0ca96a0 When not inline, do not use a new thread since the completion handler is already run in a new thread.
e870287 Minor flush tweaks.
fb073db Allow some method override since it is a bit too convoluted with NIO2.
3c4ffb8 Update Javadoc, as addValve/removeValve methods belong to Pipeline.
d7db4dd Simplify code (apparently unused parameters and methods).
ff5973f Followup to r1588299: svn:eol-style=native
aacc874 - The input buffer is the place where there was code duplication between the two NIO connectors. Resolve that, there should now be no meaningful code duplication elsewhere. - Note that the NIO2 code is the one shared (some additional "1" state for the parsing state - should be transparent for NIO - and use flush(boolean) in the shared code). - Testsuite for NIO and NIO 2 looks ok.
ddf7c54 Avoid StackOverflowError on non-Windows systems if a file named '\' is encountered when scanning for TLDs.
999ca93 Modify generic exception handling so that StackOverflowError is not treated as a fatal error and can handled and/or logged as required.
279b859 Update changelog
c73c2e4 Ensure <th> elements have the same text-align property on every browser.
ce70ee6 Small optimisation. The resolver and the factory are only used when running under a security manager so only load them in this case. Also avoid a possible memory leak when creating these objects.
804fec8 Whitespace police
1a18e3f Fix an Eclipse nag
818bd66 Update changelog
4a16365 Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 Fixes the locking of a JAR file when obtaining last modified time of a TLD within the JAR
cd1379b Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 Fixes locking of JARs that do not contain TLDs.
9e92678 Improve implementation of Lifecycle for WebappClassLoader. State is now correctly reported rather than always reporting as NEW.
ead3f7c Better debugging. Makes it clear if one listener or all listeners failed.
e40e3c0 Fix test failures
3a07e07 Add i18n error messages
c35249b Further fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
613820e Remove duplicated lines
4dcd0d3 Fixed documentation, added changelog.
74e5527 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 Add more nuanced support for entering/requiring FIPS mode when using APR connector.
061ea26 Updated required version of tcnative to 1.1.30.
ad3020e Print a warning in case if neither server nor client jvm is found by service.bat. Fix comments (addresses sebb's note in "Re: r1000718").
ec14c3f Align DisplayName of Tomcat service installed by service.bat with one installed by the *.exe installer: Use "X.0" version number in both instead of "X".
50c85de Followup to r1586897 : Apply the same not-null optimization to removeAttributeChangeNotificationListener method.
e7f76ff Improve a bit the changelog.
8d12005 Correct message displayed by service.bat for an invalid command.
d2e1e4f Remove debug code
0a5bb1f Align with 7.0.x
43048bd Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56405 Restore directory listings
c711f65 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55483#c4 Return exact match as soon as it is found. Note without the change the same method is returned it just takes a little longer
008fe78 svn:eol-style = native
c40d58d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56369 Ensure that removing an MBean notification listener reverts all the operations performed when adding an MBean notification listener.
f8a4481 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334 Correct double backslash escaping in attributes
1dea9f3 Since nobody apparently objects, and with the testsuite passing 100% very reliably, upgrade NIO2 to beta.
a4eefef - Possible SSL NIO2 fixes for gather (if there are more than two buffers, which doesn't really happen) and incomplete netOutBuffer writes (which also shouldn't happen). - Try again the SSL test, just in case.
a0a1616 Correct windows-service-howto.xml according to Apache Commons Daemon procrun documentation. E.g. the default value for LogPath option was documented incorrectly.
5546f32 Replace double space with single one.
253e870 Ensure that the static resource cache is able to detect when a cache entry is invalidated by being overridden by a new resource in a different WebResourceSet
ad43712 Does not fix the testsuite run, so revert.
864c7d5 - Add possibly missing notification. - Try again the SSL websocket test, will revert the commit if not fixed.
954511d Fix Javadoc warning
fda29fd Correct a typo
9dd0299 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56365 Simplify file name matching code in StandardJarScanFilter.
70af3aa Minor cleanups, improve logic (less returns) and possibly fix a scenario where failed could be called twice in SSL.
e3d99f1 Fix the logic (although it shouldn't actually cause any issue).
0ac6f7f Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56327 Enable AJP as well as HTTP connectors to be created via JMX. Patch by kiran.
8c0b14b Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56343 Avoid NPE if WebSocket API JAR from RI is used.
8c53cd7 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56339 Avoid an infinite loop if an application calls session.invalidate() from the session destroyed event for that session.
e275520 Fix trigger of the read event (so registerForEvent is actually useful).
70c82a9 Port i18n to the NIO1 connector, for consistency.
501dfa4 Code cleanups and i18n in NIO2.
e891a47 changelog for r1584507.
9c89a23 Set null rather than this.
5150ca8 Simplify the code of o.a.c.ha.tcp.SimpleTcpCluster. In order to add or remove cluster valve to Container, use pipeline instead of IntrospectionUtils.
4a1399c ois is closed in finally block - no need to close it in catch blocks as well.
e76786e Revert changes from r1581820 as it triggers an IOE
8605533 Move to org.apache.catalina.ha.session.ClusterManagerBase common logics of org.apache.catalina.ha.session.BackupManager and org.apache.catalina.ha.session.DeltaManager.
9c1acf2 Remove the unnecessary cross context check. It does not matter whether the context that is referenced by other context is set to crossContext=true. The context that refers to the different context must be set to crossContext=true.
27e0ab6 Add support for cross context session replication to BackupManager.
79ee452 Remove cluster and replicationValve from cluster manager template. These instance are not necessary to template.
52e434a Still failed.
a0dbbe5 - Handle incomplete writes as it is very easy to do, just in case (it never happens for me though). - Try again that SSL test.
156791f Remove useless methods.
6f12e3e 56336: Fix apparent AJP output issue [untested and unverified, no test case].
11ec562 Cleanup waiting async connections on shutdown, to avoid any abrupt close if everything is well behaved.
60a3832 Remove the implementation of org.apache.catalina.LifecycleListener from org.apache.catalina.ha.tcp.SimpleTcpCluster. SimpleTcpCluster does not work as LifecycleListener, it works as nested components of Host or Engine.
4587d33 Add release date
74ed41d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56321 hen a WAR is modified, undeploy the web application before deleting any expanded directory as the undeploy process may refer to classes that need to be loaded from the expanded directory. If the expanded directory is deleted first, any attempt to load a new class during undeploy will fail.
f5fe620 Restore optimisation removed in r1549711 Refactor so InputStream is never opened if sendfile is used Add lots of comments
06db876 Clean-up. No functional change.
e453cec Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56320 Fix fd leak when sendfile is used
d63aff9 Whitespace police
dbb3260 Ensure that "name" request parameter is used as a application base of host if "webapps" request parameter is not set when adding host in HostManager Application.
eba7297 Add Support for copyXML attribute of Host to Host Manager.
267ed14 Update changelog for try-with-resources
f3aa45d Complete first pass of try-with-resources
c9920b8 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1582009 13f79535-47bb-0310-9956-ffa450edef68
f22976e More try-with-resources
0b7354e More try-with-resources
48cb3d9 Locks should be outside try/finally
c43da6e Locks should be outside try/finally
83494e2 More try-with-resources
4fc8eaf Locks should be outside try/finally
43f7c97 Locks should be outside try/finally
76da780 More try-with-resources
1f2c1d8 More try-with-resources
a82b875 Fix Javadoc
031b525 More try-with-resources
900d77a More try-with-resources
96b5a35 - Remove useless IOE on flush. - Remove nearly all extra fields from the socket wrapper.
f9a87dd Update with progress
9ba73eb Code review - use multicatch to reduce code duplication - use Util.handleThrowable() to reduce code duplication
a6ce9cf Code review - lock outside try/catch/finally
a717e79 Review changes
a882c87 Another package
54f5caf Update progress
cc30938 try with resources
d029ca8 try with resources
5e9e013 Try with resources
303fdec Lock outside try/catch/finally
0894712 Lock ouside try/catch/finally
3330bbb Lock outside try/catch/finally
3fb1f45 try with resources
959e968 Try with resources for javax.*
2d88a11 Locks should be outside try/catch/finally block.
115e8cc Fix Java 8 compatibility (order of elements is reversed, which does not seem wrong, it is probably undefined).
6d3c686 Refactor - remove unnecessary null check - use try-with-resources
0c61ee8 Fix extension validation for the new resources implementation
2f09f15 Specify that Apache Ant version 1.8.2 or later is required for building Tomcat.
3da9772 8.0.4 didn't make it
096f1cf Prep for next release.
8f6579d Another unit test run failure on OSX and a more careful review. Handle the case where timeout completes request before the Runnable's error handling does.
fc8fd23 Review after unexpected failed test on OSX - completed needs to be volatile - prevent infinite loop
f6df9f3 Whitespace police
8cb57c5 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56304 WebSocket + BIO HTTP + Production = bad idea
7bbefb6 Fix bug in example
ff43767 Fix typos spotted by Cyril Bonté.
6fac310 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56293 Cache resources loaded by the class loader from /META-INF/services/ for better performance for repeated look ups.
7d65bbf Minor clean-up
8861e05 Allow web applications to package tomcat-jdbc.jar and their JDBC driver of choice in the web application.
dd6e68b Add the bug reference.
b750840 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56273 If the Manager web application does not perform an operation because the web application is already being serviced, report an error rather than reporting success.
4d7ab12 Make exception handling more robust - review by remm.
79263fa Fix changelog
40e58dc Rework the fix for 56190 as the previous fix did not recycle the request in all cases leading to mis-routing of requests.
abce6d7 Remove more unused code. Reduce visibility of static fields
c995a1a Remove unused code.
ceafec5 Forgot to check the return value for blocking writes as all other places do, oops (some platforms could be returning a negative value after a disconnect rather than throw an exception).
22fa799 Improve trigger of the onWritePossible notification.
07d4063 - Actually follow the instructions on proper NIO2 shutdown. Much cleaner indeed. - The downside is that the executor is exclusive to the thread group (no way around this), so it cannot be shared with other connectors. - Add a warning if using a shared executor.
72da3ac Improve test so that it cannot hang forever (it will check it gets an exception and completed, instead).
895d5cd Fix time in test (oops).
2c722ec Add missing clear after writing the buffers (in practice this shouldn't be needed though). If an exception occurs the response will be recycled so no need for a finally.
e136bd0 - Reliably allow blocking following non blocking if some flushing is needed on end. - Use debug log level in case of a rejected execution, which can occur on shutdown.
c905c6f Handle possible status line i18n in tests.
9fea3bf Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54475 Add Java 8 support to SMAP generation for JSPs. Patch by Robbie Gibson.
b3df2fe Prep for next release
bb5112b whitespace police
62d2aa6 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56283 Add issue number for r1579174
8d405bd Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56265 Do not escape values of dynamic tag attributes containing EL expressions Patch by kkolinko
e90f48d Update JDT to P20140317-1600 to add Java 8 support and enable "1.8" as a valid option for source and target JVM versions for JSPs.
231af58 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1579170 13f79535-47bb-0310-9956-ffa450edef68
66cee30 Followup to r1578260 Amend javadoc for the new option. Move Ant task changes from "Web applications" to "Other" section of changelog.
00a1f65 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56268 Specify the default value of the ${build} in the build section.
0cadfb8 Fix properties
fffd63a Fix possible overflow when parsing long values from a byte array.
313ba52 Corrected link to Tomcat 8.0 documentation. Issue is reported via comments at apache.org
1ab2a5a Update changelog
913d94b Prevent user supplied XSLTs from defining external entities
970c23b Redefine globalXsltFile as relative to CATALINA_BASE/conf or CATALINA_HOME/conf
03d1f33 Whitespace police
8884dae Correct regression introduced in 8.0.0-RC2 as part of the Servlet 3.1 non-blocking IO support that broke handling of requests with an explicit content length of zero.
f646a5a Improve processing of chuck size from chunked headers. Avoid overflow and use a bit shift instead of a multiplication as it is marginally faster.
e8cc1e6 Make upload process more robust. If upload fails and it was going to update an existing WAR, don't remove the existing WAR.
79c2a5d Review from kkolinko The filename of a tagged war file should be  versioned + tag + baseName.war.  The "tag" part was lost.
39f694b Add the option to ignore the constraint of the first line of the response message that must be "OK -". Default is false.
499ad3b Implement org.apache.catalina.ant.VminfoTask, org.apache.catalina.ant.ThreaddumpTask and org.apache.catalina.ant.SslConnectorCiphersTask.
8a3cb6f Add definition of org.apache.catalina.ant.FindLeaksTask.
73ebfd8 Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
8a7744f Clean an IDE warning about unthrown exception. Since r1577757 the setSSLEngine() method is a pure setter, it no longer calls reset() and no longer throws an IOException.
c467264 Followup to r1577831 Clarify the new socket.directSslBuffer option.
d3cd026 Followup to r1576628: correct typo in a message
b98b7d3 Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
5c35790 - Cleanup and prefer non direct buffers for SSL by default (32KB of direct buffers per connection looks a bit too much). - Give up on the SSL test for now.
b93291d Implement the read/write pending contract in the SSL channel (not doing so would likely still trigger the exception, but would add corruption).
9eea841 Properly delete %TEMP%/ser{number}.tmp temporary file that was used to test serialization of a Principal.
74d4d2c 1. Do not hardcode the path to output directory. It can be controlled via build.properties. 2. Cleanup after the test.
44ad7f4 Make sure the byte buffer passed as a parameter is used in all read/write operations (come code is from the NIO1 which forces using the main read/write buffers).
4c057bf Correct typo in the message
432e8ec Add missing code to retry if no bytes are written (handshake) like for blocking IO, and use EOFException instead.
5a436bc Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
1d9c1ba Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
2022777 Improve the FutureWrite logic so that writing starts when creating it, and then will recurse on get until the content is actually written.
9a05595 Better reporting for skipped tests. With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
1d59d9d Experiment some more with this test and NIO2 (sorry for the noise).
f29331a Add a couple more tests based on a report on the users list (There tests pass, the problem looks to be elsewhere)
1cf1508 Start harmonizing exception types (todo: same thing for completion handlers).
c8d8cf7 Fix trailing whitespace. Sorry for the noise.
2befbbd Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56236 Add issue number
5534eed Review by kkolinko Avoid adding nulls to the map Log a warning for problems in addSelf() as well as add()
fda374f With the writeLock in use in the superclass, remove the useless extra locking (after testing).
b03c75b Simplify
6cdad68 Enable Tomcat to work in a OSGI environment with alternative Servlet and JSP API JARs.
149e5aa Whitespace police
87b3f16 Clean-up / consistency
c8cf65c Correct some errors in r1577182
1f9b47e Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56248 Allow the deployer to update an existing WAR file without undeploying the existing application if the update flag is set. This allows any existing custom context.xml for the application to be retained. To update an application and remove any existing context.xml simply undeploy the old version of the application before deploying the new version.
4ff8248 Disable SSL websocket "firehose" test for now on NIO2, since a legitimate explanation for the failure has been found.
ce1de3f Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56253 When listing resources that are provided by a JAR, fix possible StringIndexOutOfBoundsExceptions. Add some unit tests for this and similar scenarios and fix the additional issues those unit tests identified. Based on a patch by Larry Isaacs.
8ea00e6 Reduce calls to getManager(). (That is not a simple getter, but it performs some locking).
6152635 Set eol prop.
b6a3bcc Remove unused imports
1d5aa34 The test now uses too much memory for the test server, so split it SSL / non SSL.
1429c2a Better Javadoc
f9b55b4 Correct comment

git-subtree-dir: apache-jsp/src/main
git-subtree-split: adc36cf7ab36303dc1d8eb2fa7e516a76167f518
Merge commit 'e06e8bbe66aef04ae8d1b2997e0064caeeea609b'

Conflicts:
	apache-jsp/src/main/BUILDING.txt
	apache-jsp/src/main/SVN-MERGE.txt
	apache-jsp/src/main/TOMCAT-NEXT.txt
	apache-jsp/src/main/bin/service.bat
	apache-jsp/src/main/build.properties.default
	apache-jsp/src/main/build.xml
	apache-jsp/src/main/conf/catalina.properties
	apache-jsp/src/main/conf/web.xml
	apache-jsp/src/main/java/javax/el/BeanELResolver.java
	apache-jsp/src/main/java/javax/el/ExpressionFactory.java
	apache-jsp/src/main/java/javax/el/Util.java
	apache-jsp/src/main/java/javax/servlet/http/Cookie.java
	apache-jsp/src/main/java/org/apache/catalina/Container.java
	apache-jsp/src/main/java/org/apache/catalina/Context.java
	apache-jsp/src/main/java/org/apache/catalina/Server.java
	apache-jsp/src/main/java/org/apache/catalina/ant/AbstractCatalinaTask.java
	apache-jsp/src/main/java/org/apache/catalina/ant/antlib.xml
	apache-jsp/src/main/java/org/apache/catalina/ant/catalina.tasks
	apache-jsp/src/main/java/org/apache/catalina/authenticator/DigestAuthenticator.java
	apache-jsp/src/main/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
	apache-jsp/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java
	apache-jsp/src/main/java/org/apache/catalina/connector/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/connector/OutputBuffer.java
	apache-jsp/src/main/java/org/apache/catalina/connector/Request.java
	apache-jsp/src/main/java/org/apache/catalina/connector/Response.java
	apache-jsp/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java
	apache-jsp/src/main/java/org/apache/catalina/core/AprLifecycleListener.java
	apache-jsp/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
	apache-jsp/src/main/java/org/apache/catalina/core/ContainerBase.java
	apache-jsp/src/main/java/org/apache/catalina/core/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/core/NamingContextListener.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardContext.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardEngine.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardHost.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardServer.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardThreadExecutor.java
	apache-jsp/src/main/java/org/apache/catalina/core/StandardWrapper.java
	apache-jsp/src/main/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
	apache-jsp/src/main/java/org/apache/catalina/deploy/NamingResourcesImpl.java
	apache-jsp/src/main/java/org/apache/catalina/ha/session/BackupManager.java
	apache-jsp/src/main/java/org/apache/catalina/ha/session/ClusterManagerBase.java
	apache-jsp/src/main/java/org/apache/catalina/ha/session/DeltaManager.java
	apache-jsp/src/main/java/org/apache/catalina/ha/session/DeltaSession.java
	apache-jsp/src/main/java/org/apache/catalina/ha/tcp/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
	apache-jsp/src/main/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
	apache-jsp/src/main/java/org/apache/catalina/loader/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/loader/LocalStrings_es.properties
	apache-jsp/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
	apache-jsp/src/main/java/org/apache/catalina/loader/WebappLoader.java
	apache-jsp/src/main/java/org/apache/catalina/manager/HTMLManagerServlet.java
	apache-jsp/src/main/java/org/apache/catalina/manager/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/manager/ManagerServlet.java
	apache-jsp/src/main/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
	apache-jsp/src/main/java/org/apache/catalina/manager/host/HostManagerServlet.java
	apache-jsp/src/main/java/org/apache/catalina/manager/host/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/mapper/Mapper.java
	apache-jsp/src/main/java/org/apache/catalina/mapper/MappingData.java
	apache-jsp/src/main/java/org/apache/catalina/mbeans/ServiceMBean.java
	apache-jsp/src/main/java/org/apache/catalina/realm/DataSourceRealm.java
	apache-jsp/src/main/java/org/apache/catalina/realm/JAASCallbackHandler.java
	apache-jsp/src/main/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
	apache-jsp/src/main/java/org/apache/catalina/realm/JDBCRealm.java
	apache-jsp/src/main/java/org/apache/catalina/security/SecurityClassLoad.java
	apache-jsp/src/main/java/org/apache/catalina/servlets/DefaultServlet.java
	apache-jsp/src/main/java/org/apache/catalina/servlets/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/session/FileStore.java
	apache-jsp/src/main/java/org/apache/catalina/session/JDBCStore.java
	apache-jsp/src/main/java/org/apache/catalina/session/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/session/LocalStrings_es.properties
	apache-jsp/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties
	apache-jsp/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties
	apache-jsp/src/main/java/org/apache/catalina/session/StandardManager.java
	apache-jsp/src/main/java/org/apache/catalina/session/StandardSession.java
	apache-jsp/src/main/java/org/apache/catalina/startup/Catalina.java
	apache-jsp/src/main/java/org/apache/catalina/startup/ContextConfig.java
	apache-jsp/src/main/java/org/apache/catalina/startup/ExpandWar.java
	apache-jsp/src/main/java/org/apache/catalina/startup/FailedContext.java
	apache-jsp/src/main/java/org/apache/catalina/startup/HostConfig.java
	apache-jsp/src/main/java/org/apache/catalina/startup/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/startup/Tomcat.java
	apache-jsp/src/main/java/org/apache/catalina/storeconfig/StandardContextSF.java
	apache-jsp/src/main/java/org/apache/catalina/storeconfig/StoreConfig.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
	apache-jsp/src/main/java/org/apache/catalina/tribes/transport/nio/NioSender.java
	apache-jsp/src/main/java/org/apache/catalina/users/MemoryUserDatabase.java
	apache-jsp/src/main/java/org/apache/catalina/util/ExtensionValidator.java
	apache-jsp/src/main/java/org/apache/catalina/valves/ErrorReportValve.java
	apache-jsp/src/main/java/org/apache/catalina/valves/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
	apache-jsp/src/main/java/org/apache/catalina/valves/mbeans-descriptors.xml
	apache-jsp/src/main/java/org/apache/catalina/valves/rewrite/RewriteValve.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/CachedResource.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/JarResourceRoot.java
	apache-jsp/src/main/java/org/apache/catalina/webresources/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/catalina/webresources/StandardRoot.java
	apache-jsp/src/main/java/org/apache/coyote/AbstractProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/Adapter.java
	apache-jsp/src/main/java/org/apache/coyote/AsyncContextCallback.java
	apache-jsp/src/main/java/org/apache/coyote/AsyncStateMachine.java
	apache-jsp/src/main/java/org/apache/coyote/Request.java
	apache-jsp/src/main/java/org/apache/coyote/Response.java
	apache-jsp/src/main/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/ajp/AjpAprProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/ajp/AjpNio2Processor.java
	apache-jsp/src/main/java/org/apache/coyote/ajp/AjpNioProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/AbstractHttp11Processor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
	apache-jsp/src/main/java/org/apache/coyote/http11/AbstractInputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/AbstractOutputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11AprProtocol.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11Nio2Processor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11Nio2Protocol.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11NioProtocol.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11Processor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/Http11Protocol.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalAprInputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalInputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalNio2InputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalNioInputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
	apache-jsp/src/main/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
	apache-jsp/src/main/java/org/apache/coyote/http11/filters/VoidInputFilter.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/AprProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/BioProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/NioProcessor.java
	apache-jsp/src/main/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
	apache-jsp/src/main/java/org/apache/coyote/spdy/SpdyProcessor.java
	apache-jsp/src/main/java/org/apache/el/parser/AstLiteralExpression.java
	apache-jsp/src/main/java/org/apache/el/parser/AstValue.java
	apache-jsp/src/main/java/org/apache/el/util/ReflectionUtil.java
	apache-jsp/src/main/java/org/apache/jasper/servlet/JasperInitializer.java
	apache-jsp/src/main/java/org/apache/jasper/servlet/TldPreScanned.java
	apache-jsp/src/main/java/org/apache/juli/FileHandler.java
	apache-jsp/src/main/java/org/apache/juli/logging/LogFactory.java
	apache-jsp/src/main/java/org/apache/naming/ContextAccessController.java
	apache-jsp/src/main/java/org/apache/naming/ContextBindings.java
	apache-jsp/src/main/java/org/apache/naming/factory/EjbFactory.java
	apache-jsp/src/main/java/org/apache/naming/factory/ResourceEnvFactory.java
	apache-jsp/src/main/java/org/apache/naming/factory/ResourceFactory.java
	apache-jsp/src/main/java/org/apache/naming/factory/TransactionFactory.java
	apache-jsp/src/main/java/org/apache/tomcat/SimpleInstanceManager.java
	apache-jsp/src/main/java/org/apache/tomcat/buildutil/CheckEol.java
	apache-jsp/src/main/java/org/apache/tomcat/jni/SSL.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/Constants.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/Code.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/Constant.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/classfile/Utility.java
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/package.html
	apache-jsp/src/main/java/org/apache/tomcat/util/bcel/util/package.html
	apache-jsp/src/main/java/org/apache/tomcat/util/codec/binary/Base64.java
	apache-jsp/src/main/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
	apache-jsp/src/main/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/CookieSupport.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/SetCookieSupport.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/IOUtils.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/parser/HttpParser.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/parser/MediaType.java
	apache-jsp/src/main/java/org/apache/tomcat/util/http/parser/MediaTypeCache.java
	apache-jsp/src/main/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
	apache-jsp/src/main/java/org/apache/tomcat/util/modeler/NotificationInfo.java
	apache-jsp/src/main/java/org/apache/tomcat/util/modeler/OperationInfo.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/AbstractEndpoint.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/Nio2Channel.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/Nio2Endpoint.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/NioBlockingSelector.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/NioEndpoint.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/SecureNio2Channel.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/SecureNioChannel.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/SocketProperties.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
	apache-jsp/src/main/java/org/apache/tomcat/util/net/res/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
	apache-jsp/src/main/java/org/apache/tomcat/util/threads/TaskThread.java
	apache-jsp/src/main/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
	apache-jsp/src/main/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/WsSession.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerPartialBase.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBase.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/server/LocalStrings.properties
	apache-jsp/src/main/java/org/apache/tomcat/websocket/server/WsContextListener.java
	apache-jsp/src/main/java/org/apache/tomcat/websocket/server/WsServerContainer.java
	apache-jsp/src/main/modules/jdbc-pool/doc/jdbc-pool.xml
	apache-jsp/src/main/res/checkstyle/org-import-control.xml
	apache-jsp/src/main/res/findbugs/filter-false-positives.xml
	apache-jsp/src/main/res/ide-support/eclipse/eclipse.classpath
	apache-jsp/src/main/res/ide-support/netbeans/nb-tomcat-build.properties
	apache-jsp/src/main/res/ide-support/netbeans/project.xml
	apache-jsp/src/main/res/maven/mvn.properties.default
	apache-jsp/src/main/res/maven/tomcat-embed-jasper.pom
	apache-jsp/src/main/res/maven/tomcat-jasper.pom
	apache-jsp/src/main/res/rat/rat-excludes.txt
	apache-jsp/src/main/res/tomcat.nsi
	apache-jsp/src/main/test/javax/el/TestELProcessor.java
	apache-jsp/src/main/test/javax/el/TestResourceBundleELResolver.java
	apache-jsp/src/main/test/javax/el/TestUtil.java
	apache-jsp/src/main/test/javax/servlet/http/TestCookie.java
	apache-jsp/src/main/test/javax/servlet/http/TestCookieStrict.java
	apache-jsp/src/main/test/org/apache/catalina/comet/TestCometProcessor.java
	apache-jsp/src/main/test/org/apache/catalina/connector/TestCoyoteAdapter.java
	apache-jsp/src/main/test/org/apache/catalina/connector/TestMaxConnections.java
	apache-jsp/src/main/test/org/apache/catalina/connector/TestRequest.java
	apache-jsp/src/main/test/org/apache/catalina/core/TestStandardContext.java
	apache-jsp/src/main/test/org/apache/catalina/core/TestStandardContextResources.java
	apache-jsp/src/main/test/org/apache/catalina/core/TesterContext.java
	apache-jsp/src/main/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
	apache-jsp/src/main/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
	apache-jsp/src/main/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
	apache-jsp/src/main/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
	apache-jsp/src/main/test/org/apache/catalina/servlets/TestDefaultServlet.java
	apache-jsp/src/main/test/org/apache/catalina/startup/SimpleHttpClient.java
	apache-jsp/src/main/test/org/apache/catalina/startup/TestTomcat.java
	apache-jsp/src/main/test/org/apache/catalina/startup/TomcatBaseTest.java
	apache-jsp/src/main/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
	apache-jsp/src/main/test/org/apache/catalina/webresources/AbstractTestResourceSet.java
	apache-jsp/src/main/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
	apache-jsp/src/main/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
	apache-jsp/src/main/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
	apache-jsp/src/main/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
	apache-jsp/src/main/test/org/apache/el/TestELEvaluation.java
	apache-jsp/src/main/test/org/apache/el/TestELInJsp.java
	apache-jsp/src/main/test/org/apache/el/TestValueExpressionImpl.java
	apache-jsp/src/main/test/org/apache/jasper/TestJspC.java
	apache-jsp/src/main/test/org/apache/jasper/compiler/TestELParser.java
	apache-jsp/src/main/test/org/apache/jasper/compiler/TestGenerator.java
	apache-jsp/src/main/test/org/apache/jasper/compiler/TestParser.java
	apache-jsp/src/main/test/org/apache/tomcat/util/buf/TestUtf8.java
	apache-jsp/src/main/test/org/apache/tomcat/util/http/TestSetCookieSupport.java
	apache-jsp/src/main/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
	apache-jsp/src/main/test/org/apache/tomcat/util/http/parser/TestMediaType.java
	apache-jsp/src/main/test/org/apache/tomcat/util/net/TestClientCert.java
	apache-jsp/src/main/test/org/apache/tomcat/util/net/TestCustomSsl.java
	apache-jsp/src/main/test/org/apache/tomcat/util/net/TestSsl.java
	apache-jsp/src/main/test/org/apache/tomcat/util/net/TesterSupport.java
	apache-jsp/src/main/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
	apache-jsp/src/main/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
	apache-jsp/src/main/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
	apache-jsp/src/main/test/webapp/WEB-INF/bug53545.tld
	apache-jsp/src/main/test/webapp/WEB-INF/bugs.tld
	apache-jsp/src/main/test/webapp/WEB-INF/tags/bug55198.tagx
	apache-jsp/src/main/test/webapp/bug45nnn/bug45451.jspf
	apache-jsp/src/main/test/webapp/bug5nnnn/bug53545.html
	apache-jsp/src/main/webapps/docs/aio.xml
	apache-jsp/src/main/webapps/docs/changelog.xml
	apache-jsp/src/main/webapps/docs/config/ajp.xml
	apache-jsp/src/main/webapps/docs/config/context.xml
	apache-jsp/src/main/webapps/docs/config/engine.xml
	apache-jsp/src/main/webapps/docs/config/executor.xml
	apache-jsp/src/main/webapps/docs/config/globalresources.xml
	apache-jsp/src/main/webapps/docs/config/host.xml
	apache-jsp/src/main/webapps/docs/config/http.xml
	apache-jsp/src/main/webapps/docs/config/jar-scan-filter.xml
	apache-jsp/src/main/webapps/docs/config/jar-scanner.xml
	apache-jsp/src/main/webapps/docs/config/listeners.xml
	apache-jsp/src/main/webapps/docs/config/project.xml
	apache-jsp/src/main/webapps/docs/config/systemprops.xml
	apache-jsp/src/main/webapps/docs/config/valve.xml
	apache-jsp/src/main/webapps/docs/default-servlet.xml
	apache-jsp/src/main/webapps/docs/deployer-howto.xml
	apache-jsp/src/main/webapps/docs/funcspecs/fs-admin-apps.xml
	apache-jsp/src/main/webapps/docs/funcspecs/fs-jdbc-realm.xml
	apache-jsp/src/main/webapps/docs/funcspecs/fs-jndi-realm.xml
	apache-jsp/src/main/webapps/docs/images/docs-stylesheet.css
	apache-jsp/src/main/webapps/docs/jndi-datasource-examples-howto.xml
	apache-jsp/src/main/webapps/docs/jndi-resources-howto.xml
	apache-jsp/src/main/webapps/docs/logging.xml
	apache-jsp/src/main/webapps/docs/realm-howto.xml
	apache-jsp/src/main/webapps/docs/security-howto.xml
	apache-jsp/src/main/webapps/docs/security-manager-howto.xml
	apache-jsp/src/main/webapps/docs/tribes/introduction.xml
	apache-jsp/src/main/webapps/docs/web-socket-howto.xml
	apache-jsp/src/main/webapps/docs/windows-service-howto.xml
	apache-jsp/src/main/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java
	apache-jsp/src/main/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java