svn commit: r6993 [2/2] - in /dev/tomcat/tomcat-7/v7.0.57: ./ bin/ bin/embed/ bin/extras/ src/

2014-11-03 Thread violetagg 
Added: dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.asc Mon Nov 
 3 09:42:00 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJUV0AyAAoJECCLCrHWMBHHeYMQAIV697cA96RHUdhVSQS6gdDF
+ow9J7c94izRYljAYYf8Et1HkqWxqBn4UufHtAVNRxflyIHenMNpJjFYHV26U9x/x
+GNKLgeouEFnvjrnVk2xDFpx6kRofpYZsKPqW+H2VdAMx5tzP44/dcDn6+FONTMhb
+khOej8zLkjjJibHZKjNQujhvl2r843PjozUp6oUBMVJaYkVpxfOXjwZD04s15PhQ
+Eu4pY0E1Hty5AuxN4d+fje57qDzxMKoy18ZA/L9n06INFOEyqTfy9hKWFbJdFUoC
+N33DV4mggYlCVqr4aahO1BhgpiIyEHsGVhqyIr4j65n8UV5R14MxeqALf+9K36LK
+YpJwVO//3YWX1mekwDldmrfsChn77c1aHARwMQJkGnTDqh4KnVa0w8Xu6fVDYeVI
+6hTKB9QPuufgjsIC9ER2oFedXhZT5l6TSyUX85KbtHUrmYMttTGNMMCAUP7lwPUA
+mbA62SK0FaV+d8yfFS6D0peXo1+uj1wlcYYk9QkT0A2c64G/WfgARffAzUuJoxew
+RH/Tjc3Kiu3NsQiuXciZm5CP9T0YazSvaBTp9uLYyPFO4mgiBDc+D8KTD49CdVhY
+G5Ya22dQec17z0JhrbgS/5SfcimgPAUa/QkaZbuiVH3kpQjJ41GM6OSuN+WqRunE
+808LXyn/hSW8nI9wQbbQ
+=z1wd
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.md5 Mon Nov 
 3 09:42:00 2014
@@ -0,0 +1 @@
+005bbc20fb2192272d976dfe0e3f6bed *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.asc Mon Nov  3 
09:42:00 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJUV0AxAAoJECCLCrHWMBHHlKkP/1IK91bjEBpw7uDcBZLWySpA
+KCG/ShT9c5NVSYVMKFt6hOmDr32s30KZ7HDf/5i4FnsHDTPkFnB5VXv2quDv1vCE
+ku+/jSTBRq34EE1+5S7pHIGUzelIXLywcYcknYazcpOdMpN1bTOCzObzc1U1zuWe
+9TkB/+mOWg1bGUv+q4inji6kMcXNwFF4zVdJ8SaXtH4BOhz771jyDPkfd81jqdcg
+u8vyZj/aK/aUkYkEatjk3LTlywbHuP3todVYs5703OFFR9XYIkfrbieB0de3SDeN
+Npu4zyIHtCTgxCdxNwPUJIny+Ec07DCOhjSAc7nIby4jx8rWdhGzdCmkrVnWsy61
+cs2hxbTmRzS2TCq3ctm/yTUXnEzbhd6O3YMNwCyvc8N9RaljBMl6UhwLXC7ZUSgw
+SF312FupaWOqmh/endUjVEqjzaut7m2VbpTAwbCqOgPxN16cCmdkwzOCYnFcGUCd
+HrtYgf/Jt8HbL8/4+aiNnVsN+97GFBraRclLZExaEc08njXmVFAPXkIMPynvquuQ
+pkRMsprnvmc3QLzBWXJYBZOqNbKL1u7Qo8Pm81FZ4ZFF0irW0IJAkvQPAA3+Ql+q
+X8p5KWuabQXpoZ6DhUsW682QJPPvbqzajQbtQ3iWVEk0i38kh+wszU3bciM5SRNV
+6/7pgV+xHREn+YueAOQT
+=BhhT
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.md5 Mon Nov  3 
09:42:00 2014
@@ -0,0 +1 @@
+ecc909ae6dd7329cbab653403589dd82 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz.asc
==
--- dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz.asc Mon Nov 
 3 09:42:00 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJUV0NvAAoJECCLCrHWMBHHsfwP/0zrj/K9zR25YZbUsLRj4p6P
+aeRM2vgQdQhvZmls+p5EwpQ/Grjmh0XFnBWr4XiSpoCRNmU6EhetRHCaS5NUGnYb
+noWP19kgpZvQMHo0OPAfTFJ/06lMw8ly16jkxqAt4m9iqqHMzjKQBJCnuxJbqkBS
+xO4/uXPP7N4qyM7H5V2kAhOLRKQt4qFMVsnL+r9TP/dGjJbdNYlnIOIBBfBEdiz4
+UWCqHqok7Y5xA6tyZ1d+VbBgu3oj0YazR7XG+mdHf4dz2iGaddL+eaXPEzvvmSQj
+wuJkVgXjHOfZsgwj32vaOAyy132Tgl3iZEfwfFnd4pRfSIqrgG0K5v/k/sSFU52h
+daCEs6SXnDQLOTwsIL43V/e99B/RQkssRGH3xDY3GBdD6f6rPTeSN78pgoapENYb
+8D2vnjCXCyEJ6QAB4CRYL6ExDYfajgq/3LzeWOjQN70zOl6v08tFQGif0hDTN1mu
+59B8P5QYn5oTZfEGgzrQdvNzEPmYpDuglr3dOYFxTLdZIvntk1Why2kn8i7rm8sB
+Bu0EImlFNOIYKdzRx7i89KQqfUK

svn commit: r6993 [1/2] - in /dev/tomcat/tomcat-7/v7.0.57: ./ bin/ bin/embed/ bin/extras/ src/

2014-11-03 Thread violetagg 
Author: violetagg
Date: Mon Nov  3 09:42:00 2014
New Revision: 6993

Log:
Stage 7.0.57RC

