svn commit: r1727989 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 19:20:29 2016
New Revision: 1727989

URL: http://svn.apache.org/viewvc?rev=1727989=rev
Log:
Format. No functional change.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1727989=1727988=1727989=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Feb  
1 19:20:29 2016
@@ -547,18 +547,22 @@ public class SecureNioChannel extends Ni
 //compact the buffer
 netInBuffer.compact();
 
-if ( unwrap.getStatus()==Status.OK || 
unwrap.getStatus()==Status.BUFFER_UNDERFLOW ) {
+if (unwrap.getStatus() == Status.OK || unwrap.getStatus() == 
Status.BUFFER_UNDERFLOW) {
 //we did receive some data, add it to our total
 read += unwrap.bytesProduced();
 //perform any tasks if needed
-if (unwrap.getHandshakeStatus() == HandshakeStatus.NEED_TASK) 
tasks();
+if (unwrap.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+tasks();
+}
 //if we need more network data, then bail out for now.
-if ( unwrap.getStatus() == Status.BUFFER_UNDERFLOW ) break;
-}else if ( unwrap.getStatus()==Status.BUFFER_OVERFLOW && read>0 ) {
+if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
+break;
+}
+} else if (unwrap.getStatus() == Status.BUFFER_OVERFLOW && read > 
0) {
 //buffer overflow can happen, if we have read data, then
 //empty out the dst buffer before we do another read
 break;
-}else {
+} else {
 //here we should trap BUFFER_OVERFLOW and call expand on the 
buffer
 //for now, throw an exception, as we initialized the buffers
 //in the constructor



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



svn commit: r12153 [1/2] - in /dev/tomcat/tomcat-9/v9.0.0.M3: ./ bin/ bin/embed/ bin/extras/ src/

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 21:25:41 2016
New Revision: 12153

Log:
Upload 9.0.0.M3 for voting

Added:
dev/tomcat/tomcat-9/v9.0.0.M3/
dev/tomcat/tomcat-9/v9.0.0.M3/KEYS   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/README.html   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.0.M3/bin/
dev/tomcat/tomcat-9/v9.0.0.M3/bin/README.html   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-deployer.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-fulldocs.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x64.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x64.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x86.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3-windows-x86.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.exe   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.exe.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.exe.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.exe.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.tar.gz.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.zip   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.zip.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/apache-tomcat-9.0.0.M3.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/
dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.tar.gz 
  (with props)

dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.tar.gz.md5

dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.tar.gz.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.zip.md5

dev/tomcat/tomcat-9/v9.0.0.M3/bin/embed/apache-tomcat-9.0.0.M3-embed.zip.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.asc
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-9/v9.0.0.M3/src/

svn commit: r12153 [2/2] - in /dev/tomcat/tomcat-9/v9.0.0.M3: ./ bin/ bin/embed/ bin/extras/ src/

2016-02-01 Thread markt
Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.asc 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.asc Mon 
Feb  1 21:25:41 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWr8XiAAoJEBDAHFovYFnn1osP/AvNP7joF4KcBH8TSGoK9mqW
+IecAsNsVwNPmyjxOhZ+YlFZtoZqAgzjRyGCY/ycJ6yjqvzggkUGxYDTg8jHGHRoc
+c4e1HmNkZuI93VVmhL4baynlRwtAUevBBA4X+pE86ZSOAy9RhsYBL/lDPlieB0wU
+0Iz5A7PqV9fYZHOoh3DcLqcCEjwEUumwihF1PlbrK+WZl+h8ycYDDZXmwsVXq3Q/
+2dI50Zu8oDH/wK9nHxRDcr1gyCtdiW4WFfFQptFiXL0iG8GmSiJF19TA4+knaNZJ
+NoDuNGh90fJQaCJ7vCsDFXr3tG8tTpHcjqc47AhAWbknupthScRXqxEtuqO7kBF4
+4flbk3I/LxH7uJZRr8d41oFggObsSLQp7hMLOgsYzWw2XXbro06ztchXdLRbNiPb
+7ljifmYYUJo6+Vr0OojnQV9crOxSWu0f2y+g7m7fcCeGA1jwEXc+ZNXQh4iQFUiA
+CUXulSpzoGHPESRvIuMV65HM8/OL45En7txvMfyyjAtCZaDe8PlJVHcQLBrmB+8g
+0GXCnLNnlDwQpSFTOJI2VjS6v+K5szI6mQ0ETWVmHBGJd+YNKInjtxDYTnwVDJL3
+gX6c/68ly6j0TVH5B0VAigBHLhcCIHaSXRuGmIknlDoKgbedo40KHfddVIC0SlPO
+n8ump5Xk6EsZy4xPqajs
+=eucJ
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.md5 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.md5 Mon 
Feb  1 21:25:41 2016
@@ -0,0 +1 @@
+6fa2743cf94ea60becf52c693fce400d *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.sha1 
(added)
+++ dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli-adapters.jar.sha1 Mon 
Feb  1 21:25:41 2016
@@ -0,0 +1 @@
+481e18f5509cefc2158a40f60c440b1d2d5a76b9 *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.asc Mon Feb  1 
21:25:41 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJWr8XhAAoJEBDAHFovYFnn/uEQALmlkfKhxaxmc1WZ+92NefQS
+y44VDoMN4kpxJyeAME33X1EjqVqk3oTO9IxaFYZmQimfhathUITszMncVIG/8D5Q
+T2jfhTqKnEF9JzRz7W5LDerro5GyHryIv3LK4syLRyB5UAEhMRGg1JwWvFgVhXwv
+ZQM55Iq4IvJfiE0PkPEM5v1XWcjGNsnA0/19NnROT27qQCHWVdcMCNX+LFaLiPe0
+DB7As5DPL/rHAPwjSLq9dlRP0cpPINvAhLRqUoYzMANtS2wMI89nKzzTviKKMryb
+Eqzegx8dHPAIbozuxdh6y2SN7wfXKwYj6eUYRlWqwpoo+GA7I6guVa2wCizIvbjM
+tUPTz34BYJEcYmQ8lTGKgAe3Ds9XBZZgeU7VuzXIAEgBvBJOe454euV/9SuLUsdT
+wn6NdzujWi7SeSVaXGk6xmpEPb7lf/MiTi4+hpjr725ZnGt/oSz4KNHRNNmQDJot
+JVwtLFGPzlrOmOSzowTLLoycdTOJJyHPN1NRLa9jJfLlsEHDUNxHO9x1ivatNYoZ
+JIa+EnJLUNWjndcs0HUly4sxQ7Yoa0KbUNwYtb1EXV5oFRgsIahuR2Ymhjcl6xnL
+6ywxtcqD+ZUr1BaM3KOSiTkDsQJ31ysImSwjc/ZX/bJWc96c6hYNmzu9xSaVGBSW
+OnV79/AkqZynZcIWM9e5
+=V82c
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.md5
==
--- dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.md5 (added)
+++ dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.md5 Mon Feb  1 
21:25:41 2016
@@ -0,0 +1 @@
+7aba3117c6dc1f5f6fd832d1b0e5e4af *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.sha1
==
--- dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.sha1 (added)
+++ dev/tomcat/tomcat-9/v9.0.0.M3/bin/extras/tomcat-juli.jar.sha1 Mon Feb  1 
21:25:41 2016
@@ -0,0 +1 @@
+43751dd35e6f7edabfd6f8d4b29442b420a43370 *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-9/v9.0.0.M3/src/apache-tomcat-9.0.0.M3-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-9/v9.0.0.M3/src/apache-tomcat-9.0.0.M3-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/tomcat/tomcat-9/v9.0.0.M3/src/apache-tomcat-9.0.0.M3-src.tar.gz.asc
==
--- 

[VOTE] Release Apache Tomcat 6.0.45

2016-02-01 Thread jean-frederic clere
The proposed Apache Tomcat 6.0.45 release is now available for voting.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-6/v6.0.45/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1061/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_45/

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

Cheers

Jean-Frederic

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



Re: CoyoteAdapter

2016-02-01 Thread Roel Storms
To much C++ development, got confused about the scope of protected. In C++
this scope is the class and all sub-classes. Not the package. Thanks for
refreshing my mind!

2016-01-31 16:14 GMT+01:00 Alexis Hassler :

> Hi Roel,
>
> Both classes are in the same package. That means that they're allowed to
> access public+protected+package-private members.
>
> Alexis
>
> 2016-01-31 15:34 GMT+01:00 Roel Storms :
>
> > Hello Tomcat Devs,
> >
> > I am looking at CoyoteAdapter and Request classes in the trunk of
> Tomcat8:
> >
> >
> >
> https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
> >
> >
> https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
> >
> > In CoyoteAdapter I notice the usage of methods like
> > B2CConverter getURIConverter();
> > void addPathParameter(String name, String value)
> > String getPathParameter(String name);
> >
> > However in Request these methods are marked protected. What am I missing
> > here?
> >
> > Kind regards,
> >
> > Roel Storms
> >
>


svn commit: r12152 - /dev/tomcat/tomcat-9/v9.0.0.M2/

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 21:09:13 2016
New Revision: 12152

Log:
Drop 9.0.0.M2

Removed:
dev/tomcat/tomcat-9/v9.0.0.M2/


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



svn commit: r1728005 - in /tomcat/tags/TOMCAT_9_0_0_M3: ./ build.properties.default webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 20:51:24 2016
New Revision: 1728005

URL: http://svn.apache.org/viewvc?rev=1728005=rev
Log:
Tag 9.0.0.M3

Added:
tomcat/tags/TOMCAT_9_0_0_M3/
  - copied from r1727998, tomcat/trunk/
Modified:
tomcat/tags/TOMCAT_9_0_0_M3/build.properties.default
tomcat/tags/TOMCAT_9_0_0_M3/webapps/docs/changelog.xml

Modified: tomcat/tags/TOMCAT_9_0_0_M3/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M3/build.properties.default?rev=1728005=1727998=1728005=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M3/build.properties.default (original)
+++ tomcat/tags/TOMCAT_9_0_0_M3/build.properties.default Mon Feb  1 20:51:24 
2016
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=0
 version.patch=0
-version.suffix=.M3-dev
+version.suffix=.M3
 
 # - Build control flags -
 # Note enabling validation uses Checkstyle which is LGPL licensed

Modified: tomcat/tags/TOMCAT_9_0_0_M3/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tags/TOMCAT_9_0_0_M3/webapps/docs/changelog.xml?rev=1728005=1727998=1728005=diff
==
--- tomcat/tags/TOMCAT_9_0_0_M3/webapps/docs/changelog.xml (original)
+++ tomcat/tags/TOMCAT_9_0_0_M3/webapps/docs/changelog.xml Mon Feb  1 20:51:24 
2016
@@ -44,7 +44,7 @@
   They eventually become mixed with the numbered issues. (I.e., numbered
   issues do 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: Request

2016-02-01 Thread Roel Storms
Dear Konstantin,

I am indeed talking about org.apache.catalina.connector.Request.
HttpServletRequest is an interface that we expose to Servlets. However
there is no interface that exposes everything necessary for Tomcat to work.
Therefor Tomcat is using the Request class as the type of the
parameter/variable/attribute. At some points attributes are even accessed
directly, not through methods. This makes it kind of tricky when
experimenting with different behavior for Requests. Therefor I was curious
if there was a reason for not using an interface but directly using the
class.

Kind regards,

Roel Storms

2016-01-31 16:28 GMT+01:00 Konstantin Kolinko :

> 2016-01-31 13:30 GMT+03:00 Roel Storms :
> > Dear Tomcat Devs,
> >
> > I was wondering why Request is used all over Tomcat as a class and why we
> > didn't abstract a Request interface and implemented a StandardRequest as
> is
> > done by a lot of other components like Session->StandardSession;
> > Manager->StandardManager; Context->StandardContext; ...
> >
> > Is there any reasoning behind this?
>
> https://en.wikipedia.org/wiki/KISS_principle
>
> Also, there is already an interface
> [[[
> package org.apache.catalina.connector;
> public class Request implements HttpServletRequest
> ]]]
>
> and
> [[[
> package javax.servlet.http;
> public interface HttpServletRequest extends ServletRequest {
> ]]]
>
>
> If we are talking about other class
> [[[
> package org.apache.coyote;
> public final class Request {
> ]]]
>
> It is final and no other implementations are allowed.
>
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


svn commit: r1727992 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 19:47:13 2016
New Revision: 1727992

URL: http://svn.apache.org/viewvc?rev=1727992=rev
Log:
Fix a consistent unit test failure on OSX (no idea why it started to appear now)
Handle the case where the required TLS buffer increases after the connection 
has been initiated.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1727992=1727991=1727992=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Feb  
1 19:47:13 2016
@@ -558,18 +558,33 @@ public class SecureNioChannel extends Ni
 if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
 break;
 }
-} else if (unwrap.getStatus() == Status.BUFFER_OVERFLOW && read > 
0) {
-//buffer overflow can happen, if we have read data, then
-//empty out the dst buffer before we do another read
-break;
+} else if (unwrap.getStatus() == Status.BUFFER_OVERFLOW) {
+if (read > 0) {
+// Buffer overflow can happen if we have read data. Return
+// so the destination buffer can be emptied before another
+// read is attempted
+break;
+} else {
+// The SSL session has increased the required buffer size
+// since the buffer was created.
+if (dst == 
socket.getSocketBufferHandler().getReadBuffer()) {
+// This is the normal case for this code
+socket.getSocketBufferHandler().expand(
+
sslEngine.getSession().getApplicationBufferSize());
+dst = socket.getSocketBufferHandler().getReadBuffer();
+} else {
+// Can't expand the buffer as there is no way to signal
+// to the caller that the buffer has been replaced.
+throw new IOException(
+sm.getString("channel.nio.ssl.unwrapFail", 
unwrap.getStatus()));
+}
+}
 } else {
-//here we should trap BUFFER_OVERFLOW and call expand on the 
buffer
-//for now, throw an exception, as we initialized the buffers
-//in the constructor
+// Something else went wrong
 throw new 
IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
 }
-} while ( (netInBuffer.position() != 0)); //continue to unwrapping as 
long as the input buffer has stuff
-return (read);
+} while (netInBuffer.position() != 0); //continue to unwrapping as 
long as the input buffer has stuff
+return read;
 }
 
 /**

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1727992=1727991=1727992=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb  1 19:47:13 2016
@@ -99,6 +99,10 @@
 New configuration option ajpFlush for the AJP connectors
 to disable the sending of AJP flush packets. (rjung)
   
+  
+Handle the case in the NIO connector where the required TLS buffer 
sizes
+increase after the connection has been initiated. (markt)
+  
 
   
 



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



Re: svn commit: r1727992 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SecureNioChannel.java webapps/docs/changelog.xml

2016-02-01 Thread Rémy Maucherat
2016-02-01 20:47 GMT+01:00 :

> Author: markt
> Date: Mon Feb  1 19:47:13 2016
> New Revision: 1727992
>
> URL: http://svn.apache.org/viewvc?rev=1727992=rev
> Log:
> Fix a consistent unit test failure on OSX (no idea why it started to
> appear now)
> Handle the case where the required TLS buffer increases after the
> connection has been initiated.
>

Well, the design is so wrong. BTW, what is the
getSession().getApplicationBufferSize() value here ? And that's with
OpenSSL or JSSE ?

Rémy

>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1727992=1727991=1727992=diff
>
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon
> Feb  1 19:47:13 2016
> @@ -558,18 +558,33 @@ public class SecureNioChannel extends Ni
>  if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
>  break;
>  }
> -} else if (unwrap.getStatus() == Status.BUFFER_OVERFLOW &&
> read > 0) {
> -//buffer overflow can happen, if we have read data, then
> -//empty out the dst buffer before we do another read
> -break;
> +} else if (unwrap.getStatus() == Status.BUFFER_OVERFLOW) {
> +if (read > 0) {
> +// Buffer overflow can happen if we have read data.
> Return
> +// so the destination buffer can be emptied before
> another
> +// read is attempted
> +break;
> +} else {
> +// The SSL session has increased the required buffer
> size
> +// since the buffer was created.
> +if (dst ==
> socket.getSocketBufferHandler().getReadBuffer()) {
> +// This is the normal case for this code
> +socket.getSocketBufferHandler().expand(
> +
> sslEngine.getSession().getApplicationBufferSize());
> +dst =
> socket.getSocketBufferHandler().getReadBuffer();
> +} else {
> +// Can't expand the buffer as there is no way to
> signal
> +// to the caller that the buffer has been
> replaced.
> +throw new IOException(
> +
> sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
> +}
> +}
>  } else {
> -//here we should trap BUFFER_OVERFLOW and call expand on
> the buffer
> -//for now, throw an exception, as we initialized the
> buffers
> -//in the constructor
> +// Something else went wrong
>  throw new
> IOException(sm.getString("channel.nio.ssl.unwrapFail", unwrap.getStatus()));
>  }
> -} while ( (netInBuffer.position() != 0)); //continue to
> unwrapping as long as the input buffer has stuff
> -return (read);
> +} while (netInBuffer.position() != 0); //continue to unwrapping
> as long as the input buffer has stuff
> +return read;
>  }
>
>  /**
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1727992=1727991=1727992=diff
>
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb  1 19:47:13 2016
> @@ -99,6 +99,10 @@
>  New configuration option ajpFlush for the AJP
> connectors
>  to disable the sending of AJP flush packets. (rjung)
>
> +  
> +Handle the case in the NIO connector where the required TLS
> buffer sizes
> +increase after the connection has been initiated. (markt)
> +  
>  
>
>  
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


svn commit: r1728027 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ webapps/docs/ webapps/docs/funcspecs/

2016-02-01 Thread markt
Author: markt
Date: Tue Feb  2 00:32:42 2016
New Revision: 1728027

URL: http://svn.apache.org/viewvc?rev=1728027=rev
Log:
Deprecate what is left of the JSR-77 implementation.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/funcspecs/mbean-names.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  2 00:32:42 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

[Bug 58827] Review/remove references to JSR77 StateManageable

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58827

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #4 from Mark Thomas  ---
And deprecated in 8.0.x for 8.0.32 onwards.

-- 
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



svn commit: r1728028 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Tue Feb  2 00:36:07 2016
New Revision: 1728028

URL: http://svn.apache.org/viewvc?rev=1728028=rev
Log:
Ensure that Tomcat.silence() silences the correct logger and 
respects the current setting.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  2 00:36:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

[Bug 58905] Fix Tomcat.silence() to silence the correct logger and to respect defaults

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58905

--- Comment #2 from Mark Thomas  ---
Fixed in 8.0.x for 8.0.32 onwards.

-- 
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-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

2016-02-01 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-tc7.0.x-test-bio 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-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 35 mins 33 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160201.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160201.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build

[VOTE] Release Apache Tomcat 9.0.0.M3

2016-02-01 Thread Mark Thomas
The proposed Apache Tomcat 9.0.0.M3 release is now available for voting.

This is a milestone release for the 9.0.x branch. It should be
noted that, as a milestone release:
- Servlet 4.0 is not finalised
- The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket 1.2/2.0

The major changes compared to the 9.0.0.M1 branch are:
- Ability to use OpenSSL with JSSE configuration
- Update to Tomcat-native 1.2.4 to pick up Windows binaries based on
  OpenSSL 1.0.2e
- Allow HTTP redirects to be relative
- Lots of bug fixes

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-9/v9.0.0.M3/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1062/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M3/

The proposed 9.0.0.M3 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 9.0.0.M3

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



[Bug 58646] NullPointerException in InternalNioOutputBuffer

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58646

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #19 from Mark Thomas  ---
Steps to reproduce still required.

-- 
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 58905] Fix Tomcat.silence() to silence the correct logger and to respect defaults

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58905

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Mark Thomas  ---
Fixed in 9.0.x for 9.0.0.M3 onwards.

-- 
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



svn commit: r1727902 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:22:36 2016
New Revision: 1727902

URL: http://svn.apache.org/viewvc?rev=1727902=rev
Log:
8.0.31 was not released

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1727902=1727901=1727902=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Feb  1 09:22:36 2016
@@ -87,7 +87,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1727900 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:21:35 2016
New Revision: 1727900

URL: http://svn.apache.org/viewvc?rev=1727900=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58946
Ensure that the request parameter map remains immutable when processing via a 
RequestDispatcher.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  1 09:21:35 2016
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
 
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
 
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
 
666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
 

svn commit: r1727901 - /tomcat/trunk/webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:22:06 2016
New Revision: 1727901

URL: http://svn.apache.org/viewvc?rev=1727901=rev
Log:
9.0.0.M2 was not released

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1727901=1727900=1727901=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb  1 09:22:06 2016
@@ -95,7 +95,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1727898 - /tomcat/trunk/webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:19:15 2016
New Revision: 1727898

URL: http://svn.apache.org/viewvc?rev=1727898=rev
Log:
Tidy up changelog

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

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1727898=1727897=1727898=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb  1 09:19:15 2016
@@ -52,18 +52,6 @@
 property test.name and document the property in
 BUILDING.txt. (rjung)
   
-  
-58768: Log a warning if a redirect fails because of an
-invalid location. (markt)
-  
-
-  
-  
-
-  
-New configuration option ajpFlush for the AJP connectors
-to disable the sending of AJP flush packets. (rjung)
-  
 
   
   
@@ -80,6 +68,10 @@
 Fix class loader decision on the delegation for class loading and
 resource lookup and make it faster too. (rjung)
   
+  
+58768: Log a warning if a redirect fails because of an
+invalid location. (markt)
+  
 
   
   
@@ -92,6 +84,10 @@
 Correct an NPE when listing the enabled ciphers (e.g. via the Manager
 web application) for a TLS enabled APR/native connector. (markt)
   
+  
+New configuration option ajpFlush for the AJP connectors
+to disable the sending of AJP flush packets. (rjung)
+  
 
   
 



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



svn commit: r1727899 - in /tomcat/trunk: java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:20:09 2016
New Revision: 1727899

URL: http://svn.apache.org/viewvc?rev=1727899=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58946
Ensure that the request parameter map remains immutable when processing via a 
RequestDispatcher.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1727899=1727898=1727899=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Mon 
Feb  1 09:20:09 2016
@@ -24,7 +24,6 @@ import java.io.UnsupportedEncodingExcept
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
@@ -40,6 +39,7 @@ import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
+import org.apache.catalina.util.ParameterMap;
 import org.apache.tomcat.util.buf.B2CConverter;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.Parameters;
@@ -134,7 +134,7 @@ class ApplicationHttpRequest extends Htt
 
 /**
  * The request parameters for this request.  This is initialized from the
- * wrapped request, but updates are allowed.
+ * wrapped request.
  */
 protected Map parameters = null;
 
