Squashed 'apache-jasper/src/main/' changes from 304ebf3..3b05083

3b05083 Remove use of optimize flag that has been a NO-OP since Java 1.1 Patch by ebourg via GitHub
4b3c4d7 Tweak error message to show actual file name
92acbe3 Add 8.0.3 release date
2a6c5a8 In some circumstances asynchronous requests could time out too soon.
fd0d862 Assert that version number of written and re-parsed web.xml is as expected.
a03ba6a Assert that version of merged web.xml is as expected.
610a540 Followup to r1567148 Expand validation tests for merged web.xml: add default conf/web.xml into the merged one.
5b15d33 Correct typo in test method names
1d3bd48 Fix checkstyle failure of trailing whitespace. Add changelog entry for r1567306
5209f8f Keep pace with DBCP 2
0b2141c Update
5a04356 Generate a valid root element for all possible versions of web.xml
098e66f Prep for next release
4b6b0f6 Followup to r1566695 Correct typo
b5c3f3e Working off a Commons Pool release again.
47366b9 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56115 Expose the httpusecaches property of Ant's get task as some users may need to change the default. Based on a suggestion by Anthony.
7109af0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56125 Correctly construct the URL for a resource that represents the root of a JAR file.
d3ebc3e Whitespace police
6e5420c Restore the ability to use addURL()
9883e94 Cast is no longer necessary with DBCP 2
9ea3850 Remove mentioning of TC 6 from docs. Remove doClusterLog and clusterLogName description from cluster docs, those no longer exist.
e5e7f2c Fix a secondary issue identified in https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
3a34a83 Update DBCP build to pick up version with SecurityManager improvements
c0e93b2 Properties file move locations as well.
14b30a0 Prep for next release
0e5fed9 Tab police
4556309 Add a check to the build to catch problems copying the DBCP resources
df6a16d Fix build of DBCP2. The project structure has changed and the classes are now in src/main, like in Pool2.
e0c00a8 Correct typo in message printed by validateAccessLog() when a testcase runs too long.
09560e0 Changelog entry for r1565300, r1565416.
9ace6c2 Update Commons DBCP snapshot
ac4318e Simplify code. There is no need to iterate over parts and cleanup them, Tomcat takes care of that in Request.recycle().
edc0704 Followup to r1565163 Catch exceptions thrown by getParts() and report them as other upload errors (in the message box on the HTML page).
2938472 Fix CVE-2014-0050 DoS with malformed Content-Type header and multipart request processing. Update to latest code (r1565159) from Commons FileUpload
0372ce7 Followup to r1562597 xmlBlockExternal is now true by default. It is the false value that now needs to be passed explicitly.
261322b Followup to r1562597 Align return value in stub class with the default one in StandardContext
0c7fdec Pickup yesterdays DBCP changes
3330484 Keep a note of Commons DBCP updates
edec70a Whitespace police
3aa603f According to JavaEE specification (EE.5.4.1.3) when an env entry is specified in the web deployment descriptor and with annotation then the definition in the web deployment descriptor is with priority.
e320bfa Update the changelog.
28c8ca3 Move class Javadoc to the correct place
753b36d Javadoc: fix typo and unclosed <b> tag
4d6d003 Fix javadoc markup (reviewing r1561778, r1561773). Do not include unrelated text into the value of @version, @param.
abe7d4d Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56096 When creating JMXConnectorServer use the correct rmiBindAddress. Patch provided by Jim Talbut.
0bfc0f2 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56104 Correct the version number for the installer
60f18d0 Keep up with DBCP2
1e70f90 Simplify. File.isDirectory() already checks for existence.
ee0ebdf Fix typo.
eee60a1 Fix WebDAV
ea1dc0a Update
16190b8 Consistent text in rtext
3b58df3 Need to update site and announce but this is when files were copied to mirrors etc.
04ed93b Keep up with DBCP2

git-subtree-dir: apache-jasper/src/main
git-subtree-split: 3b050833a567298c5151754399412f0c17beb424
Merge commit 'c3fcc54c4041e63943e3896e919361f6b967547d'