Added:
dev/tomcat/tomcat-7/v7.0.57/
dev/tomcat/tomcat-7/v7.0.57/KEYS
dev/tomcat/tomcat-7/v7.0.57/README.html
dev/tomcat/tomcat-7/v7.0.57/RELEASE-NOTES
dev/tomcat/tomcat-7/v7.0.57/bin/
dev/tomcat/tomcat-7/v7.0.57/bin/README.html
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-deployer.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-deployer.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-deployer.zip   (with 
props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-deployer.zip.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-deployer.zip.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-fulldocs.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-fulldocs.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-i64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-i64.zip.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-i64.zip.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-x64.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-x64.zip.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-x64.zip.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-x86.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-x86.zip.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57-windows-x86.zip.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.exe   (with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.exe.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.exe.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.tar.gz   (with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.zip   (with props)
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.zip.asc
dev/tomcat/tomcat-7/v7.0.57/bin/apache-tomcat-7.0.57.zip.md5
dev/tomcat/tomcat-7/v7.0.57/bin/embed/
dev/tomcat/tomcat-7/v7.0.57/bin/embed/apache-tomcat-7.0.57-embed.tar.gz   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/embed/apache-tomcat-7.0.57-embed.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.57/bin/embed/apache-tomcat-7.0.57-embed.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.57/bin/embed/apache-tomcat-7.0.57-embed.zip   
(with props)
dev/tomcat/tomcat-7/v7.0.57/bin/embed/apache-tomcat-7.0.57-embed.zip.asc
dev/tomcat/tomcat-7/v7.0.57/bin/embed/apache-tomcat-7.0.57-embed.zip.md5
dev/tomcat/tomcat-7/v7.0.57/bin/extras/
dev/tomcat/tomcat-7/v7.0.57/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.57/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-7/v7.0.57/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-7/v7.0.57/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-7/v7.0.57/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-7/v7.0.57/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-7/v7.0.57/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-7/v7.0.57/src/
dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz   (with 
props)
dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz.asc
dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.tar.gz.md5
dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.zip   (with props)
dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.zip.asc
dev/tomcat/tomcat-7/v7.0.57/src/apache-tomcat-7.0.57-src.zip.md5

Added: dev/tomcat/tomcat-7/v7.0.57/KEYS
==
--- dev/tomcat/tomcat-7/v7.0.57/KEYS (added)
+++ dev/tomcat/tomcat-7/v7.0.57/KEYS Mon Nov  3 09:42:00 2014
@@ -0,0 +1,650 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also av

[VOTE] Release Apache Tomcat 8.0.15

2014-11-03 Thread Mark Thomas 
The proposed Apache Tomcat 8.0.15 release is now available for voting.

The main changes since 8.0.14 are:
- Add support for RFC6265 cookie parsing and generation. This is
  currently disabled by default and may be enabled via the
  CookieProcessor element of a Context.
- Add pluggable password derivation support to the Realms via the new
  CredentialHandler interface.
- Add support for TLSv1.1 and TLSv1.2 for APR connector. Based upon a
  patch by Marcel Šebek. This feature requires Tomcat Native library
  1.1.32 or later.
- Disable SSLv3 by default for all HTTPS connectors

There is also a large than usual collection of bug fixes, new features
and performance improvements. For full details, see the changelog:
http://svn.us.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.15/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1025/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_15/

The proposed 8.0.15 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.0.14

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.0.15

2014-11-03 Thread Mark Thomas 
On 03/11/2014 09:51, Mark Thomas wrote:
> The proposed Apache Tomcat 8.0.15 release is now available for voting.
> 
> The main changes since 8.0.14 are:
> - Add support for RFC6265 cookie parsing and generation. This is
>   currently disabled by default and may be enabled via the
>   CookieProcessor element of a Context.
> - Add pluggable password derivation support to the Realms via the new
>   CredentialHandler interface.
> - Add support for TLSv1.1 and TLSv1.2 for APR connector. Based upon a
>   patch by Marcel Šebek. This feature requires Tomcat Native library
>   1.1.32 or later.
> - Disable SSLv3 by default for all HTTPS connectors
> 
> There is also a large than usual collection of bug fixes, new features
> and performance improvements. For full details, see the changelog:
> http://svn.us.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.15/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1025/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_15/
> 
> The proposed 8.0.15 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.0.14

s/8.0.14/8.0.15/

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Release Apache Tomcat 7.0.57

2014-11-03 Thread Violeta Georgieva 
The proposed Apache Tomcat 7.0.57 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.57/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1026/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_57/

The proposed 7.0.57 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 7.0.57 Stable

Regards,
Violeta

Re: [VOTE] Release Apache Tomcat 8.0.15

2014-11-03 Thread Mark Thomas 
On 03/11/2014 09:51, Mark Thomas wrote:
> The proposed Apache Tomcat 8.0.15 release is now available for voting.
> 
> The main changes since 8.0.14 are:
> - Add support for RFC6265 cookie parsing and generation. This is
>   currently disabled by default and may be enabled via the
>   CookieProcessor element of a Context.
> - Add pluggable password derivation support to the Realms via the new
>   CredentialHandler interface.
> - Add support for TLSv1.1 and TLSv1.2 for APR connector. Based upon a
>   patch by Marcel Šebek. This feature requires Tomcat Native library
>   1.1.32 or later.
> - Disable SSLv3 by default for all HTTPS connectors
> 
> There is also a large than usual collection of bug fixes, new features
> and performance improvements. For full details, see the changelog:
> http://svn.us.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.15/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1025/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_15/
> 
> The proposed 8.0.15 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.0.15

Unit tests pass for all 4 connectors on 64-bit OSX, Linux and Windows
with Tomcat native 1.1.32.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636303 - in /tomcat/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 09:59:47 2014
New Revision: 1636303

URL: http://svn.apache.org/r1636303
Log:
Update for next release

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/maven/mvn.properties.default
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1636303&r1=1636302&r2=1636303&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Nov  3 09:59:47 2014
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=0
-version.build=15
+version.build=16
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=1636303&r1=1636302&r2=1636303&view=diff
==
--- tomcat/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/trunk/res/maven/mvn.properties.default Mon Nov  3 09:59:47 2014
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=8.0.15
+maven.asf.release.deploy.version=8.0.16
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1636303&r1=1636302&r2=1636303&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov  3 09:59:47 2014
@@ -44,6 +44,8 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues to not "pop up" wrt. others).
 -->
+
+
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636324 - in /tomcat/trunk: java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http11/upgrade/ java/org/apache/coyote/spdy/ webapps/

2014-11-03 Thread remm 
Author: remm
Date: Mon Nov  3 11:36:28 2014
New Revision: 1636324

URL: http://svn.apache.org/r1636324
Log:
Allow HTTP upgrade process to complete without data corruption when additional 
content is sent along with the upgrade header.

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/InputBuffer.java
tomcat/trunk/java/org/apache/coyote/Processor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1636324&r1=1636323&r2=1636324&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Nov  3 
11:36:28 2014
@@ -18,6 +18,7 @@ package org.apache.coyote;
 
 import java.io.IOException;
 import java.net.InetAddress;
+import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
@@ -666,11 +667,13 @@ public abstract class AbstractProtocol processor, boolean socketClosing,
 boolean addToPoller);
 protected abstract Processor createUpgradeProcessor(
-SocketWrapper socket,
+SocketWrapper socket, ByteBuffer leftoverInput,
 HttpUpgradeHandler httpUpgradeProcessor) throws IOException;
 
 protected void register(AbstractProcessor processor) {

Modified: tomcat/trunk/java/org/apache/coyote/InputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/InputBuffer.java?rev=1636324&r1=1636323&r2=1636324&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/InputBuffer.java Mon Nov  3 11:36:28 
2014
@@ -27,9 +27,6 @@ import org.apache.tomcat.util.buf.ByteCh
  *
  * This class is used only in the protocol implementation. All reading from
  * Tomcat ( or adapter ) should be done using Request.doRead().
- *
- *
- * @author Remy Maucherat
  */
 public interface InputBuffer {
 

Modified: tomcat/trunk/java/org/apache/coyote/Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1636324&r1=1636323&r2=1636324&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Processor.java Mon Nov  3 11:36:28 2014
@@ -17,6 +17,7 @@
 package org.apache.coyote;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.concurrent.Executor;
 
 import javax.servlet.http.HttpUpgradeHandler;
@@ -54,4 +55,10 @@ public interface Processor {
 void recycle(boolean socketClosing);
 
 void setSslSupport(SSLSupport sslSupport);
+
+/**
+ * Allows retrieving additional input during the upgrade process
+ * @return leftover bytes
+ */
+ByteBuffer getLeftoverInput();
 }

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1636324&r1=1636323&r2=1636324&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Mon Nov  
3 11:36:28 2014
@@ -1084,6 +1084,12 @@ public abstract class AbstractAjpProcess

svn commit: r1636325 - in /tomcat/trunk/test/org/apache/catalina/core: TestStandardContext.java TestStandardWrapper.java

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 11:42:22 2014
New Revision: 1636325

URL: http://svn.apache.org/r1636325
Log:
Reduce boilerplate code.

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1636325&r1=1636324&r2=1636325&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java Mon Nov 
 3 11:42:22 2014
@@ -292,50 +292,45 @@ public class TestStandardContext extends
 // called only once, even if is selected by several mapping
 // url-patterns or by both a url-pattern and a servlet-name.
 
-// Set up a container
-Tomcat tomcat = getTomcatInstance();
-
-File root = new File("test/webapp");
-tomcat.addWebapp("", root.getAbsolutePath());
+getTomcatInstanceTestWebapp(false, true);
 
-tomcat.start();
 ByteChunk result = new ByteChunk();
 
 // Check filter and servlet aren't called
 int rc = getUrl("http://localhost:"; + getPort() +
-"/bug49922/foo", result, null);
+"/test/bug49922/foo", result, null);
 assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
 assertTrue(result.getLength() > 0);
 
 // Check extension mapping works
-result = getUrl("http://localhost:"; + getPort() + "/foo.do");
+result = getUrl("http://localhost:"; + getPort() + "/test/foo.do");
 assertEquals("FilterServlet", result.toString());
 
 // Check path mapping works
-result = getUrl("http://localhost:"; + getPort() + "/bug49922/servlet");
+result = getUrl("http://localhost:"; + getPort() + 
"/test/bug49922/servlet");
 assertEquals("FilterServlet", result.toString());
 
 // Check servlet name mapping works
-result = getUrl("http://localhost:"; + getPort() + "/foo.od");
+result = getUrl("http://localhost:"; + getPort() + "/test/foo.od");
 assertEquals("FilterServlet", result.toString());
 
 // Check filter is only called once
 result = getUrl("http://localhost:"; + getPort() +
-"/bug49922/servlet/foo.do");
+"/test/bug49922/servlet/foo.do");
 assertEquals("FilterServlet", result.toString());
 result = getUrl("http://localhost:"; + getPort() +
-"/bug49922/servlet/foo.od");
+"/test/bug49922/servlet/foo.od");
 assertEquals("FilterServlet", result.toString());
 
 // Check dispatcher mapping
 result = getUrl("http://localhost:"; + getPort() +
-"/bug49922/target");
+"/test/bug49922/target");
 assertEquals("Target", result.toString());
 result = getUrl("http://localhost:"; + getPort() +
-"/bug49922/forward");
+"/test/bug49922/forward");
 assertEquals("FilterTarget", result.toString());
 result = getUrl("http://localhost:"; + getPort() +
-"/bug49922/include");
+"/test/bug49922/include");
 assertEquals("IncludeFilterTarget", result.toString());
 }
 
@@ -934,16 +929,9 @@ public class TestStandardContext extends
 
 @Test
 public void testBug56085() throws Exception {
-// Set up a container
-Tomcat tomcat = getTomcatInstance();
-
-File docBase = new File("test/webapp");
-Context ctx = tomcat.addContext("", docBase.getAbsolutePath());
-
-// Start the context
-tomcat.start();
+Tomcat tomcat = getTomcatInstanceTestWebapp(false, true);
 
-String realPath = ctx.getRealPath("\\");
+String realPath = ((Context) 
tomcat.getHost().findChildren()[0]).getRealPath("\\");
 
 Assert.assertNull(realPath);
 }

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1636325&r1=1636324&r2=1636325&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Mon Nov 
 3 11:42:22 2014
@@ -169,19 +169,12 @@ public class TestStandardWrapper extends
 
 @Test
 public void testSecurityAnnotationsMetaDataPriority() throws Exception {
-
-// Setup Tomcat instance
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "", appDir.getAbsolutePath());
-
-

svn commit: r1636326 - /tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 11:42:50 2014
New Revision: 1636326

URL: http://svn.apache.org/r1636326
Log:
Reduce boilerplate code.

Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1636326&r1=1636325&r2=1636326&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Mon 
Nov  3 11:42:50 2014
@@ -82,13 +82,7 @@ public class TestContextConfig extends T
 
 @Test
 public void testBug53574() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
-
+getTomcatInstanceTestWebapp(false, true);
 assertPageContains("/test/bug53574", "OK");
 }
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636329 - in /tomcat/trunk/test/org/apache/coyote: ajp/TestAbstractAjpProcessor.java http11/TestAbstractHttp11Processor.java

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 11:48:38 2014
New Revision: 1636329

URL: http://svn.apache.org/r1636329
Log:
Reduce boilerplate code.

Modified:
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1636329&r1=1636328&r2=1636329&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Mon 
Nov  3 11:48:38 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.ajp;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -121,13 +120,7 @@ public class TestAbstractAjpProcessor ex
 
 public void doTestPost(boolean multipleCL, int expectedStatus) throws 