@@ -634,27 +634,6 @@ class ApplicationHttpRequest extends Htt
 
 
 /**
- * Perform a shallow copy of the specified Map, and return the result.
- *
- * @param orig Origin Map to be copied
- */
-Map copyMap(Map orig) {
-
-if (orig == null) {
-return (new HashMap<>());
-}
-HashMap dest = new HashMap<>();
-
-for (Map.Entry entry : orig.entrySet()) {
-dest.put(entry.getKey(), entry.getValue());
-}
-
-return (dest);
-
-}
-
-
-/**
  * Set the context path for this request.
  *
  * @param contextPath The new context path
@@ -750,9 +729,10 @@ class ApplicationHttpRequest extends Htt
 return;
 }
 
-parameters = new HashMap<>();
-parameters = copyMap(getRequest().getParameterMap());
+parameters = new ParameterMap<>();
+parameters.putAll(getRequest().getParameterMap());
 mergeParameters();
+((ParameterMap) parameters).setLocked(true);
 parsedParams = true;
 }
 
@@ -879,8 +859,6 @@ class ApplicationHttpRequest extends Htt
 if ((queryParamString == null) || (queryParamString.length() < 1))
 return;
 
-HashMap queryParameters = new HashMap<>();
-
 // Parse the query string from the dispatch target
 Parameters paramParser = new Parameters();
 MessageBytes queryMB = MessageBytes.newInstance();
@@ -901,23 +879,18 @@ class ApplicationHttpRequest extends Htt
 paramParser.setQueryStringEncoding(encoding);
 paramParser.handleQueryParameters();
 
-// Copy the original parameters
-queryParameters.putAll(parameters);
-
 // Insert the additional parameters from the dispatch target
 Enumeration dispParamNames = paramParser.getParameterNames();
 while (dispParamNames.hasMoreElements()) {
 String dispParamName = dispParamNames.nextElement();
 String[] dispParamValues = 
paramParser.getParameterValues(dispParamName);
-String[] originalValues = queryParameters.get(dispParamName);
+String[] originalValues = parameters.get(dispParamName);
 if (originalValues == null) {
-queryParameters.put(dispParamName, dispParamValues);
+parameters.put(dispParamName, dispParamValues);
 continue;
 }
-queryParameters.put(dispParamName, mergeValues(dispParamValues, 
originalValues));
+parameters.put(dispParamName, mergeValues(dispParamValues, 
originalValues));
 }
-
-parameters = queryParameters;
 }
 
 

Modified: 
tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java?rev=1727899=1727898=1727899=diff
==
--- 

buildbot failure in on tomcat-8-trunk

2016-02-01 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-8-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-8-trunk/builds/432

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1727902
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



svn commit: r1727904 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:35:47 2016
New Revision: 1727904

URL: http://svn.apache.org/viewvc?rev=1727904=rev
Log:
Align with 7.0.x implementation
- add generics
- add @Override
- fix Javadoc typos
- improve whitespace

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java?rev=1727904=1727903=1727904=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ParameterMap.java Mon 
Feb  1 09:35:47 2016
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.util;
 
-
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.tomcat.util.res.StringManager;
 
 /**
  * Extended implementation of HashMap that includes a
@@ -31,15 +29,13 @@ import java.util.Map;
  * ParmaeterMap instance is not locked.
  *
  * @author Craig R. McClanahan
- *
  */