Conflicts:
	apache-jasper/src/main/TOMCAT-NEXT.txt
	apache-jasper/src/main/bin/service.bat
	apache-jasper/src/main/build.properties.default
	apache-jasper/src/main/build.xml
	apache-jasper/src/main/java/org/apache/catalina/core/ApplicationContext.java
	apache-jasper/src/main/java/org/apache/catalina/ha/ClusterDeployer.java
	apache-jasper/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
	apache-jasper/src/main/java/org/apache/catalina/manager/HTMLManagerServlet.java
	apache-jasper/src/main/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
	apache-jasper/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
	apache-jasper/src/main/java/org/apache/catalina/startup/Catalina.java
	apache-jasper/src/main/java/org/apache/catalina/tribes/io/XByteBuffer.java
	apache-jasper/src/main/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
	apache-jasper/src/main/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
	apache-jasper/src/main/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
	apache-jasper/src/main/java/org/apache/coyote/http11/AbstractHttp11Processor.java
	apache-jasper/src/main/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
	apache-jasper/src/main/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
	apache-jasper/src/main/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
	apache-jasper/src/main/res/maven/mvn.properties.default
	apache-jasper/src/main/res/side_left.bmp
	apache-jasper/src/main/test/org/apache/catalina/core/TesterContext.java
	apache-jasper/src/main/test/org/apache/catalina/startup/TestContextConfig.java
	apache-jasper/src/main/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
	apache-jasper/src/main/test/org/apache/catalina/valves/TesterAccessLogValve.java
	apache-jasper/src/main/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
	apache-jasper/src/main/test/webapp-fragments/WEB-INF/web.xml
	apache-jasper/src/main/webapps/docs/appdev/build.xml.txt
	apache-jasper/src/main/webapps/docs/changelog.xml
	apache-jasper/src/main/webapps/docs/config/cluster.xml
	apache-jasper/src/main/webapps/docs/config/listeners.xml
	apache-jasper/src/main/webapps/docs/realm-howto.xml
Squashed 'apache-el/src/main/' changes from 0372ce7..3b05083

3b05083 Remove use of optimize flag that has been a NO-OP since Java 1.1 Patch by ebourg via GitHub
4b3c4d7 Tweak error message to show actual file name
92acbe3 Add 8.0.3 release date
2a6c5a8 In some circumstances asynchronous requests could time out too soon.
fd0d862 Assert that version number of written and re-parsed web.xml is as expected.
a03ba6a Assert that version of merged web.xml is as expected.
610a540 Followup to r1567148 Expand validation tests for merged web.xml: add default conf/web.xml into the merged one.
5b15d33 Correct typo in test method names
1d3bd48 Fix checkstyle failure of trailing whitespace. Add changelog entry for r1567306
5209f8f Keep pace with DBCP 2
0b2141c Update
5a04356 Generate a valid root element for all possible versions of web.xml
098e66f Prep for next release
4b6b0f6 Followup to r1566695 Correct typo
b5c3f3e Working off a Commons Pool release again.
47366b9 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56115 Expose the httpusecaches property of Ant's get task as some users may need to change the default. Based on a suggestion by Anthony.
7109af0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56125 Correctly construct the URL for a resource that represents the root of a JAR file.
d3ebc3e Whitespace police
6e5420c Restore the ability to use addURL()
9883e94 Cast is no longer necessary with DBCP 2
9ea3850 Remove mentioning of TC 6 from docs. Remove doClusterLog and clusterLogName description from cluster docs, those no longer exist.
e5e7f2c Fix a secondary issue identified in https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
3a34a83 Update DBCP build to pick up version with SecurityManager improvements
c0e93b2 Properties file move locations as well.
14b30a0 Prep for next release
0e5fed9 Tab police
4556309 Add a check to the build to catch problems copying the DBCP resources
df6a16d Fix build of DBCP2. The project structure has changed and the classes are now in src/main, like in Pool2.
e0c00a8 Correct typo in message printed by validateAccessLog() when a testcase runs too long.
09560e0 Changelog entry for r1565300, r1565416.
9ace6c2 Update Commons DBCP snapshot
ac4318e Simplify code. There is no need to iterate over parts and cleanup them, Tomcat takes care of that in Request.recycle().
edc0704 Followup to r1565163 Catch exceptions thrown by getParts() and report them as other upload errors (in the message box on the HTML page).
2938472 Fix CVE-2014-0050 DoS with malformed Content-Type header and multipart request processing. Update to latest code (r1565159) from Commons FileUpload

git-subtree-dir: apache-el/src/main
git-subtree-split: 3b050833a567298c5151754399412f0c17beb424
Merge commit 'a7f809e2ac2bcd396988645a19b5f9075c4304ef'

Conflicts:
	apache-el/src/main/bin/service.bat
	apache-el/src/main/build.properties.default
	apache-el/src/main/build.xml
	apache-el/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
	apache-el/src/main/java/org/apache/catalina/manager/HTMLManagerServlet.java
	apache-el/src/main/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
	apache-el/src/main/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
	apache-el/src/main/java/org/apache/coyote/http11/AbstractHttp11Processor.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/XmlIdentifiers.java
	apache-el/src/main/java/org/apache/tomcat/util/descriptor/web/WebXml.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/MultipartStream.java
	apache-el/src/main/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
	apache-el/src/main/res/maven/mvn.properties.default
	apache-el/src/main/test/org/apache/catalina/valves/TesterAccessLogValve.java
	apache-el/src/main/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
	apache-el/src/main/webapps/docs/appdev/build.xml.txt
	apache-el/src/main/webapps/docs/changelog.xml
	apache-el/src/main/webapps/docs/config/cluster.xml
	apache-el/src/main/webapps/docs/realm-howto.xml
Added merge instructions