Exception {
 
-Tomcat tomcat = getTomcatInstance();
-
-// Use the normal Tomcat ROOT context
-File root = new File("test/webapp");
-tomcat.addWebapp("", root.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 SimpleAjpClient ajpClient = new SimpleAjpClient();
 ajpClient.setPort(getPort());
@@ -136,7 +129,7 @@ public class TestAbstractAjpProcessor ex
 validateCpong(ajpClient.cping());
 
 TesterAjpMessage forwardMessage =
-ajpClient.createForwardMessage("/echo-params.jsp", 4);
+ajpClient.createForwardMessage("/test/echo-params.jsp", 4);
 forwardMessage.addHeader(0xA008, "9");
 if (multipleCL) {
 forwardMessage.addHeader(0xA008, "99");

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java?rev=1636329&r1=1636328&r2=1636329&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/TestAbstractHttp11Processor.java 
Mon Nov  3 11:48:38 2014
@@ -16,7 +16,6 @@
  */
 package org.apache.coyote.http11;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
@@ -137,13 +136,7 @@ public class TestAbstractHttp11Processor
 
 @Test
 public void testWithUnknownExpectation() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// Use the normal Tomcat ROOT context
-File root = new File("test/webapp");
-tomcat.addWebapp("", root.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 String request =
 "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -151,7 +144,7 @@ public class TestAbstractHttp11Processor
 "Expect: unknoen" + SimpleHttpClient.CRLF +
 SimpleHttpClient.CRLF;
 
-Client client = new Client(tomcat.getConnector().getLocalPort());
+Client client = new Client(getPort());
 client.setRequest(new String[] {request});
 
 client.connect();
@@ -162,13 +155,7 @@ public class TestAbstractHttp11Processor
 
 @Test
 public void testWithTEVoid() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// Use the normal Tomcat ROOT context
-File root = new File("test/webapp");
-tomcat.addWebapp("", root.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 String request =
 "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -180,7 +167,7 @@ public class TestAbstractHttp11Processor
 SimpleHttpClient.CRLF +
 "test=data";
 
-Client client = new Client(tomcat.getConnector().getLocalPort());
+Client client = new Client(getPort());
 client.setRequest(new String[] {request});
 
 client.connect();
@@ -191,13 +178,7 @@ public class TestAbstractHttp11Processor
 
 @Test
 public void testWithTEBuffered() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// Use the normal Tomcat ROOT context
-File root = new File("test/webapp");
-tomcat.addWebapp("", root.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 String request =
 "POST /echo-params.jsp HTTP/1.1" + SimpleHttpClient.CRLF +
@@ -209,7 +190,7 @@ public class TestAbstractHttp11Processor
 SimpleHttpClient.CRLF +
 "test=data";
 
-Client client = new Clien

svn commit: r1636337 - /tomcat/trunk/test/org/apache/jasper/compiler/

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 12:39:01 2014
New Revision: 1636337

URL: http://svn.apache.org/r1636337
Log:
Reduce boilerplate code.

Modified:
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestGenerator.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspDocumentParser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestJspReader.java
tomcat/trunk/test/org/apache/jasper/compiler/TestNodeIntegration.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java

tomcat/trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java
tomcat/trunk/test/org/apache/jasper/compiler/TestScriptingVariabler.java
tomcat/trunk/test/org/apache/jasper/compiler/TestTagLibraryInfoImpl.java
tomcat/trunk/test/org/apache/jasper/compiler/TestTagPluginManager.java
tomcat/trunk/test/org/apache/jasper/compiler/TestValidator.java

Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1636337&r1=1636336&r2=1636337&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Mon Nov  3 
12:39:01 2014
@@ -36,11 +36,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug49726a() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = new ByteChunk();
 Map> headers = new HashMap<>();
@@ -58,11 +54,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug49726b() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = new ByteChunk();
 Map> headers = new HashMap<>();
@@ -80,11 +72,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug53257a() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 // foo;bar.jsp
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
@@ -97,11 +85,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug53257b() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
 "/test/bug53257/foo&bar.jsp");
@@ -113,11 +97,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug53257c() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 // foo#bar.jsp
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
@@ -130,11 +110,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug53257d() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 // foo%bar.jsp
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
@@ -147,11 +123,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug53257e() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = getUrl("http://localhost:"; + getPort() +
 "/test/bug53257/foo+bar.jsp");
@@ -163,11 +135,7 @@ public class TestCompiler extends Tomcat
 
 @Test
 public void testBug53257f() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-tomcat.start();
+getTomcatInstanceTest

svn commit: r1636338 - in /tomcat/trunk/test/org/apache/jasper: runtime/TestJspWriterImpl.java runtime/TestPageContextImpl.java servlet/TestJspServlet.java

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 12:41:20 2014
New Revision: 1636338

URL: http://svn.apache.org/r1636338
Log:
Reduce boilerplate code.

Modified:
tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
tomcat/trunk/test/org/apache/jasper/servlet/TestJspServlet.java

Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java?rev=1636338&r1=1636337&r2=1636338&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestJspWriterImpl.java Mon Nov  
3 12:41:20 2014
@@ -16,14 +16,11 @@
  */
 package org.apache.jasper.runtime;
 
-import java.io.File;
-
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
 
@@ -31,12 +28,7 @@ public class TestJspWriterImpl extends T
 
 @Test
 public void bug54241a() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = new ByteChunk();
 
@@ -52,12 +44,7 @@ public class TestJspWriterImpl extends T
 
 @Test
 public void bug54241b() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = new ByteChunk();
 

Modified: tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java?rev=1636338&r1=1636337&r2=1636338&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/runtime/TestPageContextImpl.java Mon 
Nov  3 12:41:20 2014
@@ -41,12 +41,7 @@ public class TestPageContextImpl extends
 
 @Test
 public void testDoForward() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = new ByteChunk();
 
@@ -82,12 +77,7 @@ public class TestPageContextImpl extends
 
 @Test
 public void testIncludeThrowsIOException() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk res = new ByteChunk();
 

Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestJspServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestJspServlet.java?rev=1636338&r1=1636337&r2=1636338&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/servlet/TestJspServlet.java (original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestJspServlet.java Mon Nov  3 
12:41:20 2014
@@ -70,14 +70,7 @@ public class TestJspServlet  extends Tom
 
 @Test
 public void testBug56568b() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// Use the test web application so JSP support is available and the
-// default JSP error page can be used.
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 int rc = methodUrl("http://localhost:"; + getPort() + 
"/test/jsp/error.jsp",
 new ByteChunk(), 50, null, null, "PUT");
@@ -91,14 +84,7 @@ public class TestJspServlet  extends Tom
 
 @Test
 public void testBug56568c() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-// Use the test web application so JSP support is available and the
-// default JSP error page can be used.
-File appDir = new File("test/webapp");
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 int rc = methodUrl("http://localhost:"; + getPort() + 
"/tes

svn commit: r1636340 - /tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 12:43:36 2014
New Revision: 1636340

URL: http://svn.apache.org/r1636340
Log: (empty)

Modified:
tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java

Modified: tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java?rev=1636340&r1=1636339&r2=1636340&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java 
(original)
+++ tomcat/trunk/test/org/apache/jasper/TestJspCompilationContext.java Mon Nov  
3 12:43:36 2014
@@ -16,14 +16,11 @@
  */
 package org.apache.jasper;
 
-import java.io.File;
-
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
 
@@ -31,13 +28,7 @@ public class TestJspCompilationContext e
 
 @Test
 public void testTagFileInJar() throws Exception {
-Tomcat tomcat = getTomcatInstance();
-
-File appDir = new File("test/webapp");
-// app dir is relative to server home
-tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
-
-tomcat.start();
+getTomcatInstanceTestWebapp(false, true);
 
 ByteChunk body = new ByteChunk();
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636341 - /tomcat/tc8.0.x/trunk/

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 12:45:04 2014
New Revision: 1636341

URL: http://svn.apache.org/r1636341
Log:
Create Tomcat 8.0.x development branch

Added:
tomcat/tc8.0.x/trunk/
  - copied from r1636340, tomcat/trunk/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636342 - in /tomcat/site/trunk: docs/svn.html docs/whichversion.html xdocs/svn.xml xdocs/whichversion.xml

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 12:51:54 2014
New Revision: 1636342

URL: http://svn.apache.org/r1636342
Log:
Add initial Tomcat 9 info

Modified:
tomcat/site/trunk/docs/svn.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/svn.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/svn.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1636342&r1=1636341&r2=1636342&view=diff
==
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Mon Nov  3 12:51:54 2014
@@ -342,6 +342,16 @@ http://svn.apache.org/repos/asf/tomcat
 
+http://svn.apache.org/repos/asf/tomcat/tc8.0.x";>
+/tc8.0.x/
+The stable 8.0.x release branch. See
+http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk";>
+/tc8.0.x/trunk/.
+  
+
+  
+
+
 http://svn.apache.org/repos/asf/tomcat/trunk";>
 /trunk/
 The primary development branch. Patches are committed here 

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1636342&r1=1636341&r2=1636342&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Mon Nov  3 12:51:54 2014
@@ -222,6 +222,19 @@ mapping between the specifications and t
 
 
   
+4.0
+  TBD (2.4?)
+  TBD (3.1?)
+  TBD (1.2?)
+  9.0.x
+  None
+  8 and later
+
+
+
+
+
+  
 3.1
   2.3
   3.0
@@ -382,16 +395,35 @@ stably for extended periods of time.
 
 
 
+Apache Tomcat 9.x
+
+
+
+
+Apache Tomcat 9.x is the current focus of development, It
+builds on Tomcat 8.0.x and will implement the Servlet 4.0,
+JSP 2.4?, EL 3.1? and
+Web Socket 1.2? specifications. In addition to that, it
+includes the following significant improvements:
+
+
+
+
+TBD (9.0.x is work in progress)
+
+
+
+
+
 Apache Tomcat 8.x
 
 
 
 
-Apache Tomcat 8.x is the current focus of development, It
-builds upon the improvements made in Tomcat 7.0.x and implements the
+Apache Tomcat 8.x builds on Tomcat 7.0.x and implements the
 Servlet 3.1, JSP 2.3, EL 3.0
 and Web Socket 1.1 specifications. In addition
-to that, it includes the following improvements:
+to that, it includes the following significant improvements:
 
 
 

Modified: tomcat/site/trunk/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1636342&r1=1636341&r2=1636342&view=diff
==
--- tomcat/site/trunk/xdocs/svn.xml (original)
+++ tomcat/site/trunk/xdocs/svn.xml Mon Nov  3 12:51:54 2014
@@ -102,6 +102,13 @@ http://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/.
   
   
+http://svn.apache.org/repos/asf/tomcat/tc8.0.x";>
+/tc8.0.x/
+The stable 8.0.x release branch. See
+http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk";>
+/tc8.0.x/trunk/.
+  
+  
 http://svn.apache.org/repos/asf/tomcat/trunk";>
 /trunk/
 The primary development branch. Patches are committed here 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1636342&r1=1636341&r2=1636342&view=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Mon Nov  3 12:51:54 2014
@@ -30,6 +30,16 @@ mapping between the specifications and t
 
 
 
+  4.0
+  TBD (2.4?)
+  TBD (3.1?)
+  TBD (1.2?)
+  9.0.x
+  None
+  8 and later
+
+
+
   3.1
   2.3
   3.0
@@ -155,13 +165,25 @@ stably for extended periods of time.
 
 
 
+
+
+Apache Tomcat 9.x is the current focus of development, It
+builds on Tomcat 8.0.x and will implement the Servlet 4.0,
+JSP 2.4?, EL 3.1? and
+Web Socket 1.2? specifications. In addition to that, it
+includes the following significant improvements:
+
+
+TBD (9.0.x is work in progress)
+
+
+
 
 
-Apache Tomcat 8.x is the current focus of development, It
-builds upon the improvements made in Tomcat 7.0.x and implements the
+Apache Tomcat 8.x builds on Tomcat 7.0.x and implements the
 Servlet 3.1, JSP 2.3, EL 3.0
 and Web Socket 1.1 specifications. In addition
-to that, it includes the following improvements:
+to that, it includes the following significant improvements:
 
 
 A single, common resources implementation to replace the multiple resource



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636345 - in /tomcat/trunk: java/javax/el/ExpressionFactory.java java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:10:04 2014
New Revision: 1636345

URL: http://svn.apache.org/r1636345
Log:
Fix IDE warnings after switching to Java 8

Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java

Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1636345&r1=1636344&r2=1636345&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Mon Nov  3 13:10:04 2014
@@ -336,7 +336,7 @@ public abstract class ExpressionFactory 
 }
 
 public void setFactoryClass(Class clazz) {
-ref = new WeakReference>(clazz);
+ref = new WeakReference<>(clazz);
 }
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java?rev=1636345&r1=1636344&r2=1636345&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolingConnection.java Mon 
Nov  3 13:10:04 2014
@@ -321,23 +321,23 @@ public class PoolingConnection extends D
 @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to find 
way to avoid this
 PoolablePreparedStatement pps = new PoolablePreparedStatement(
 getDelegate().prepareStatement(key.getSql()), key, 
_pstmtPool, this);
-return new 
DefaultPooledObject(pps);
+return new DefaultPooledObject<>(pps);
 }
-return new DefaultPooledObject(
+return new DefaultPooledObject<>(
 new PoolableCallableStatement(getDelegate().prepareCall( 
key.getSql()), key, _pstmtPool, this));
 } else if (null == key.getResultSetType() && null == 
key.getResultSetConcurrency()){
 @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to find way 
to avoid this
 PoolablePreparedStatement pps = new PoolablePreparedStatement(
 getDelegate().prepareStatement(key.getSql(), 
key.getAutoGeneratedKeys().intValue()), key, _pstmtPool, this);
-return new DefaultPooledObject(pps);
+return new DefaultPooledObject<>(pps);
 } else { // Both _resultSetType and _resultSetConcurrency are non-null 
here (both or neither are set by constructors)
 if(key.getStmtType() == StatementType.PREPARED_STATEMENT) {
 @SuppressWarnings({"rawtypes", "unchecked"}) // Unable to find 
way to avoid this
 PoolablePreparedStatement pps = new 
PoolablePreparedStatement(getDelegate().prepareStatement(
 key.getSql(), 
key.getResultSetType().intValue(),key.getResultSetConcurrency().intValue()), 
key, _pstmtPool, this);
-return new 
DefaultPooledObject(pps);
+return new DefaultPooledObject<>(pps);
 }
-return new DefaultPooledObject(
+return new DefaultPooledObject<>(
 new PoolableCallableStatement( getDelegate().prepareCall(
 key.getSql(),key.getResultSetType().intValue(), 
key.getResultSetConcurrency().intValue()), key, _pstmtPool, this));
 }

Modified: tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java?rev=1636345&r1=1636344&r2=1636345&view=diff
==
--- tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java 
(original)
+++ tomcat/trunk/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java Mon 
Nov  3 13:10:04 2014
@@ -390,8 +390,8 @@ public class TestAbstractAjpProcessor ex
 
 public ReadBodyServlet(boolean callAvailable) {
 this.callAvailable = callAvailable;
-this.availableList = callAvailable ? new ArrayList() : 
null;
-this.readList = callAvailable ? new ArrayList() : null;
+this.availableList = callAvailable ? new ArrayList<>() : null;
+this.readList = callAvailable ? new ArrayList<>() : null;
 }
 
 @Override



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636344 - in /tomcat/trunk/res/ide-support/eclipse: eclipse.classpath start-tomcat.launch stop-tomcat.launch

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:09:44 2014
New Revision: 1636344

URL: http://svn.apache.org/r1636344
Log:
Eclipse updates for Tomcat 9 (untested)

Modified:
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/trunk/res/ide-support/eclipse/start-tomcat.launch
tomcat/trunk/res/ide-support/eclipse/stop-tomcat.launch

Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1636344&r1=1636343&r2=1636344&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Mon Nov  3 13:09:44 
2014
@@ -19,7 +19,7 @@
 
 
 
-
+
 
 
 

Modified: tomcat/trunk/res/ide-support/eclipse/start-tomcat.launch
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/start-tomcat.launch?rev=1636344&r1=1636343&r2=1636344&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/start-tomcat.launch (original)
+++ tomcat/trunk/res/ide-support/eclipse/start-tomcat.launch Mon Nov  3 
13:09:44 2014
@@ -17,13 +17,13 @@
 -->
 
 
-
+
 
 
 
 
 
 
-
-
+
+
 

Modified: tomcat/trunk/res/ide-support/eclipse/stop-tomcat.launch
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/stop-tomcat.launch?rev=1636344&r1=1636343&r2=1636344&view=diff
==
--- tomcat/trunk/res/ide-support/eclipse/stop-tomcat.launch (original)
+++ tomcat/trunk/res/ide-support/eclipse/stop-tomcat.launch Mon Nov  3 13:09:44 
2014
@@ -17,13 +17,13 @@
 -->
 
 
-
+
 
 
 
 
 
 
-
-
+
+
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636347 - /tomcat/trunk/TOMCAT-NEXT.txt

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:16:36 2014
New Revision: 1636347

URL: http://svn.apache.org/r1636347
Log:
Put the current version of the TODO list in svn.

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1636347&r1=1636346&r2=1636347&view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Mon Nov  3 13:16:36 2014
@@ -15,210 +15,30 @@
   limitations under the License.
 

 
-Notes of things to consider for the next major Tomcat release (probably 8.0.x
-but possibly 7.1.x).
+Notes of things to consider for the next major Tomcat release (9.0.x)
 
- 1. Refactor the TLD parsing. TLDs are currently parsed twice. Once by Catalina
-looking for listeners and once by Jasper.
-- Complete
+ 1. Fix Java 8 Javadoc warnings. Currently ~2800.
 
- 2. Refactor the XML parsing (org.apache.tomcat.util.xml ?) to remove duplicate
-XML parsing code in Catalina and Jasper such as the entity resolvers used
-for validation.
-- Complete
+ 2. Remove BIO AJP and HTTP connector.
 
- 3. TLDs may have a many to many relationship between URIs and TLD files. This
-can result in the same TLD file being parsed many times. Refactor the
-TldLocationCache to cache the parsed nodes (will need to check for changes
-to TLD files).
-- Complete
+ 3. Remove Comet support.
 
- 4. TLD files should be included in the dependencies for JSP and Tag files.
-- Complete
+ 4. Refactor the connectors to minimise code duplication
+- All implementation specific per connector code -> Endpoint
+- All implementation specific per connection code -> SocketWrapper
+   
+ 5. SNI support for JSSE.
 
- 5. Run the unused code detector and remove everything that isn't currently 
used.
-Add deprecation markers for the removed code to Tomcat 7.0.x
-- Complete
+ 6. See what Java 8 language features we want to use.
 
- 6. Change the default URIEncoding on the connector to UTF-8.
-- Complete
+ 7. Connector refactoring required for HTTP2/SPDY APIs that might be exposed in
+the Servlet API.
 
- 7. Rip out all the JNDI code in resource handling and replace it with straight
-URLs (File or WAR).
-- Complete
+ 8. Keep an eye on the other Java EE 8 EGs (no sign of any movement apart
+from the Servlet EG so far).
 
-kkolinko: I think this proposal goes too far. There are several
-separate issues. There are:
+ 9. Refactor WebSocket I/O to go directly to Tomcat's internals rather than via
+the Servlet API.
 
-a) Internal API to define resources
- - BaseDirContext implementing aliases and resource jars,
- and there will be overlays in Servlet 3.1
- - StandardContext.setResources() allowing an arbitrary DirContext
- implementation via  element.
-
- Concerns:
- - Too many ways to configure it.
-
-b) Internal API to lookup resources
- - DirContext interface
-
- Concerns:
- - Unnecessary objects, e.g. NamingException instead of null.
-
- - Too many methods. Name vs. String. list() vs. listBindings().
-
- - Limited API. As a workaround, there are non-standard methods that
-   are implemented on BaseDirContext instead, e.g. getRealPath(),
-   doListBindings(..).
-
- - All caching (ProxyDirContext) and aliases handling is
- performed on the root level only.
-
- Once I do a lookup that returns a DirContext, further lookups on it
- will bypass the caching and aliases.
-
-c) WebappClassLoader and its interaction with resources
-
- WebappClassLoader uses DirContext API to access resources (classes,
- jars).
-
- Note that it has to construct a classpath for Java compiler called by
- Jasper. The compiler cannot operate on a DirContext and needs access
- to actual files and JARs.
-
- Concerns:
- - There are problems with access to classes and JAR files in
- non-unpacked WARs.
-
- It is resolved by unzipping the files into the working directory (in
- WebappLoader#setRepositories()).
-
- Note that DirContext is not notified of this copying.
- StandardJarScanner does not know of those copies either.
-
- - There are problems when the classes directory is served from
- multiple locations
-
- It seems to be worked around by adding the path of the alternative
- classes directory to virtualClasspath of VirtualWebappLoader (as shown
- by example in config/context.html#Virtual_webapp), but it is likely
- that I miss something.
-
- - antiJARLocking support in WebappClassLoader creates copies of
- resources, but does not notify the DirContext.
-
- - WebappClassLoader.jarFiles is used to track JAR files and keep them
- open. These might be useful when looking for resources in

svn commit: r1636349 - in /tomcat/trunk: BUILDING.txt RELEASE-NOTES RUNNING.txt build.properties.default

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:21:41 2014
New Revision: 1636349

URL: http://svn.apache.org/r1636349
Log:
Update top-level files for new Tomcat version

Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/RUNNING.txt
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1636349&r1=1636348&r2=1636349&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Mon Nov  3 13:21:41 2014
@@ -20,7 +20,7 @@
 
 
 This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.1 specifications
+implements the Servlet 4.0, JSP 2.4?, EL 3.1? and WebSocket 1.2? specifications
 from the Java Community Process .
 
 Note: If you just need to run Apache Tomcat, it is not necessary to build
@@ -35,7 +35,7 @@ source distribution, do the following:
 
  1. If the JDK is already installed, skip to (2).
 
- 2. Download a version 7 of Java Development Kit (JDK) release (use the
+ 2. Download a version 8 of Java Development Kit (JDK) release (use the
 latest update available for your chosen version) from one of:
 
 http://www.oracle.com/technetwork/java/javase/downloads/index.html

Modified: tomcat/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1636349&r1=1636348&r2=1636349&view=diff
==
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Mon Nov  3 13:21:41 2014
@@ -38,7 +38,7 @@ CONTENTS:
 ===
 Dependency Changes:
 ===
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 7 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 8 and later.
 
 
 ==
@@ -52,7 +52,7 @@ changed at all during the remaining life
 The public interfaces for the following classes may be added to in order to
 resolve bugs and/or add new features. No existing interface method will be
 removed or changed although it may be deprecated.
-- org.apache.catalina.* (excluding sub-packages)
+- None
 
 Note: As Tomcat @VERSION_MAJOR@ matures, the above list will be added to. The 
list is not
   considered complete at this time.

Modified: tomcat/trunk/RUNNING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=1636349&r1=1636348&r2=1636349&view=diff
==
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Mon Nov  3 13:21:41 2014
@@ -20,16 +20,16 @@
 ===
 
 Apache Tomcat @VERSION_MAJOR_MINOR@ requires a Java Standard Edition Runtime
-Environment (JRE) version 7 or later.
+Environment (JRE) version 8 or later.
 
 =
-Running With JRE 7 Or Later
+Running With JRE 8 Or Later
 =
 
 (1) Download and Install a Java SE Runtime Environment (JRE)
 
 (1.1) Download a Java SE Runtime Environment (JRE),
-  release version 7 or later, from
+  release version 8 or later, from
   http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 (1.2) Install the JRE according to the instructions included with the
@@ -159,7 +159,7 @@ create the following script file:
 
 On Windows, %CATALINA_BASE%\bin\setenv.bat:
 
-  set "JRE_HOME=%ProgramFiles%\Java\jre7"
+  set "JRE_HOME=%ProgramFiles%\Java\jre8"
   exit /b 0
 
 On *nix, $CATALINA_BASE/bin/setenv.sh:

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1636349&r1=1636348&r2=1636349&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Nov  3 13:21:41 2014
@@ -23,9 +23,9 @@
 # -
 
 # - Version Control Flags -
-version.major=8
+version.major=9
 version.minor=0
-version.build=16
+version.build=0
 version.patch=0
 version.suffix=-dev
 
@@ -66,8 +66,8 @@ base.path=/usr/share/java
 #base.path=C:/path/to/the/repository
 #base.path=/usr/local
 
-compile.source=1.7
-compile.target=1.7
+compile.source=1.8
+compile.target=1.8
 compile.debug=true
 
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636350 - /tomcat/trunk/modules/bayeux/

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:25:10 2014
New Revision: 1636350

URL: http://svn.apache.org/r1636350
Log:
Drop bayuex module. It never saw a release and has not seen meaningful 
development for over 3 years.
The module remains in 8.0.x/trunk should someone wish to start it up again.

Removed:
tomcat/trunk/modules/bayeux/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636352 - /tomcat/trunk/modules/tomcat-lite/

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:27:33 2014
New Revision: 1636352

URL: http://svn.apache.org/r1636352
Log:
Drop tomcat-lite module. It never saw a release and has not seen meaningful 
development for over 4 years.
The module remains in 8.0.x/trunk should someone wish to start it up again.

Removed:
tomcat/trunk/modules/tomcat-lite/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636354 - /tomcat/tc8.0.x/branches/

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 13:52:53 2014
New Revision: 1636354

URL: http://svn.apache.org/r1636354
Log:
Add branches dir in case we need it

Added:
tomcat/tc8.0.x/branches/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636362 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default

2014-11-03 Thread violetagg 
Author: violetagg
Date: Mon Nov  3 14:21:32 2014
New Revision: 1636362

URL: http://svn.apache.org/r1636362
Log:
Prep for next version

Modified:
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1636362&r1=1636361&r2=1636362&view=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Mon Nov  3 14:21:32 2014
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=57
+version.build=58
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1636362&r1=1636361&r2=1636362&view=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Mon Nov  3 14:21:32 
2014
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.57
+maven.asf.release.deploy.version=7.0.58
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1636366 [2/2] - /tomcat/trunk/webapps/docs/changelog.xml

2014-11-03 Thread markt 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1636366&r1=1636365&r2=1636366&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov  3 14:49:44 2014
@@ -44,2572 +44,16 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues to not "pop up" wrt. others).
 -->
-
-  
-
-  
-Allow HTTP upgrade process to complete without data corruption when
-additional content is sent along with the upgrade header. (remm)
-  
-
-  
-
-
-  
-
-  
-43548: Add an XML schema for the tomcat-users.xml file.
-(markt)
-  
-  
-43682: Add support for referring to the current context, 
host
-and service name in per Context logging.properties files by using the
-properties ${classloader.webappName},
-${classloader.hostName} and
-${classloader.serviceName}. (markt)
-  
-  
-47919: Extend the information logged when Tomcat starts to
-optionally log the values of command line arguments (enabled by
-default) and environment variables (disabled by default). Note that
-the values added to CATALINA_OPTS and JAVA_OPTS environment variables
-will be logged, as they are used to build up the command line. (markt)
-  
-  
-49939: Expose the method that clears the static resource
-cache for a web application via JMX. (markt)
-  
-  
-55951: Allow cookies to use UTF-8 encoded values in HTTP
-headers. This requires the use of the RFC6265
-CookieProcessor. (markt)
-  
-  
-55984: Using the allow separators in version 0 cookies 
option
-with the legacy cookie processor should only apply to version 0 
cookies.
-Version 1 cookies with values that contain separators should not be
-affected and should continue to be quoted. (markt)
-  
-  
-56393: Add support for RFC6265 cookie parsing and 
generation.
-This is currently disabled by default and may be enabled via the
-CookieProcessor element of a Context.
-(markt)
-  
-  
-56394: Introduce new configuration element CookieProcessor 
in
-Context to allow context-specific configuration of cookie processing
-options. Attributes of Context element that were added in Tomcat 8.0.13
-to allow configuration of a new experimental RFC6265 based cookie 
parser
-(useRfc6265 and cookieEncoding) are
-replaced by this new configuration element. (markt)
-  
-  
-Improve the previous fix for 56401. Avoid logging version
-information in the constructor since it then gets logged at undesirable
-times such as when using StoreConfig. (markt)
-  
-  
-56403: Add pluggable password derivation support to the
-Realms via the new CredentialHandler interface.
-(markt/schultz)
-  
-  
-57016: When using the PersistentValve do not
-remove sessions from the store when persisting them. (markt)
-  
-  
-Deprecate the use of system proprties to control cookie parsing and
-replace them with attributes on the new CookieProcessor
-that may be configured on a per context basis. (markt)
-  
-  
-Correct an edge case and allow a cookie if the value starts with an
-equals character and the CookieProcessor is not configured
-to allow equals characters in cookie values but is configured to allow
-name only cookies. (markt)
-  
-  
-57022: Ensure SPNEGO authentication continues to work with
-the JNDI Realm using delegated credentials with recent Oracle JREs.
-(markt)
-  
-  
-57027: Add additional validation for stored credentials used
-by Realms when the credential is stored using hex encoding. (markt)
-  
-  
-57038: Add a WebResource.getCodeBase() method,
-implement for all WebResource implementations and then use
-it in the web application class loader to set the correct code base for
-resources loaded from JARs and WARs. (markt)
-  
-  
-Correct a couple of NPEs in the JNDI Realm that could be triggered with
-when not specifying a roleBase and enabling roleSearchAsUser. (markt)
-  
-  
-Correctly handle relative values for the docBase attribute of a 
Context.
-(markt)
-  
-  
-Ensure that log messages generated by the web application class loader
-correctly identify the associated Context when multiple versions of a
-Context with the same path are present. (markt)
-  
-  
-Remove the unnecessary registration of c

svn commit: r1636366 [1/2] - /tomcat/trunk/webapps/docs/changelog.xml

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 14:49:44 2014
New Revision: 1636366

URL: http://svn.apache.org/r1636366
Log:
Prep 9.0.c changelog

Modified:
tomcat/trunk/webapps/docs/changelog.xml


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Tomcat 9 work started

2014-11-03 Thread Mark Thomas 
As you may have noticed, I started work on Tomcat 9 earlier today.

A quick summary of the changes:
- Tomcat 8 trunk has moved in svn to /tomcat/tc8.0.x/trunk
- INFRA has been requested to create git mirrors for 8.0.x
- Bugzilla project has been created for Tomcat 9
- Basic web site updates have been completed for Tomcat 9

I plan to start work on removing BIO and Comet and refactoring the
connectors next.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of "TomcatVersions" by markt

2014-11-03 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "TomcatVersions" page has been changed by markt:
https://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=23&rev2=24

Comment:
Add 9.0.x. Update 8.0.x.

  
  The "Process" field in the following tables documents what development model 
is accepted by that project, either 
[[http://www.apache.org/foundation/glossary.html#ReviewThenCommit|Review-Then-Commit]]
 or 
[[http://www.apache.org/foundation/glossary.html#CommitThenReview|Commit-Then-Review]].
 For RTC model the changes are first proposed in the `STATUS.txt` file in the 
root of the project and have to gain at least 3 "`+1`" votes before being 
applied. The project members have agreed on several 
[[#RTC_Exceptions|exceptions]] from the RTC rule (documented below).
  
+ = Tomcat 9.0.x =
+ ||Spec versions: ||Servlet 4.0, JSP 2.4?, EL 3.1?, !WebSocket 1.2? ||
+ ||Stable: ||No ||
+ ||Enhancements: ||Yes ||
+ ||Bug Fixes: ||Yes ||
+ ||Security Fixes: ||Yes ||
+ ||Releases: ||Not yet ||
+ ||Release Manager: ||TBD ||
+ ||Process: ||CTR ||
+ ||Listed on download pages: ||Not yet ||
+ 
  = Tomcat 8.0.x =
- ||Spec versions: ||Servlet 3.1, JSP 2.3, EL 3.0, !WebSocket 1.0 ||
+ ||Spec versions: ||Servlet 3.1, JSP 2.3, EL 3.0, !WebSocket 1.1 ||
- ||Stable: ||No ||
+ ||Stable: ||Yes ||
  ||Enhancements: ||Yes ||
  ||Bug Fixes: ||Yes ||
  ||Security Fixes: ||Yes ||

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat 9 work started

2014-11-03 Thread Rémy Maucherat 
2014-11-03 15:52 GMT+01:00 Mark Thomas :

> I plan to start work on removing BIO and Comet and refactoring the
> connectors next.
>
> +1 for removing java.io, this connector is a big issue since its
compatibility with the advanced features is questionable. Comet can also be
removed.

Rémy

[Bug 57173] EOFException during annotation scanning

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57173

--- Comment #6 from Violeta Georgieva  ---
I can reproduce the issue:


SEVERE: Unable to process Jar entry [ch/qos/logback/core/status/Status.class]
from Jar
[jar:jndi:/localhost/no-manifest/WEB-INF/lib/com.springsource.ch.qos.logback.core-0.9.18.jar!/]
for annotations
java.io.EOFException
at
org.apache.tomcat.util.bcel.classfile.FastDataInputStream.readInt(FastDataInputStream.java:145)
at
org.apache.tomcat.util.bcel.classfile.ClassParser.readID(ClassParser.java:200)


Setup:
- tomcat 7.0.56 with default settings
- only unpackWARs is set to false

  


If unpackWARs is set to true there are no problems.

The problem does not appear in 7.0.55 and appear in 7.0.56 and tc7.0.x.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

JDK 9 Early Access with Project Jigsaw build b36 is available on java.net

2014-11-03 Thread Rory O'Donnell Oracle, Dublin Ireland 


Hi Mark/Mladen,

JDK 9 Early Access with Project Jigsaw build b36 is available on 
java.net [1]


The goal of Project Jigsaw [2] is to design and implement a standard 
module system for the Java SE Platform,

and to apply that system to the Platform itself and to the JDK.

As described in JEP 220 [3], this build provides a new runtime image 
structure. For example, this new runtime

image does not install an rt.jar file or a tools.jar file.

Please refer to Project Jigsaw's updated project pages [2] & [4] and 
Mark Reinhold's announcement email [5]

for further details.

We are very interested in your experiences testing this build. Comments, 
questions, and suggestions are
welcome on the jigsaw-dev mailing list or else submit bug reports via 
bugs.java.com.


Note: If you haven’t already subscribed to that mailing list then please 
do so first, otherwise

your message will be discarded as spam.


[1] https://jdk9.java.net/jigsaw/
[2] http://openjdk.java.net/projects/jigsaw/
[3] http://openjdk.java.net/jeps/220
[4] http://openjdk.java.net/projects/jigsaw/ea
[5] 
http://mail.openjdk.java.net/pipermail/jigsaw-dev/2014-November/003878.html


--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 8.0.15

2014-11-03 Thread Jeanfrancois Arcand 


On 2014-11-03, 4:51 AM, Mark Thomas wrote:


The proposed 8.0.15 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 8.0.14

Tested Websockets & AsyncContext API.

-- Jeanfrancois





-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1636347 - /tomcat/trunk/TOMCAT-NEXT.txt

2014-11-03 Thread Christopher Schultz 
Mark,

On 11/3/14 8:16 AM, ma...@apache.org wrote:
> Author: markt
> Date: Mon Nov  3 13:16:36 2014
> New Revision: 1636347
> 
> URL: http://svn.apache.org/r1636347
> Log:
> Put the current version of the TODO list in svn.
> 
> Modified:
> tomcat/trunk/TOMCAT-NEXT.txt
> 
> Modified: tomcat/trunk/TOMCAT-NEXT.txt
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1636347&r1=1636346&r2=1636347&view=diff
> ==
> --- tomcat/trunk/TOMCAT-NEXT.txt (original)
> +++ tomcat/trunk/TOMCAT-NEXT.txt Mon Nov  3 13:16:36 2014
> @@ -15,210 +15,30 @@
>limitations under the License.
>  
> 
>  
> -Notes of things to consider for the next major Tomcat release (probably 8.0.x
> -but possibly 7.1.x).
> +Notes of things to consider for the next major Tomcat release (9.0.x)
>  
> + 1. Fix Java 8 Javadoc warnings. Currently ~2800.
>  
> + 2. Remove BIO AJP and HTTP connector.

I wonder about this goal. Something nice about the BIO connectors is
that they tend to "just work" when other connectors are doing wonky
things. Yes, they seriously complicate things like asynchronous
semantics, but I think it may be more appropriate to simply drop support
for async-over-blocking-IO and otherwise leave the BIO connector in
there (not enabled by default).

The BIO connectors seem to be the least resource-heavy for when work is
actually being done (as opposed to having 1000 threads sitting idle, of
course) which is a good use case for AJP which pretty much has a
connection limit between httpd <-> Tomcat already.

> + 3. Remove Comet support.

Could we package Tomcat 8's Comet components in such a way that they
could be added to Tomcat 9 by someone who might want to upgrade to
Tomcat.latest but still use Comet? I actually think the protocol should
die and from the (lack of) traffic on the list regarding Comet, I
suspect its use is fairly limited.

> + 5. SNI support for JSSE.

This seems like a feature ripe for back-porting to Tomcat 8 when using a
supportive JVM.

> + 9. Refactor WebSocket I/O to go directly to Tomcat's internals rather than 
> via
> +the Servlet API.

I like this a lot. Is it actually in conflict with my above desire to
continue to support the BIO connectors?

> +10. Remove the use of system properties to control configuration wherever
> +possible

I like this, too. When anyone is working on moving a system property
into configuration, please think about whether it would make sense (or
be practical) for users to want to set these configuration settings on a
per-web-application or per-host basis instead of only globally.
Obviously, some configurations may only be applicable at the JVM level.
For those, perhaps leaving them as system properties to stress their
"globality" might be a good idea.

-chris



signature.asc
Description: OpenPGP digital signature

Re: Tomcat 9 work started

2014-11-03 Thread Christopher Schultz 
Mark,

On 11/3/14 9:52 AM, Mark Thomas wrote:
> As you may have noticed, I started work on Tomcat 9 earlier today.
> 
> A quick summary of the changes:
> - Tomcat 8 trunk has moved in svn to /tomcat/tc8.0.x/trunk
> - INFRA has been requested to create git mirrors for 8.0.x
> - Bugzilla project has been created for Tomcat 9
> - Basic web site updates have been completed for Tomcat 9
> 
> I plan to start work on removing BIO and Comet and refactoring the
> connectors next.

Please consider my proposal to keep the BIO connector but disallow use
of async protocols with it. The BIO connectors are simple, efficient,
and are often a good fallback when something goes awry with NIO.

-chris



signature.asc
Description: OpenPGP digital signature

[Bug 57178] New: Add CorsFilter configuration option to allow requests with Origin "null"

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57178

Bug ID: 57178
   Summary: Add CorsFilter configuration option to allow requests
with Origin "null"
   Product: Tomcat 8
   Version: trunk
  Hardware: All
OS: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: gzurow...@apache.org

CorsFilter does not allow requests with the Origin header set to string "null".
It treats such requests as invalid CORS requests. The current implementation
seems too restrictive and prevents some common use cases: The Origin header is
set to "null" when the browser cannot determine the origin of a request. This
is the case when opening local files in the browser. Common uses cases are
local development with remote services and testing hybrid mobile applications.
To support such use cases, a new configuration option could be introduced where
administrators could explicitly allow CORS requests with "null" origins.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57178] Add CorsFilter configuration option to allow requests with Origin "null"

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57178

--- Comment #1 from Gregor Zurowski  ---
Created attachment 32185
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32185&action=edit
Patch file for Bug #57178

The attached patch adds a new CorsFilter configuration option to explicitly
allow "null" origins:


   CorsFilter
   org.apache.catalina.filters.CorsFilter
   
  cors.allow.nullorigin
  true
   


When enabled, requests with "null" origins are processed as valid CORS
requests. (The option is disabled by default.)

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] tomcat pull request: #57178: Allow CORS requests with Origin value...

2014-11-03 Thread gzurowski 
GitHub user gzurowski opened a pull request:

https://github.com/apache/tomcat/pull/14

#57178: Allow CORS requests with Origin value "null".

Add a new configuration option "cors.allow.nullorigin" for CorsFilter to
explicitly allow requests with Origin value "null" (disabled by
default). When enabled, requests with Origin "null" will be handled as
valid CORS requests and processed by the filter.

See: https://issues.apache.org/bugzilla/show_bug.cgi?id=57178

Signed-off-by: Gregor Zurowski 

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/gzurowski/tomcat CorsAllowNullOrigin

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/tomcat/pull/14.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #14


commit 032dc48079b85c2dae090c9c377d48a7a93861a0
Author: Gregor Zurowski 
Date:   2014-10-31T21:04:48Z

Allow CORS requests with Origin value "null".

Add a new configuration option "cors.allow.nullorigin" for CorsFilter to
explicitly allow requests with Origin value "null" (disabled by
default). When enabled, requests with Origin "null" will be handled as
valid CORS requests and processed by the filter.

Signed-off-by: Gregor Zurowski 




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat 9 work started

2014-11-03 Thread Mark Thomas 
On 03/11/2014 19:47, Christopher Schultz wrote:
> Mark,
> 
> On 11/3/14 9:52 AM, Mark Thomas wrote:
>> As you may have noticed, I started work on Tomcat 9 earlier today.
>>
>> A quick summary of the changes:
>> - Tomcat 8 trunk has moved in svn to /tomcat/tc8.0.x/trunk
>> - INFRA has been requested to create git mirrors for 8.0.x
>> - Bugzilla project has been created for Tomcat 9
>> - Basic web site updates have been completed for Tomcat 9
>>
>> I plan to start work on removing BIO and Comet and refactoring the
>> connectors next.
> 
> Please consider my proposal to keep the BIO connector but disallow use
> of async protocols with it. The BIO connectors are simple, efficient,
> and are often a good fallback when something goes awry with NIO.

The only times I see NIO go awry these days is in the async code and
that is as complex as it is partly to support the continued use of BIO.

There was a small hack in 7.0.x for async processing, a larger hack in
8.0.x for non-blocking I/O. I suspect an even bigger hack would be
required in 9.0.x.

If folks don't need async features and want to use BIO simply use Tomcat
8. Based on the typical life time of a major Tomcat version that is
likely to be around for a good few years yet.

The connector code is complex and suffers from large amounts of copy /
paste / edit. One of my goals with 9.0.x is to simplify the code, reduce
the duplication and make the async code more robust. Removing BIO and
Comet are part of that.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r1636347 - /tomcat/trunk/TOMCAT-NEXT.txt

2014-11-03 Thread Rémy Maucherat 
2014-11-03 20:45 GMT+01:00 Christopher Schultz :

> > + 2. Remove BIO AJP and HTTP connector.
>
> I wonder about this goal. Something nice about the BIO connectors is
> that they tend to "just work" when other connectors are doing wonky
> things. Yes, they seriously complicate things like asynchronous
> semantics, but I think it may be more appropriate to simply drop support
> for async-over-blocking-IO and otherwise leave the BIO connector in
> there (not enabled by default).
>
> The BIO connectors seem to be the least resource-heavy for when work is
> actually being done (as opposed to having 1000 threads sitting idle, of
> course) which is a good use case for AJP which pretty much has a
> connection limit between httpd <-> Tomcat already.
>

These BIO connectors "just don't work" (rather than "just work") since they
don't implement properly the Servlet 3.1 API. Time to go ...

>
> > + 3. Remove Comet support.
>
> Could we package Tomcat 8's Comet components in such a way that they
> could be added to Tomcat 9 by someone who might want to upgrade to
> Tomcat.latest but still use Comet? I actually think the protocol should
> die and from the (lack of) traffic on the list regarding Comet, I
> suspect its use is fairly limited.
>

It is the org.apache.catalina.comet API. It's intrusive, so it's either
remove or don't remove. This API is superseded by Servlet 3.1, so this
should be removed.

>
> > + 5. SNI support for JSSE.
>
> This seems like a feature ripe for back-porting to Tomcat 8 when using a
> supportive JVM.
>
> > + 9. Refactor WebSocket I/O to go directly to Tomcat's internals rather
> than via
> > +the Servlet API.
>
> I like this a lot. Is it actually in conflict with my above desire to
> continue to support the BIO connectors?
>

Obviously, it will be another set of APIs that could be "implemented" but
would deadlock when used with such a connector.

>
> > +10. Remove the use of system properties to control configuration
> wherever
> > +possible
>
> I like this, too. When anyone is working on moving a system property
> into configuration, please think about whether it would make sense (or
> be practical) for users to want to set these configuration settings on a
> per-web-application or per-host basis instead of only globally.
> Obviously, some configurations may only be applicable at the JVM level.
> For those, perhaps leaving them as system properties to stress their
> "globality" might be a good idea.
>
> Rémy

svn commit: r1636445 - in /tomcat/trunk: TOMCAT-NEXT.txt webapps/docs/changelog.xml

2014-11-03 Thread markt 
Author: markt
Date: Mon Nov  3 21:17:14 2014
New Revision: 1636445

URL: http://svn.apache.org/r1636445
Log:
Whitespace police

Modified:
tomcat/trunk/TOMCAT-NEXT.txt
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1636445&r1=1636444&r2=1636445&view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Mon Nov  3 21:17:14 2014
@@ -26,7 +26,7 @@ Notes of things to consider for the next
  4. Refactor the connectors to minimise code duplication
 - All implementation specific per connector code -> Endpoint
 - All implementation specific per connection code -> SocketWrapper
-   
+
  5. SNI support for JSSE.
 
  6. See what Java 8 language features we want to use.

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1636445&r1=1636444&r2=1636445&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov  3 21:17:14 2014
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues to not "pop up" wrt. others).
 -->
-



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat 9 work started

2014-11-03 Thread Rémy Maucherat 
2014-11-03 22:00 GMT+01:00 Mark Thomas :

> The only times I see NIO go awry these days is in the async code and
> that is as complex as it is partly to support the continued use of BIO.
>
> There was a small hack in 7.0.x for async processing, a larger hack in
> 8.0.x for non-blocking I/O. I suspect an even bigger hack would be
> required in 9.0.x.
>
> If folks don't need async features and want to use BIO simply use Tomcat
> 8. Based on the typical life time of a major Tomcat version that is
> likely to be around for a good few years yet.
>
> I wasn't really around when this was discussed, but it is a problem to
advertise support for Servlet 3.1 in the BIO connector. Although the API is
technically implemented, the thread model is not going to be able to
successfully run real apps. If there's too much demand for BIO, it could
stay with a lot of unsupported operations exceptions (that would also
include upgrade and 3.1+ non blocking mode this time).

Comet is probably more significant than BIO for removing old code.

Rémy

Re: Tomcat 9 work started

2014-11-03 Thread Christopher Schultz 
Rémy,

On 11/3/14 4:33 PM, Rémy Maucherat wrote:
> 2014-11-03 22:00 GMT+01:00 Mark Thomas :
> 
>> The only times I see NIO go awry these days is in the async code and
>> that is as complex as it is partly to support the continued use of BIO.
>>
>> There was a small hack in 7.0.x for async processing, a larger hack in
>> 8.0.x for non-blocking I/O. I suspect an even bigger hack would be
>> required in 9.0.x.
>>
>> If folks don't need async features and want to use BIO simply use Tomcat
>> 8. Based on the typical life time of a major Tomcat version that is
>> likely to be around for a good few years yet.
>>
> I wasn't really around when this was discussed, but it is a problem to
> advertise support for Servlet 3.1 in the BIO connector. Although the API is
> technically implemented, the thread model is not going to be able to
> successfully run real apps.

I totally agree, but there are many web applications that use no
asynchronous techniques at all.

> If there's too much demand for BIO, it could stay with a lot of
> unsupported operations exceptions (that would also include upgrade
> and 3.1+ non blocking mode this time).

This is exactly what I was suggesting. None of the web applications I
build and support are using asynchronous models, and we hide behind
httpd using mod_jk. We use the BIO AJP connector because we don't need
to handle huge numbers of requests and deal with keepalive timeouts and
all that stuff: the web server handles that for us. So, the BIO
connector provides a clean and efficient path to handle all our
requests. I don't see why it should be able to continue to do that.

The NIO sim-blocking (which being practical, in contrast to the
impractical sim-non-blocking achieved by untold evils in the BIO
connector) is kind of hacky and burns unnecessary CPU time when no
asynchronous operations are involved.

> Comet is probably more significant than BIO for removing old code.

Agreed.

-chris



signature.asc
Description: OpenPGP digital signature

Re: Tomcat 9 work started

2014-11-03 Thread Mark Thomas 
On 03/11/2014 21:33, Rémy Maucherat wrote:
> 2014-11-03 22:00 GMT+01:00 Mark Thomas :
> 
>> The only times I see NIO go awry these days is in the async code and
>> that is as complex as it is partly to support the continued use of BIO.
>>
>> There was a small hack in 7.0.x for async processing, a larger hack in
>> 8.0.x for non-blocking I/O. I suspect an even bigger hack would be
>> required in 9.0.x.
>>
>> If folks don't need async features and want to use BIO simply use Tomcat
>> 8. Based on the typical life time of a major Tomcat version that is
>> likely to be around for a good few years yet.
>>
> I wasn't really around when this was discussed, but it is a problem to
> advertise support for Servlet 3.1 in the BIO connector. Although the API is
> technically implemented, the thread model is not going to be able to
> successfully run real apps. If there's too much demand for BIO, it could
> stay with a lot of unsupported operations exceptions (that would also
> include upgrade and 3.1+ non blocking mode this time).
> 
> Comet is probably more significant than BIO for removing old code.

I was going to start with removing BIO but since removing Comet appears
to be less contentious I'll start with that.

I've been spending the last hour or so looking at our current SPDY
implementation. We are going to have issues there as well. It targets
SPDY/2 which most browsers no longer support. Servlet 4.0 is targeting
HTTP/2 which is going to be roughly SPDY/4+

I don't know how much of the existing SPDY code is going to make sense
with HTTP/2 but I do know what we currently have is broken with most
browsers. I'm currently leaning towards excluding the current SDPY code
from the build until the connector refactoring is complete and then look
at it more closely to figure out what we can keep, what needs
refactoring and what needs to go.

To stand any chance of a robust HTTP/2 implementation I think the
connectors need an overhaul. Hence my plans for refactoring. The more
duplication and old/obsolete features we can remove the easier this
clean up is going to be. Removing BIO support and the associated hacks
is part of this clean-up.

While I'm not convinced by the need to continue to provide a blocking
connector implementation, I'm not against re-instating BIO support once
the clean-up is complete if BIO support can be restored cleanly. What I
want to avoid is a requirement to have to support a blocking connector
to influence the connector refactoring.

To put it another way:
- drop BIO support now
- clean-up the connectors
- re-add BIO support (if possible)
- all BIO related hacks will be in BIO specific code

I'd be prepared to bend that last point depending on what the hack was.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57180] New: CorsFilter does not support PATCH method

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57180

Bug ID: 57180
   Summary: CorsFilter does not support PATCH method
   Product: Tomcat 7
   Version: 7.0.56
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: frank.kl...@gmail.com

The CorsFilter provided with Tomcat 7 should support the PATCH method.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57180] CorsFilter does not support PATCH method

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57180

Frank Kline  changed:

   What|Removed |Added

 CC||frank.kl...@gmail.com

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57180] CorsFilter does not support PATCH method

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57180

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #1 from Christopher Schultz  ---
Bugzilla is not a support forum. If you need help, please post to the user's
mailing list.

Hint: you can set the "cors.allowed.methods" init-param for the CorsFilter and
allow whatever HTTP methods you want. By default, the filter supports
GET,POST,HEAD,OPTIONS but you can add whatever you want to that list.

http://tomcat.apache.org/tomcat-7.0-doc/config/filter.html#CORS_Filter

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57180] CorsFilter does not support PATCH method

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57180

Frank Kline  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |---

--- Comment #2 from Frank Kline  ---
This isn't a help request; it's a bug report.

Irrespective of allowed methods, the preflight filter evaluates the following:
"if (method != null && HTTP_METHODS.contains(method)) {" as well as "else if
(COMPLEX_HTTP_METHODS.contains(method)) {"

Neither HTTP_METHODS nor COMPLEX_HTTP_METHODS contain "PATCH" hence, the
original definition of "CORSRequestType requestType =
CORSRequestType.INVALID_CORS;" is used.

Adding "PATCH" to both HTTP_METHODS and COMPLEX_HTTP_METHODS just purely
enables the use of the allowed methods filter param.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57141] JSP 2.3 & EL 3.0 Spec conflict w/Static Fields, Methods, etc.

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57141

--- Comment #7 from Arthur Fiedler  ---
Just to throw my two cents in, I think the future JSP spec should be to modify
the ScopedAttributeELResolver so it only sets the "propertyResolved" when it is
in fact found, and add two additional standard ELResolvers following
ScopedAttributeELResolver.

The first one being ImportELResolver, which resolves classes via the import
handler.

The second one being always the last NotFoundELResolver, which returns null and
sets the propertyResolved for all that reach it.

This way future resolvers can be defined in the spec before NotFoundELResolver 
and the resolvers can be more clean cut for reuse/extending

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk-validate-eoln (in module tomcat-trunk) failed

2014-11-03 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate-eoln has an issue affecting its community 
integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate-eoln :  Tomcat 8.x, a web server implementing the 
Java Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/gump_work/build_tomcat-trunk_tomcat-trunk-validate-eoln.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate-eoln (Type: Build)
Work ended in a state of : Failed
Elapsed: 2 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml validate-eoln 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/classes
[mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/bin
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/conf
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/lib
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/webapps

compile-prepare:
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/catalina/startup
 [copy] Copying 1 file to 
/srv/gump/public/workspace/tomcat-trunk/webapps/docs

validate-eoln:
[javac] Compiling 1 source file to 
/srv/gump/public/workspace/tomcat-trunk/output/classes
[javac] javac: invalid target release: 1.8
[javac] Usage: javac  
[javac] use -help for a list of possible options

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:600: Compile failed; see the 
compiler error output for details.

Total time: 1 second
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate-eoln/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 20141104000104, vmgump.apache.org:vmgump:20141104000104
Gump E-mail Identifier (unique within run) #1.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 57142] JSP 2.3 & EL 3.0 - %page import directive & EL ImportHandler

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57142

--- Comment #4 from Arthur Fiedler  ---
I think it would be fair to say to merge the two statements. JSP spec says as
you stated, "Packages java.lang.*, javax.servlet.*, javax.servlet.jsp.*, and
javax.servlet.http.* are imported implicitly by the JSP container."

Then the EL spec says "For security, the following restrictions are enforced.
... 3. Except for classes with java.lang.* package names, a class has to be
explicitly imported before its static fields or methods can be referenced."

Meaning that "javax.servlet.*, javax.servlet.jsp.* and javax.servlet.http.*"
would NOT be included by default into the EL import handler. Unless
"explicitly" imported using @page import="".

Because at face value when you make a JSP page that you specify <@page
import="org.test.*"... you expect EL to be able to use those objects. After you
call ${MyCarEnum.PONTIAC} you start bashing your head as to why X server is
bugged as <%= MyCarEnum.PONTIAC %> is working, and the current recommendation
is to use EL instead of scriptlets. Not only does this confuse the user on what
to do next and how to get it working (they would need to find this page, and
use Marks work-around or apply to all of jsp) it also confuses IDE makers as to
how to provide auto-complete for EL syntax, the page directive would make the
most sense.

I also would provide this functionality by default until the spec is
clarified(how long will that take), because a user is just going to think this
is a bug and try to work around it with scriptlets most likely. Or if you guys
have the contacts to get an official clarification that would be ideal.

These comments are however just my two cents.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GUMP@vmgump]: Project tomcat-trunk (in module tomcat-trunk) failed

2014-11-03 Thread Bill Barker 
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk has an issue affecting its community integration.
This issue affects 5 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk :  Tomcat 8.x, a web server implementing the Java Servlet 
3.1,
...
- tomcat-trunk-test-apr :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...
- tomcat-trunk-test-bio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...
- tomcat-trunk-test-nio :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...
- tomcat-trunk-test-nio2 :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on junit exists, no need to add for property junit.jar.
 -INFO- Optional dependency tomcat-trunk-validate-eoln failed with reason build 
failed
 -INFO- Made directory [/srv/gump/public/workspace/tomcat-trunk/tomcat-deps]
 -INFO- Failed with reason build failed
 -DEBUG- Extracted fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk/gump_work/build_tomcat-trunk_tomcat-trunk.html
Work Name: build_tomcat-trunk_tomcat-trunk (Type: Build)
Work ended in a state of : Failed
Elapsed: 3 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141104-native-src.tar.gz
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141104-native-src.tar.gz
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141104.jar
 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/classes:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar:/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141104.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

download-compile:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141104-native-src.tar.gz

downloadfile-2:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141104.jar

downloadgz-2:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141104-native-src.tar.gz

downloadfile-2:

testexist:
 [echo] Testing  for 
/srv/gump/packages/eclipse/plugins/P20140317-1600/ecj-P20140317-1600.jar

downloadfile-2:

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

validate:

compile:
[javac] Compiling 1540 source files to 
/srv/gump/public/workspace/tomcat-trunk/output/classes
[javac] javac: invalid target release: 1.8
[javac] Usage: javac  
[javac] use -help for a list of possible options

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:651: Compile failed; see the 
compiler error output for details.

Total time: 3 seconds
-

To subscribe to this information via syn

Re: Tomcat 9 work started

2014-11-03 Thread Filip Hanik 
I honestly don't see the value of keeping BIO around. At this point in
time, there can be little else other than an emotional attachment to it. As
mentioned in this thread, the APIs and need for more functionality in the
connectors have rendered the BIO connector obsolete. If we believe that a
Tomcat 9 user would choose BIO for stability (which may have been the case
early NIO days), then the solution to that is to fix the NIO connector. The
solution should not be supporting the BIO with hacks.

I don't feel this thread has provided any real use cases that would justify
BIO remaining alive.

For example:

>We use the BIO AJP connector because we don't need
>to handle huge numbers of requests and deal with keepalive timeouts and
>all that stuff: the web server handles that for us

ok, fair enough. I actually don't know the state of the NIO AJP connector.
And I don't know what level of async or HTTP2 features AJP would even
support.

>The NIO sim-blocking (which being practical, in contrast to the
>impractical sim-non-blocking achieved by untold evils in the BIO
>connector) is kind of hacky and burns unnecessary CPU time when no
>asynchronous operations are involved.

Seems to be a contradiction to the previous statement where load was not an
issue. I truly don't see how these extra CPU cycles are an issue. And if
measured, would they even be noticeable.

Having to reimplement BIO, then add hacks around new API's seems like one
step forward two steps backwards.
Sometimes it may benefit us all to embrace change

Filip




On Mon, Nov 3, 2014 at 3:08 PM, Mark Thomas  wrote:

> On 03/11/2014 21:33, Rémy Maucherat wrote:
> > 2014-11-03 22:00 GMT+01:00 Mark Thomas :
> >
> >> The only times I see NIO go awry these days is in the async code and
> >> that is as complex as it is partly to support the continued use of BIO.
> >>
> >> There was a small hack in 7.0.x for async processing, a larger hack in
> >> 8.0.x for non-blocking I/O. I suspect an even bigger hack would be
> >> required in 9.0.x.
> >>
> >> If folks don't need async features and want to use BIO simply use Tomcat
> >> 8. Based on the typical life time of a major Tomcat version that is
> >> likely to be around for a good few years yet.
> >>
> > I wasn't really around when this was discussed, but it is a problem to
> > advertise support for Servlet 3.1 in the BIO connector. Although the API
> is
> > technically implemented, the thread model is not going to be able to
> > successfully run real apps. If there's too much demand for BIO, it could
> > stay with a lot of unsupported operations exceptions (that would also
> > include upgrade and 3.1+ non blocking mode this time).
> >
> > Comet is probably more significant than BIO for removing old code.
>
> I was going to start with removing BIO but since removing Comet appears
> to be less contentious I'll start with that.
>
> I've been spending the last hour or so looking at our current SPDY
> implementation. We are going to have issues there as well. It targets
> SPDY/2 which most browsers no longer support. Servlet 4.0 is targeting
> HTTP/2 which is going to be roughly SPDY/4+
>
> I don't know how much of the existing SPDY code is going to make sense
> with HTTP/2 but I do know what we currently have is broken with most
> browsers. I'm currently leaning towards excluding the current SDPY code
> from the build until the connector refactoring is complete and then look
> at it more closely to figure out what we can keep, what needs
> refactoring and what needs to go.
>
> To stand any chance of a robust HTTP/2 implementation I think the
> connectors need an overhaul. Hence my plans for refactoring. The more
> duplication and old/obsolete features we can remove the easier this
> clean up is going to be. Removing BIO support and the associated hacks
> is part of this clean-up.
>
> While I'm not convinced by the need to continue to provide a blocking
> connector implementation, I'm not against re-instating BIO support once
> the clean-up is complete if BIO support can be restored cleanly. What I
> want to avoid is a requirement to have to support a blocking connector
> to influence the connector refactoring.
>
> To put it another way:
> - drop BIO support now
> - clean-up the connectors
> - re-add BIO support (if possible)
> - all BIO related hacks will be in BIO specific code
>
> I'd be prepared to bend that last point depending on what the hack was.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[Bug 57173] EOFException during annotation scanning

2014-11-03 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=57173

--- Comment #7 from Peter  ---
In my installation unpackWARs is also set to false:



-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat 9 work started

2014-11-03 Thread Rainer Jung 

Am 03.11.2014 um 22:00 schrieb Mark Thomas:

On 03/11/2014 19:47, Christopher Schultz wrote:

Mark,

On 11/3/14 9:52 AM, Mark Thomas wrote:

As you may have noticed, I started work on Tomcat 9 earlier today.

A quick summary of the changes:
- Tomcat 8 trunk has moved in svn to /tomcat/tc8.0.x/trunk
- INFRA has been requested to create git mirrors for 8.0.x
- Bugzilla project has been created for Tomcat 9
- Basic web site updates have been completed for Tomcat 9

I plan to start work on removing BIO and Comet and refactoring the
connectors next.


Please consider my proposal to keep the BIO connector but disallow use
of async protocols with it. The BIO connectors are simple, efficient,
and are often a good fallback when something goes awry with NIO.


The only times I see NIO go awry these days is in the async code and
that is as complex as it is partly to support the continued use of BIO.

There was a small hack in 7.0.x for async processing, a larger hack in
8.0.x for non-blocking I/O. I suspect an even bigger hack would be
required in 9.0.x.

If folks don't need async features and want to use BIO simply use Tomcat
8. Based on the typical life time of a major Tomcat version that is
likely to be around for a good few years yet.

The connector code is complex and suffers from large amounts of copy /
paste / edit. One of my goals with 9.0.x is to simplify the code, reduce
the duplication and make the async code more robust. Removing BIO and
Comet are part of that.


I fully agree. Starting with TC 8 NIO is the default connector. That 
means it now gets a lot more use. Based on the list feedback and 
bugzilla I don't expect major bugs in NIO. And problems only happening 
under niche conditions will be found in TC 8 long before TC 9 gets stable.


On the other hand, since BIO is no longer the default connector but is 
coupled to NIO (via shared or copied code), it might become harder to 
keep BIO in good shape during NIO evolution, because fewer and fewer 
people will be using it. So +1 to removal in TC 9.


Regards,

Rainer

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org