+public final class ParameterMap extends LinkedHashMap {
 
-public final class ParameterMap extends HashMap {
+private static final long serialVersionUID = 1L;
 
 
 // --- Constructors
-
-
 /**
  * Construct a new, empty map with the default initial capacity and
  * load factor.
@@ -81,9 +77,9 @@ public final class ParameterMap extends
 /**
  * Construct a new map with the same mappings as the given map.
  *
- * @param map Map whose contents are dupliated in the new map
+ * @param map Map whose contents are duplicated in the new map
  */
-public ParameterMap(Map map) {
+public ParameterMap(Map map) {
 
 super(map);
 
@@ -137,6 +133,7 @@ public final class ParameterMap extends
  *
  * @exception IllegalStateException if this map is currently locked
  */
+@Override
 public void clear() {
 
 if (locked)
@@ -160,7 +157,8 @@ public final class ParameterMap extends
  *
  * @exception IllegalStateException if this map is currently locked
  */
-public Object put(Object key, Object value) {
+@Override
+public V put(K key, V value) {
 
 if (locked)
 throw new IllegalStateException
@@ -179,7 +177,8 @@ public final class ParameterMap extends
  *
  * @exception IllegalStateException if this map is currently locked
  */
-public void putAll(Map map) {
+@Override
+public void putAll(Map map) {
 
 if (locked)
 throw new IllegalStateException
@@ -199,7 +198,8 @@ public final class ParameterMap extends
  *
  * @exception IllegalStateException if this map is currently locked
  */
-public Object remove(Object key) {
+@Override
+public V remove(Object key) {
 
 if (locked)
 throw new IllegalStateException



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



buildbot failure in on tomcat-trunk

2016-02-01 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1003

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1727901
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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



svn commit: r1727905 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:42:09 2016
New Revision: 1727905

URL: http://svn.apache.org/viewvc?rev=1727905=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58946
Ensure that the request parameter map remains immutable when processing via a 
RequestDispatcher.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc6.0.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  1 09:42:09 2016
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 

svn commit: r1727914 - in /tomcat/trunk: java/org/apache/catalina/startup/Tomcat.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 10:45:15 2016
New Revision: 1727914

URL: http://svn.apache.org/viewvc?rev=1727914=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58905
Ensure that Tomcat.silence() silences the correct logger and 
respects the current setting.

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1727914=1727913=1727914=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Feb  1 
10:45:15 2016
@@ -51,6 +51,7 @@ import org.apache.catalina.Service;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.authenticator.NonLoginAuthenticator;
 import org.apache.catalina.connector.Connector;
+import org.apache.catalina.core.ContainerBase;
 import org.apache.catalina.core.NamingContextListener;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardEngine;
@@ -529,7 +530,7 @@ public class Tomcat {
  */
 public Context addContext(Host host, String contextPath, String 
contextName,
 String dir) {
-silence(host, contextPath);
+silence(host, contextName);
 Context ctx = createContext(host, contextPath);
 ctx.setName(contextName);
 ctx.setPath(contextPath);
@@ -698,6 +699,8 @@ public class Tomcat {
 "org.apache.catalina.core.AprLifecycleListener"
 };
 
+private boolean silent = false;
+
 /**
  * Controls if the loggers will be silenced or not.
  * @param silenttrue sets the log level to WARN for the
@@ -707,6 +710,7 @@ public class Tomcat {
  *  level of INFO.
  */
 public void setSilent(boolean silent) {
+this.silent = silent;
 for (String s : silences) {
 Logger logger = Logger.getLogger(s);
 pinnedLoggers.put(s, logger);
@@ -718,24 +722,44 @@ public class Tomcat {
 }
 }
 
-private void silence(Host host, String ctx) {
-String loggerName = getLoggerName(host, ctx);
+private void silence(Host host, String contextPath) {
+String loggerName = getLoggerName(host, contextPath);
 Logger logger = Logger.getLogger(loggerName);
 pinnedLoggers.put(loggerName, logger);
-logger.setLevel(Level.WARNING);
+if (silent) {
+logger.setLevel(Level.WARNING);
+} else {
+logger.setLevel(Level.INFO);
+}
 }
 
-private String getLoggerName(Host host, String ctx) {
-String loggerName = 
"org.apache.catalina.core.ContainerBase.[default].[";
+
+/*
+ * Uses essentially the same logic as {@link ContainerBase#logName()}.
+ */
+private String getLoggerName(Host host, String contextName) {
 if (host == null) {
-loggerName += getHost().getName();
-} else {
-loggerName += host.getName();
+host = getHost();
 }
-loggerName += "].[";
-loggerName += ctx;
-loggerName += "]";
-return loggerName;
+StringBuilder loggerName = new StringBuilder();
+loggerName.append(ContainerBase.class.getName());
+loggerName.append(".[");
+// Engine name
+loggerName.append(host.getParent().getName());
+loggerName.append("].[");
+// Host name
+loggerName.append(host.getName());
+loggerName.append("].[");
+// Context name
+if (contextName == null || contextName.equals("")) {
+loggerName.append("/");
+} else if (contextName.startsWith("##")) {
+loggerName.append("/");
+loggerName.append(contextName);
+}
+loggerName.append(']');
+
+return loggerName.toString();
 }
 
 /**
@@ -1151,30 +1175,30 @@ public class Tomcat {
 "zip", "application/zip"
 };
 
-protected URL getWebappConfigFile(String path, String url) {
+protected URL getWebappConfigFile(String path, String contextName) {
 File docBase = new File(path);
 if (docBase.isDirectory()) {
-return getWebappConfigFileFromDirectory(docBase, url);
+return getWebappConfigFileFromDirectory(docBase, contextName);
 } else {
-return getWebappConfigFileFromJar(docBase, url);
+return getWebappConfigFileFromJar(docBase, contextName);
 }
 }
 
-private URL getWebappConfigFileFromDirectory(File docBase, String url) {
+private URL getWebappConfigFileFromDirectory(File docBase, String 
contextName) {
 URL result = null;
 File webAppContextXml = new File(docBase, 
Constants.ApplicationContextXml);
 if 

svn commit: r1727917 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/core/StandardWrapper.java java/org/apache/catalina/core/mbeans-descriptors.xml weba

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 11:07:20 2016
New Revision: 1727917

URL: http://svn.apache.org/viewvc?rev=1727917=rev
Log:
Deprecate what is left of the JSR-77 implementation.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1727917=1727916=1727917=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Feb  1 
11:07:20 2016
@@ -6203,7 +6203,11 @@ public class StandardContext extends Con
  * JSR77 deploymentDescriptor attribute
  *
  * @return string deployment descriptor
+ *
+ * @deprecated The JSR-77 implementation is incomplete and will be removed
+ * in 9.0.x
  */
+@Deprecated
 public String getDeploymentDescriptor() {
 
 InputStream stream = null;
@@ -6234,7 +6238,11 @@ public class StandardContext extends Con
  * JSR77 servlets attribute
  *
  * @return list of all servlets ( we know about )
+ *
+ * @deprecated The JSR-77 implementation is incomplete and will be removed
+ * in 9.0.x
  */
+@Deprecated
 public String[] getServlets() {
 
 String[] result = null;
@@ -6448,7 +6456,11 @@ public class StandardContext extends Con
 
 /**
  * @return support for "stateManageable" JSR77
+ *
+ * @deprecated The JSR-77 implementation is incomplete and will be removed
+ * in 9.0.x
  */
+@Deprecated
 public boolean isStateManageable() {
 return true;
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1727917=1727916=1727917=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Feb  1 
11:07:20 2016
@@ -1787,7 +1787,11 @@ public class StandardWrapper extends Con
 
 /**
  * @return JSR 77. Always return false.
+ *
+ * @deprecated The JSR-77 implementation is incomplete and will be removed
+ * in 9.0.x
  */
+@Deprecated
 public boolean isStateManageable() {
 return false;
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1727917=1727916=1727917=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Mon Feb  
1 11:07:20 2016
@@ -270,7 +270,7 @@
type="java.lang.String"/>
 
 
 
@@ -300,7 +300,7 @@
type="long"/>
 
 

Modified: tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml?rev=1727917=1727916=1727917=diff
==
--- tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/mbean-names.xml Mon Feb  1 11:07:20 2016
@@ -39,15 +39,14 @@
 We will be using JMX MBeans as the technology for
 implementing manageability of Tomcat.
 
-One of the key concepts of JMX (and JSR-77) is that each management
-bean has a unique name in the MBeanServer's registry, and that
-management applications can utilize these names to retrieve the MBean
-of interest to them for a particular management operation.
-This document proposes a naming convention for MBeans that allows easy
-calculation of the name for a particular MBean.  For background
-information on JMX MBean names, see the Java Management Extensions
-Instrumentation and Agent Specification, version 1.0, section 6.
-In particular, we will be discussing the String Representation of
+One of the key concepts of JMX is that each management bean has a uniqu
+name in the MBeanServer's registry, and that management applications can
+utilize these names to retrieve the MBean of interest to them for a
+particular management operation. This document proposes a naming convention
+for MBeans that allows easy calculation of the name for a particular MBean.
+For background information on 

svn commit: r1727903 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java test/org/apache/catalina/core/TestApplicationHttpRequest.java webapps/docs/changelog.xml

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 09:29:00 2016
New Revision: 1727903

URL: http://svn.apache.org/viewvc?rev=1727903=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58946
Ensure that the request parameter map remains immutable when processing via a 
RequestDispatcher.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestApplicationHttpRequest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  1 09:29:00 2016
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553
 
-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702
 
744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1725974,1726171-1726173,1
 
726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 

[Bug 58946] ApplicationHttpRequest should enforce immutability of ParameterMap

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58946

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
 OS||All

--- Comment #1 from Mark Thomas  ---
Fixed in 9.0.x for 9.0.0.M3, 8.0.x for 8.0.32, 7.0.x for 7.0.68 and 6.0.x for
6.0.44.

-- 
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



svn commit: r1727930 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 12:53:41 2016
New Revision: 1727930

URL: http://svn.apache.org/viewvc?rev=1727930=rev
Log:
Fix copy/paste error

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1727930=1727929=1727930=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Feb  
1 12:53:41 2016
@@ -77,7 +77,7 @@ public class SecureNioChannel extends Ni
 netOutBuffer = ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
 } else {
 netInBuffer = ByteBuffer.allocate(DEFAULT_NET_BUFFER_SIZE);
-netOutBuffer = ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
+netOutBuffer = ByteBuffer.allocate(DEFAULT_NET_BUFFER_SIZE);
 }
 
 // selector pool for blocking operations



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



svn commit: r1727935 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 13:38:27 2016
New Revision: 1727935

URL: http://svn.apache.org/viewvc?rev=1727935=rev
Log:
Remove unnecessary method calls

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java?rev=1727935=1727934=1727935=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java Mon 
Feb  1 13:38:27 2016
@@ -63,8 +63,6 @@ public class SocketBufferHandler {
 readBuffer.clear();
 } else {
 readBuffer.compact();
-readBuffer.position(remaining);
-readBuffer.limit(readBuffer.capacity());
 }
 } else {
 // Switching to read



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



buildbot success in on tomcat-trunk

2016-02-01 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/1004

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1727918
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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



[jira] [Commented] (MTOMCAT-263) tomcat7:exec-war can't create .extract/webapps

2016-02-01 Thread Matthias Hryniszak (JIRA)

[ 
https://issues.apache.org/jira/browse/MTOMCAT-263?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15126255#comment-15126255
 ] 

Matthias Hryniszak commented on MTOMCAT-263:


It's been quite a while since this issue has been reported and resolved. Are 
there any plans for the actual release of version post 2.2 that'd include it?

> tomcat7:exec-war can't create .extract/webapps
> --
>
> Key: MTOMCAT-263
> URL: https://issues.apache.org/jira/browse/MTOMCAT-263
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>Affects Versions: 2.1, 2.2
>Reporter: jieryn
>Assignee: Olivier Lamy (*$^¨%`£)
> Fix For: 3.0
>
> Attachments: MTOMCAT-263_1.patch
>
>
> bash$ java -jar target/app-1.0-SNAPSHOT-war-exec.jar
> Exception in thread "main" java.lang.Exception: FATAL: impossible to create 
> directories:.extract/webapps
> at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.extract(Tomcat7Runner.java:586)
> at 
> org.apache.tomcat.maven.runner.Tomcat7Runner.run(Tomcat7Runner.java:204)
> at 
> org.apache.tomcat.maven.runner.Tomcat7RunnerCli.main(Tomcat7RunnerCli.java:212)



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

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



[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

2016-02-01 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-tc7.0.x-test-apr 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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 33 mins 31 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160201.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160201/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160201.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

2016-02-01 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-tc7.0.x-test-nio 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-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 32 mins 36 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160201.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160201.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed

2016-02-01 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-tc7.0.x-test-bio 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-tc7.0.x-test-bio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 mins 12 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-BIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160201.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=true 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Dtest.reports=output/logs-BIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160201.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build

svn commit: r1727918 - in /tomcat/trunk: java/org/apache/catalina/core/StandardContext.java java/org/apache/catalina/core/StandardWrapper.java java/org/apache/catalina/core/mbeans-descriptors.xml weba

2016-02-01 Thread markt
Author: markt
Date: Mon Feb  1 11:11:36 2016
New Revision: 1727918

URL: http://svn.apache.org/viewvc?rev=1727918=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58827
Remove what is left of the JSR-77 implementation.

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1727918=1727917=1727918=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Feb  1 
11:11:36 2016
@@ -16,11 +16,9 @@
  */
 package org.apache.catalina.core;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.AccessController;
@@ -6198,67 +6196,6 @@ public class StandardContext extends Con
 
 // - Operations
 
-
-/**
- * JSR77 deploymentDescriptor attribute
- *
- * @return string deployment descriptor
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
-@Deprecated
-public String getDeploymentDescriptor() {
-
-InputStream stream = null;
-ServletContext servletContext = getServletContext();
-if (servletContext != null) {
-stream = servletContext.getResourceAsStream(
-org.apache.catalina.startup.Constants.ApplicationWebXml);
-}
-if (stream == null) {
-return "";
-}
-StringBuilder sb = new StringBuilder();
-try (BufferedReader br = new BufferedReader(new 
InputStreamReader(stream))) {
-String strRead = "";
-while (strRead != null) {
-sb.append(strRead);
-strRead = br.readLine();
-}
-} catch (IOException e) {
-return "";
-}
-
-return sb.toString();
-}
-
-
-/**
- * JSR77 servlets attribute
- *
- * @return list of all servlets ( we know about )
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
-@Deprecated
-public String[] getServlets() {
-
-String[] result = null;
-
-Container[] children = findChildren();
-if (children != null) {
-result = new String[children.length];
-for( int i=0; i< children.length; i++ ) {
-result[i] = children[i].getObjectName().toString();
-}
-}
-
-return result;
-}
-
-
 @Override
 protected String getObjectNameKeyProperties() {
 
@@ -6455,17 +6392,6 @@ public class StandardContext extends Con
 
 
 /**
- * @return support for "stateManageable" JSR77
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
-@Deprecated
-public boolean isStateManageable() {
-return true;
-}
-
-/**
  * The J2EE Server ObjectName this module is deployed on.
  */
 private String server = null;

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1727918=1727917=1727918=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Mon Feb  1 
11:11:36 2016
@@ -1786,18 +1786,6 @@ public class StandardWrapper extends Con
 
 
 /**
- * @return JSR 77. Always return false.
- *
- * @deprecated The JSR-77 implementation is incomplete and will be removed
- * in 9.0.x
- */
-@Deprecated
-public boolean isStateManageable() {
-return false;
-}
-
-
-/**
  * Remove a JMX notficationListener
  * @see 
javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener,
 javax.management.NotificationFilter, java.lang.Object)
  */

Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1727918=1727917=1727918=diff
==
--- 

[Bug 58827] Review/remove references to JSR77 StateManageable

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58827

--- Comment #3 from Mark Thomas  ---
The remains of the JSR-77 implementation have been removed from 9.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



[GUMP@vmgump]: Project tomcat-tc7.0.x-test-nio (in module tomcat-7.0.x) failed

2016-02-01 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-tc7.0.x-test-nio 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-tc7.0.x-test-nio :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-NIO
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 29 mins 50 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-NIO 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160201.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=false -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/w
 
orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dexecute.test.nio=true -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160201.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build

[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (in module tomcat-7.0.x) failed

2016-02-01 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-tc7.0.x-test-apr 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-tc7.0.x-test-apr :  Tomcat 7.x, a web server implementing Java 
Servlet 3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -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 tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 30 mins 57 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160201.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Dtest.excludePerformance=true 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x 
-Dexecute.test.apr=true -Dexecute.test.bio=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/wo
 
rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160201-native-src.tar.gz
 -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160201/lib 
-Dexecute.test.nio=false -Dtest.accesslog=true 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160201.jar
 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/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/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output

svn commit: r1727982 - /tomcat/tc6.0.x/trunk/build.properties.default

2016-02-01 Thread jfclere
Author: jfclere
Date: Mon Feb  1 18:05:06 2016
New Revision: 1727982

URL: http://svn.apache.org/viewvc?rev=1727982=rev
Log:
ready for 6.0.45

Modified:
tomcat/tc6.0.x/trunk/build.properties.default

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1727982=1727981=1727982=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Feb  1 18:05:06 2016
@@ -28,6 +28,7 @@ version.minor=0
 version.build=45
 version.patch=0
 version.suffix=-dev
+version=6.0.45
 
 # - Build control flags -
 execute.test.bio=true



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



svn commit: r12124 - in /dev/tomcat/tomcat-6/v6.0.45: ./ bin/ bin/extras/ src/

2016-02-01 Thread jfclere
Author: jfclere
Date: Mon Feb  1 18:15:17 2016
New Revision: 12124

Log:
Stage 6.0.45

Added:
dev/tomcat/tomcat-6/v6.0.45/
dev/tomcat/tomcat-6/v6.0.45/KEYS
dev/tomcat/tomcat-6/v6.0.45/README.html
dev/tomcat/tomcat-6/v6.0.45/RELEASE-NOTES
dev/tomcat/tomcat-6/v6.0.45/bin/
dev/tomcat/tomcat-6/v6.0.45/bin/README.html
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.tar.gz.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.zip   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.zip.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-deployer.zip.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-fulldocs.tar.gz.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-fulldocs.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-fulldocs.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x64.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x64.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x64.zip.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x64.zip.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x86.zip   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x86.zip.asc   
(with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x86.zip.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45-windows-x86.zip.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.exe   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.exe.asc   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.exe.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.exe.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.tar.gz   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.zip   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.zip.asc   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.zip.md5
dev/tomcat/tomcat-6/v6.0.45/bin/apache-tomcat-6.0.45.zip.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/extras/
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-jmx-remote.jar.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-jmx-remote.jar.md5
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-jmx-remote.jar.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-ws.jar.asc   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-ws.jar.md5
dev/tomcat/tomcat-6/v6.0.45/bin/extras/catalina-ws.jar.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli-adapters.jar   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli-adapters.jar.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli-adapters.jar.md5
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli-adapters.jar.sha1
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli.jar   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli.jar.asc   (with props)
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli.jar.md5
dev/tomcat/tomcat-6/v6.0.45/bin/extras/tomcat-juli.jar.sha1
dev/tomcat/tomcat-6/v6.0.45/src/
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz.md5
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz.sha1
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.zip   (with props)
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.zip.asc   (with 
props)
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.zip.md5
dev/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.zip.sha1

Added: dev/tomcat/tomcat-6/v6.0.45/KEYS
==
--- dev/tomcat/tomcat-6/v6.0.45/KEYS (added)
+++ dev/tomcat/tomcat-6/v6.0.45/KEYS Mon Feb  1 18:15:17 

svn commit: r1727983 - /tomcat/tc6.0.x/tags/TOMCAT_6_0_45/

2016-02-01 Thread jfclere
Author: jfclere
Date: Mon Feb  1 18:07:14 2016
New Revision: 1727983

URL: http://svn.apache.org/viewvc?rev=1727983=rev
Log:
Tag 6.0.45

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_45/   (props changed)
  - copied from r1727982, tomcat/tc6.0.x/trunk/

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_45/
--
--- svn:ignore (added)
+++ svn:ignore Mon Feb  1 18:07:14 2016
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_45/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb  1 18:07:14 2016
@@ -0,0 +1,3 @@
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001,1664176,1665087,1666968,1666989
 
,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 

[Bug 58481] JAX WS Request fails with "Premature end of file"

2016-02-01 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=58481

--- Comment #7 from Jesse  ---
We seem to be experiencing possibly the same issue. However our case, the parse
error was not always at [row,col]:[1,1] (although some times its was) and many
times occurred later in the message.

We observed this behavior on JRE 6 / Tomcat 7.0.63 / JAX-WS 2.1.10.

As a side note, the parse errors later in the message seemed to be partially
related to chunked transfer. We enabled a JAX-WS debug parameter which had the
side effect of disabling chunked transfers. This temporarily resolved all but
the errors at [1,1]. Obviously this is not a long term or complete solution.

Oliver, thank you for your research. We are testing a downgrade to 7.0.59 and
will see how it goes.

-- 
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