svn commit: r1786293 - /tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

[huxing]

Author: huxing
Date: Fri Mar 10 07:11:19 2017
New Revision: 1786293

URL: http://svn.apache.org/viewvc?rev=1786293=rev
Log:
Fix NPE for the server push example if HTTP/2 is not supported.

Modified:

tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

Modified: 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1786293=1786292=1786293=diff
==
--- 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
 Fri Mar 10 07:11:19 2017
@@ -34,19 +34,29 @@ public class SimpleImagePush extends Htt
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
 
-PushBuilder pb = 
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
-req).getPushBuilder().path("servlets/images/code.gif");
-pb.push();
-
 resp.setCharacterEncoding("UTF-8");
 resp.setContentType("text/html");
 PrintWriter pw = resp.getWriter();
-pw.println("");
-pw.println("");
-pw.println("The following image was provided via a push 
request.");
-pw.println("");
-pw.println("");
-pw.println("");
-pw.flush();
+
+PushBuilder pb = 
((org.apache.catalina.servlet4preview.http.HttpServletRequest)
+req).getPushBuilder();
+
+if (pb != null) {
+pb.path("servlets/images/code.gif");
+pb.push();
+pw.println("");
+pw.println("");
+pw.println("The following image was provided via a push 
request.");
+pw.println("");
+pw.println("");
+pw.println("");
+pw.flush();
+} else {
+pw.println("");
+pw.println("");
+pw.println("Server push requests are not supported by this 
protocol.");
+pw.println("");
+pw.println("");
+}
 }
 }



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

Re: [VOTE] Release Apache Tomcat 9.0.0.M18

[Huxing Zhang]

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

Test cases all passed.
Our test web app works fine.

One exception. The server push example will be failing by throwing an NPE if 
HTTP/2 is not supported.

Stack trace is:
java.lang.NullPointerException
  http2.SimpleImagePush.doGet(SimpleImagePush.java:36)
  javax.servlet.http.HttpServlet.service(HttpServlet.java:635)
  javax.servlet.http.HttpServlet.service(HttpServlet.java:742)
  org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
  
org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108)
 

This issue has been fixed in revision 1786292.

--
From:Mark Thomas 
Time:2017 Mar 8 (Wed) 23:56
To:dev@tomcat.apache.org 
Subject:[VOTE] Release Apache Tomcat 9.0.0.M18


The proposed Apache Tomcat 9.0.0.M18 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.M17 release are:

- Updates to the early access version of the Serlet 4.0 API to align it
  with the most recent discussions in the Servlet EG

- Support for Java 9 during annotation scanning

- Enable ALPN (and hence HTTP/2) for NIO and NIO2 connectors when using
  JSSE for TLS on Java 9

- Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries
  built with OpenSSL 1.0.2k

Along with lots of other bug fixes and improvements

For full details, see the changelog:
http://svn.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.M18/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1120/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M18/

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

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

Re: svn commit: r1786292 - /tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

[andrea . pacheco]

Informo que alterei meu email para dea.san...@infobase.com.br

Dea Pacheco
 
Obrigado



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

svn commit: r1786292 - /tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

[huxing]

Author: huxing
Date: Fri Mar 10 06:58:07 2017
New Revision: 1786292

URL: http://svn.apache.org/viewvc?rev=1786292=rev
Log:
Fix NPE for the server push example if HTTP/2 is not supported.

Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java

Modified: 
tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java?rev=1786292=1786291=1786292=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java 
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/http2/SimpleImagePush.java 
Fri Mar 10 06:58:07 2017
@@ -33,18 +33,27 @@ public class SimpleImagePush extends Htt
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
 
-PushBuilder pb = req.getPushBuilder().path("servlets/images/code.gif");
-pb.push();
-
 resp.setCharacterEncoding("UTF-8");
 resp.setContentType("text/html");
 PrintWriter pw = resp.getWriter();
-pw.println("");
-pw.println("");
-pw.println("The following image was provided via a push 
request.");
-pw.println("");
-pw.println("");
-pw.println("");
-pw.flush();
+
+PushBuilder pb = req.getPushBuilder();
+if (pb != null) {
+pb.path("servlets/images/code.gif");
+pb.push();
+pw.println("");
+pw.println("");
+pw.println("The following image was provided via a push 
request.");
+pw.println("");
+pw.println("");
+pw.println("");
+pw.flush();
+} else {
+pw.println("");
+pw.println("");
+pw.println("Server push requests are not supported by this 
protocol.");
+pw.println("");
+pw.println("");
+}
 }
 }



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

[jira] [Commented] (MTOMCAT-234) Tomcat8 Maven Plugin

[Jamie Hankins (JIRA)]

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

Jamie Hankins commented on MTOMCAT-234:
---

I'm guessing that this will remain unresolved until someone with the magic 
combination of time, need, and interest takes notice.

> Tomcat8 Maven Plugin
> 
>
> Key: MTOMCAT-234
> URL: https://issues.apache.org/jira/browse/MTOMCAT-234
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Dependency upgrade
>Affects Versions: 2.0, 2.1, 2.2
> Environment: Maven 3.1, Tomcat8.0RC1, Oracle JDK7u25
>Reporter: Petr Novak
>Assignee: Olivier Lamy (*$^¨%`£)
>Priority: Blocker
> Fix For: 3.0
>
>
> Please provide initial version of Tomcat8 Maven Plugin. 
> I tried the recommendations in 
> http://tomcat.10.x6.nabble.com/Tomcat-8-Tomcat-Maven-Plugin-2-2-Tomcat8-Maven-Plugin-td4995858.html#none
> but the guideline 
> http://tomcat.apache.org/maven-plugin-trunk/tomcat7-maven-plugin/adjust-embedded-tomcat-version.html
> does not work for Tomcat8 .
> The problem is in changed Tomcat 8 API, the maven throws folloving exception:
>  at 
> org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:142)
>  ... 20 more
> by: java.lang.NoSuchMethodError: 
> org.apache.catalina.startup.Tomcat.setDefaultRealm(Lorg/apache/catalina/Realm;)V
>  at 
> org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.startContainer(AbstractRunMojo.java:999)
>  at 
> org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.execute(AbstractRunMojo.java:514)
>  at 
> org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
>  ... 20 more
>  The method setDefaultRealm is deprecated in Tomcat7 and was removed in 
> Tomcat8 as described in documentation:
> http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Tomcat.html#setDefaultRealm(org.apache.catalina.Realm)



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

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

Re: [VOTE] Release Apache Tomcat 8.5.12

[Rémy Maucherat]

2017-03-08 19:56 GMT+01:00 Mark Thomas :

> The proposed Apache Tomcat 8.5.12 release is now available for voting.
>
> The major changes compared to the 8.5.11 release are:
>
> - Updates to the early access version of the Serlet 4.0 API to align it
>   with the most recent discussions in the Servlet EG
>
> - Support for Java 9 during annotation scanning
>
> - Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries
>   built with OpenSSL 1.0.2k
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.12/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1121/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_12/
>
> The proposed 8.5.12 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.12
>
> Rémy

Re: [VOTE] Release Apache Tomcat 9.0.0.M18

[Rémy Maucherat]

2017-03-08 16:56 GMT+01:00 Mark Thomas :

> The proposed Apache Tomcat 9.0.0.M18 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.M17 release are:
>
> - Updates to the early access version of the Serlet 4.0 API to align it
>   with the most recent discussions in the Servlet EG
>
> - Support for Java 9 during annotation scanning
>
> - Enable ALPN (and hence HTTP/2) for NIO and NIO2 connectors when using
>   JSSE for TLS on Java 9
>
> - Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries
>   built with OpenSSL 1.0.2k
>
> Along with lots of other bug fixes and improvements
>
> For full details, see the changelog:
> http://svn.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.M18/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1120/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M18/
>
> The proposed 9.0.0.M18 release is:
> [ ] Broken - do not release
> [X] Alpha - go ahead and release as 9.0.0.M18
>
> Rémy

Re: [VOTE] Release Apache Tomcat 9.0.0.M18

[Felix Schumacher]

Am 08.03.2017 um 16:56 schrieb Mark Thomas:

The proposed Apache Tomcat 9.0.0.M18 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.M17 release are:

- Updates to the early access version of the Serlet 4.0 API to align it
   with the most recent discussions in the Servlet EG

- Support for Java 9 during annotation scanning

- Enable ALPN (and hence HTTP/2) for NIO and NIO2 connectors when using
   JSSE for TLS on Java 9

- Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries
   built with OpenSSL 1.0.2k

Along with lots of other bug fixes and improvements

For full details, see the changelog:
http://svn.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.M18/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1120/
The svn tag is:
http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M18/

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

Tests pass.

Felix


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




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

svn commit: r1786242 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[csutherl]

Author: csutherl
Date: Thu Mar  9 21:00:54 2017
New Revision: 1786242

URL: http://svn.apache.org/viewvc?rev=1786242=rev
Log:
Moving two changelog entries from incorrect the section (Web Applications) to 
the correct section (Catalina) so that the changelog correctly reflects the 
updates.

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1786242=1786241=1786242=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar  9 21:00:54 2017
@@ -97,6 +97,15 @@
 ServletRequest.getParameterMap() is fully immutable. Based
 on a patch provided by woosan. (markt)
   
+  
+60824: Correctly cache the Subject in the
+session - if there is a session - when running under a
+SecurityManager. Patch provided by Jan Engehausen. (markt)
+  
+  
+Ensure request and response facades are used when firing application
+listeners. (markt/remm)
+  
 
   
   
@@ -201,15 +210,6 @@
 Ensure the ASF logo image is correctly displayed in docs and
 host-manager applications. (violetagg)
   
-  
-60824: Correctly cache the Subject in the
-session - if there is a session - when running under a
-SecurityManager. Patch provided by Jan Engehausen. (markt)
-  
-  
-Ensure request and response facades are used when firing application
-listeners. (markt/remm)
-  
 
   
 



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

Re: [VOTE] Release Apache Tomcat 6.0.51

[Mark Thomas]

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

Unit tests pass on Linux and Windows with BIO, NIO and APR/native (1.2.12)

Mark



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

svn commit: r18647 [1/2] - in /dev/tomcat/tomcat-6/v6.0.51: ./ bin/ bin/extras/ src/

[markt]

Author: markt
Date: Thu Mar  9 20:48:37 2017
New Revision: 18647

Log:
Upload 6.0.51 for voting

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

Added: dev/tomcat/tomcat-6/v6.0.51/KEYS
==
--- dev/tomcat/tomcat-6/v6.0.51/KEYS (added)
+++ dev/tomcat/tomcat-6/v6.0.51/KEYS Thu Mar  9 20:48:37 2017
@@ -0,0 +1,631 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS

svn commit: r18647 [2/2] - in /dev/tomcat/tomcat-6/v6.0.51: ./ bin/ bin/extras/ src/

[markt]

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.asc
==
--- dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.asc Thu Mar 
 9 20:48:37 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJYwb0sAAoJEBDAHFovYFnncRQP/jA4LdPN8i61dBjWByj8o4DV
+iCNZ4CW7e8hOOrXyIdFkRSK4bO7NesWXCbJldwO2EcSQrbtoqqlUQWGSAkcqee9/
+Zhevxx1z65G58nY06f7+g+Dtkmz9+L3zHJ+IxsBalyKo5LBSsS4ybkFUzWs9ywfF
+eexraCQrkJ8Mt4n7bVa0XTmZy8yT+QhbaGhvHT3b72I+Qk/Pf883RzomjLe/+WRF
+YFH6aFvSAa2nyeP3rqNiaI3PI58qi7MT+DWu47/nTGqhwYetJD9eVVuMwgUsetEL
++eZEvSfMTRNVSeIsrJbmXQDxB5DOmP0JzhORFg5zSF9FAyvjNVveWmf8LmYga6Lx
+30elhWFMDtkYvZo3bR3zBKYp9qHJBgo/95pgGzOhf0nxMMdfTnzTm2CuQJxVvX02
+DksLifl+Qa+9IqetNELhOhbM0naXRSMIZqzrKUp0Ef7ep73+U9jCRbPZs1sL2loG
+e2oe2GW/P9MZZOpCg9OvPark5gDGWnV6c058yHuF67rTgfJMrkrw8k3es6iBELPv
+6x4hT/cQ7dycTlPO+zf2G9d1GFSq6JfusyB5zSkmjqQzLrujCY7s3L6ATAWkl39R
+oRorw5Qz0k/AU3rteSWKCFYUFAqI8HSzit5S05oKHUiOliLB2gTvqEeG556EW2Rk
++y6704MPfveDSruWyaDN
+=3dzT
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.md5
==
--- dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.md5 (added)
+++ dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.md5 Thu Mar 
 9 20:48:37 2017
@@ -0,0 +1 @@
+91aebfdea1a5b73e34f15ef315f64327 *apache-tomcat-6.0.51-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.sha1
==
--- dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.sha1 (added)
+++ dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.tar.gz.sha1 Thu 
Mar  9 20:48:37 2017
@@ -0,0 +1 @@
+5ebe7c59972d596191e85799d0f74bfd565d1b2b *apache-tomcat-6.0.51-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.asc
==
--- dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.asc (added)
+++ dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.asc Thu Mar  9 
20:48:37 2017
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJYwb0tAAoJEBDAHFovYFnn4XwQAOrSPhKgyRCKi0XzVcrl6/IN
+TYcEVaZX9LbiimzEj0fwz4KB7bLQMxbL29Zqjfgh0xY//3J8nRpYMTKFGMfsuxrx
+VweBUXdUpGewGyM/QJJYoe5MVFOHdMPqfFInXRpRm+uvDhUlg3GQd4/236qMpSTK
+4U6t6KXkvnkDE0mnt14UrjRMw5LaXoEKzPQkxng+OG+KGE4PHnOH+/PiZTmb9DYC
+Bi4CPXzoznPFR+PH5IS+w1c0IUzcXU0BKS8vEfGux81NI7L5iQVHrejnUe89wdfs
+CgNoB7uAYE5VZgSZPUURkRjX2XTgfM/X+ORpOOB5IxF/QleiOBdAMt+bagg0WTcP
+cE0CuzpjuP6iUA40jmEbYMY7I7OzRHYOlibs7pSNsZzWMDjJZVwwt/Hj0Xol1N+0
+9lwi8h4fZHIZE9nMLkclEmKXRarlS/dH70/ftpVNT9kW8meW3ZZR5/nPUpDl/eBI
+WTU2APn7HI+JCXZJY7F8CLIeSmCZRSRIDHVj+p3KYMWpRjSp6QinvKvmfF0CPK2w
+ANGRCdLYL9VhIjwOJtJ3mG4fb3y5/saABellpw8tUjE9owsxQMjrtyuSwoxGrOcZ
+065Mmfx8Ds8Z8zQ1RDhJKSNwDwyteNQLuMjYBSC//YUwjciLVZNTnbw/VQwDgowt
+GbDg3b44Ba1GSey4agQr
+=+G6v
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.md5
==
--- dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.md5 (added)
+++ dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.md5 Thu Mar  9 
20:48:37 2017
@@ -0,0 +1 @@
+972152a4cbed07ae14637729ddcd865d *apache-tomcat-6.0.51-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.sha1
==
--- dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-6/v6.0.51/src/apache-tomcat-6.0.51-src.zip.sha1 Thu Mar  
9 20:48:37 2017
@@ -0,0 +1 @@
+91696eb1fc2d1a084a86329a222d082db981e9b2 *apache-tomcat-6.0.51-src.zip
\ No newline at end of file



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

Re: [VOTE] Release Apache Tomcat 7.0.76

[Mark Thomas]

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

Unit tests pass on Linux and Windows with BIO, NIO, and APR/native (1.2.12)

Mark


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

Re: [VOTE] Release Apache Tomcat 8.0.42

[Mark Thomas]

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

Unit tests pass on Linux and Windows with BIO, NIO, NIO2 and APR/native
(1.2.12)

Mark


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

Re: [VOTE] Release Apache Tomcat 8.5.12

[Mark Thomas]

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

Unit tests pass on Linux and Windows with NIO, NIO2 and APR/native (1.2.12)

Mark

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

Re: [VOTE] Release Apache Tomcat 9.0.0.M18

[Mark Thomas]

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

Unit tests pass on Linux and Windows with NIO, NIO2 and APR/native (1.2.12)

Mark


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

[VOTE] Release Apache Tomcat 6.0.51

[Mark Thomas]

The proposed Apache Tomcat 6.0.51 release is now available for voting.

Note: This is expected to be the last Tomcat 6 release.

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

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

Regards,
Mark


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

svn commit: r1786239 - in /tomcat/tc6.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 20:39:50 2017
New Revision: 1786239

URL: http://svn.apache.org/viewvc?rev=1786239=rev
Log:
Increment version for next dev cycle

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

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1786239=1786238=1786239=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Mar  9 20:39:50 2017
@@ -28,7 +28,7 @@ version.minor=0
 version.build=51
 version.patch=0
 version.suffix=-dev
-version=6.0.51
+version=6.0.52
 
 # - Build control flags -
 execute.test.bio=true

Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1786239=1786238=1786239=diff
==
--- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Thu Mar  9 20:39:50 
2017
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=6.0.51
+maven.asf.release.deploy.version=6.0.52
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1786239=1786238=1786239=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Mar  9 20:39:50 2017
@@ -44,6 +44,8 @@
 
+
+
 
   
 



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

svn commit: r1786231 - in /tomcat/tc6.0.x/tags/TOMCAT_6_0_51: ./ build.properties.default

[markt]

Author: markt
Date: Thu Mar  9 20:04:19 2017
New Revision: 1786231

URL: http://svn.apache.org/viewvc?rev=1786231=rev
Log:
Tag 6.0.51

Added:
tomcat/tc6.0.x/tags/TOMCAT_6_0_51/   (props changed)
  - copied from r1786230, tomcat/tc6.0.x/trunk/
Modified:
tomcat/tc6.0.x/tags/TOMCAT_6_0_51/build.properties.default

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_51/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar  9 20:04:19 2017
@@ -0,0 +1,5 @@
+.*
+output
+build.properties
+work
+logs

Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_51/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  9 20:04:19 2017
@@ -0,0 +1,4 @@
+/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,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,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,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,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,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016,1779353,1779659,1781602,1786147,1786149-1786150
+/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,1666759,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,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,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565,1767653,1767656,1776543,1777015,1779330,1784188
+/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578,1765591,1765596,1767370,1772175,1772230,1773419,1774137,1774250,1774306-1774307,1774309,1774342,1777014,1779655,1781600,1786033,1786039,1786072,1786131

svn commit: r1786191 - /tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

[remm]

Author: remm
Date: Thu Mar  9 15:44:28 2017
New Revision: 1786191

URL: http://svn.apache.org/viewvc?rev=1786191=rev
Log:
Remove fixme (already done) and revert some private -> protected changes that 
are not useful at the moment.

Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1786191=1786190=1786191=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Thu Mar  
9 15:44:28 2017
@@ -92,20 +92,20 @@ class Http2UpgradeHandler extends Abstra
 
 protected static final byte[] GOAWAY = { 0x07, 0x00, 0x00, 0x00, 0x00, 
0x00 };
 
-protected static final String HTTP2_SETTINGS_HEADER = "HTTP2-Settings";
+private static final String HTTP2_SETTINGS_HEADER = "HTTP2-Settings";
 
 private static final HeaderSink HEADER_SINK = new HeaderSink();
 
 protected final String connectionId;
 
-protected final Adapter adapter;
+private final Adapter adapter;
 protected volatile SocketWrapperBase socketWrapper;
-protected volatile SSLSupport sslSupport;
+private volatile SSLSupport sslSupport;
 
-protected volatile Http2Parser parser;
+private volatile Http2Parser parser;
 
 // Simple state machine (sequence of states)
-protected AtomicReference connectionState =
+private AtomicReference connectionState =
 new AtomicReference<>(ConnectionState.NEW);
 private volatile long pausedNanoTime = Long.MAX_VALUE;
 
@@ -113,7 +113,7 @@ class Http2UpgradeHandler extends Abstra
  * Remote settings are settings defined by the client and sent to Tomcat
  * that Tomcat must use when communicating with the client.
  */
-protected final ConnectionSettingsRemote remoteSettings;
+private final ConnectionSettingsRemote remoteSettings;
 /**
  * Local settings are settings defined by Tomcat and sent to the client 
that
  * the client must use when communicating with Tomcat.
@@ -135,16 +135,16 @@ class Http2UpgradeHandler extends Abstra
 private volatile int maxActiveRemoteStreamId = -1;
 private volatile int maxProcessedStreamId;
 private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
-protected final PingManager pingManager = getPingManager();
+private final PingManager pingManager = getPingManager();
 private volatile int newStreamsSinceLastPrune = 0;
 // Tracking for when the connection is blocked (windowSize < 1)
 private final Map backLogStreams = new 
ConcurrentHashMap<>();
 private long backLogSize = 0;
 
 // Stream concurrency control
-protected int maxConcurrentStreamExecution = 
Http2Protocol.DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
-protected AtomicInteger streamConcurrency = null;
-protected Queue queuedRunnable = null;
+private int maxConcurrentStreamExecution = 
Http2Protocol.DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
+private AtomicInteger streamConcurrency = null;
+private Queue queuedRunnable = null;
 
 // Limits
 private Set allowedTrailerHeaders = Collections.emptySet();
@@ -238,7 +238,7 @@ class Http2UpgradeHandler extends Abstra
 } catch (Http2Exception e) {
 String msg = sm.getString("upgradeHandler.invalidPreface", 
connectionId);
 if (log.isDebugEnabled()) {
-log.debug(msg, e);
+log.debug(msg);
 }
 throw new ProtocolException(msg);
 }
@@ -258,7 +258,7 @@ class Http2UpgradeHandler extends Abstra
 }
 }
 
-protected void processStreamOnContainerThread(Stream stream) {
+private void processStreamOnContainerThread(Stream stream) {
 StreamProcessor streamProcessor = new StreamProcessor(this, stream, 
adapter, socketWrapper);
 streamProcessor.setSslSupport(sslSupport);
 processStreamOnContainerThread(streamProcessor, SocketEvent.OPEN_READ);
@@ -935,7 +935,7 @@ class Http2UpgradeHandler extends Abstra
 }
 
 
-protected Stream getStream(int streamId, boolean unknownIsError) throws 
ConnectionException {
+private Stream getStream(int streamId, boolean unknownIsError) throws 
ConnectionException {
 Integer key = Integer.valueOf(streamId);
 Stream result = streams.get(key);
 if (result == null && unknownIsError) {
@@ -1565,7 +1565,6 @@ class Http2UpgradeHandler extends Abstra
 } else {
 // Client originated ping. Echo it back.
 synchronized (socketWrapper) {
-// FIXME: extract
 socketWrapper.write(true, PING_ACK, 0, PING_ACK.length);
 

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

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-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-trunk-test-apr :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-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 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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-APR
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-APR]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 4 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 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Dtest.temp=output/test-tmp-APR 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dtest.accesslog=true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dexamples.sources.skip=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170309.jar
 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170309/bin/openssl
 -Dexecute.test.nio=false 
-Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170309-native-src.tar.gz
 -Dtest.reports=output/logs-APR -Dtomc
 
at-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170309-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-trunk/dest-20170309/lib 
-Dtest.relaxTiming=true -Dtest.excludePerformance=true 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-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-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump

svn commit: r1786186 - in /tomcat/trunk: java/org/apache/coyote/ java/org/apache/coyote/http11/ java/org/apache/coyote/http2/ webapps/docs/

[remm]

Author: remm
Date: Thu Mar  9 15:27:10 2017
New Revision: 1786186

URL: http://svn.apache.org/viewvc?rev=1786186=rev
Log:
- Pick up an old experiment with IO and NIO2. I decided to revisit it as the 
topic of TomcatCon came along.
- Start using it for HTTP/2 output. It seems to work (h2load, testsuite, 
browser).
- After testing it with h2load, it does provide a benefit over vanilla NIO2 
with only a limited amount of code, so contribute it.
- Add some plumbing to allow extending HTTP/2 upgrade handler to replace its 
IO, and a minor change to the API to pass the socket wrapper to determine the 
capabilities of the endpoint. Since it seems to work and NIO2 isn't the 
default, enable it with NIO2. Although I left it for now, it may be better to 
disable it with SSL (another reason to pass around the socket wrapper).
- Ultimately, the strategy is the exact opposite of Coyote (= zero GC), the 
protocol handler gets control of everything through the read/write API 
(syncing, blocking, etc) and encourages GC abuse to minimize blocking.
- If this is too big a change, I can revert it and discuss it first. Although 
it got discussed in 2015, it's a long time ago.

Added:
tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java   
(with props)
Modified:
tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java?rev=1786186=1786185=1786186=diff
==
--- tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/UpgradeProtocol.java Thu Mar  9 
15:27:10 2017
@@ -70,13 +70,14 @@ public interface UpgradeProtocol {
 
 
 /**
+ * @param socketWrapper The socket
  * @param adapter The Adapter to use to configure the new upgrade handler
  * @param request A copy (may be incomplete) of the request that triggered
  *the upgrade
  *
  * @return An instance of the HTTP upgrade handler for this protocol
  */
-public InternalHttpUpgradeHandler getInternalUpgradeHandler(Adapter 
adapter, Request request);
+public InternalHttpUpgradeHandler 
getInternalUpgradeHandler(SocketWrapperBase socketWrapper, Adapter adapter, 
Request request);
 
 
 /**

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1786186=1786185=1786186=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Thu Mar  9 
15:27:10 2017
@@ -455,7 +455,7 @@ public class Http11Processor extends Abs
 
 InternalHttpUpgradeHandler upgradeHandler =
 upgradeProtocol.getInternalUpgradeHandler(
-getAdapter(), cloneRequest(request));
+socketWrapper, getAdapter(), 
cloneRequest(request));
 UpgradeToken upgradeToken = new 
UpgradeToken(upgradeHandler, null, null);
 action(ActionCode.UPGRADE, upgradeToken);
 return SocketState.UPGRADING;

Added: tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java?rev=1786186=auto
==
--- tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
(added)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java Thu 
Mar  9 15:27:10 2017
@@ -0,0 +1,341 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing 

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

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 5 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170309-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170309.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170309-native-src
 .tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170309/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump

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

[Bill Barker]

To whom it may engage...

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

Project tomcat-trunk-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-trunk-test-nio :  Tomcat 9.x, a web server implementing the Java 
Servlet 4.0,
...


Full details are available at:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-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 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.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/logs-NIO]
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs
 -WARNING- No directory 
[/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs]



The following work was performed:
http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 6 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 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-trunk/true 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.6-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170309-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar 
-Dtest.relaxTiming=true 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170309.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170309-native-src.
 tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true 
-Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20170309/bin/openssl
 -Dexecute.test.apr=false -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar 
-Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public

svn commit: r1786181 - in /tomcat/tc6.0.x/trunk: ./ build.properties.default dist.xml res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 14:25:43 2017
New Revision: 1786181

URL: http://svn.apache.org/viewvc?rev=1786181=rev
Log:
Re-work NSIS build so NSIS 2.x can be used easily (3.x remains the default)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 14:25:43 2017
@@ -1,4 +1,4 @@
-/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,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,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,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,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,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016,1779353,1779659,1781602,1786147
+/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,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,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,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,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,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 

svn commit: r1786180 - /tomcat/tc7.0.x/trunk/res/tomcat.nsi

[markt]

Author: markt
Date: Thu Mar  9 14:22:22 2017
New Revision: 1786180

URL: http://svn.apache.org/viewvc?rev=1786180=rev
Log:
Correct minimum Java version incorrectly changed in r1786149

Modified:
tomcat/tc7.0.x/trunk/res/tomcat.nsi

Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1786180=1786179=1786180=diff
==
--- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Thu Mar  9 14:22:22 2017
@@ -125,7 +125,7 @@ Var ServiceInstallLog
   LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
   LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
 
-  LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java 
SE 7.0 or later JRE installed on your system."
+  LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java 
SE 6.0 or later JRE installed on your system."
   LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown 
Port"
   LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector 
Port"
   LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"



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

svn commit: r1786179 - /tomcat/tc6.0.x/trunk/res/tomcat.nsi

[markt]

Author: markt
Date: Thu Mar  9 14:21:14 2017
New Revision: 1786179

URL: http://svn.apache.org/viewvc?rev=1786179=rev
Log:
Fix i18n related warnings that are reported with NSIS 3.0. (The problem existed 
with 2.x but no warning was generated.)

Modified:
tomcat/tc6.0.x/trunk/res/tomcat.nsi

Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1786179=1786178=1786179=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Mar  9 14:21:14 2017
@@ -15,6 +15,9 @@
 
 ; Tomcat script for Nullsoft Installer
 
+  ;General
+  OutFile tomcat-installer.exe
+
   ;Compression options
   CRCCheck on
   SetCompressor /SOLID lzma
@@ -90,8 +93,27 @@ Var ServiceInstallLog
   !define MUI_ICON tomcat.ico
   !define MUI_UNICON tomcat.ico
 
-  ;General
-  OutFile tomcat-installer.exe
+  ;Install Page order
+  !insertmacro MUI_PAGE_WELCOME
+  ; Show file named "INSTALLLICENSE"
+  !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
+  ; Use custom onLeave function with COMPONENTS page
+  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageComponentsLeave
+  !insertmacro MUI_PAGE_COMPONENTS
+  Page custom pageConfiguration pageConfigurationLeave "$(TEXT_CONF_PAGETITLE)"
+  Page custom pageChooseJVM pageChooseJVMLeave "$(TEXT_JVM_PAGETITLE)"
+  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageDirectoryLeave
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  Page custom CheckUserType
+  !insertmacro MUI_PAGE_FINISH
+
+  ;Uninstall Page order
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+  ;Language
+  !insertmacro MUI_LANGUAGE English
 
   ;Install Options pages
   LangString TEXT_JVM_TITLE ${LANG_ENGLISH} "Java Virtual Machine"
@@ -114,39 +136,16 @@ Var ServiceInstallLog
   LangString TEXT_CONF_LABEL_ADMINPASSWORD ${LANG_ENGLISH} "Password"
   LangString TEXT_CONF_LABEL_ADMINROLES ${LANG_ENGLISH} "Roles"
 
-  ;Install Page order
-  !insertmacro MUI_PAGE_WELCOME
-  ; Show file named "INSTALLLICENSE"
-  !insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
-  ; Use custom onLeave function with COMPONENTS page
-  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageComponentsLeave
-  !insertmacro MUI_PAGE_COMPONENTS
-  Page custom pageConfiguration pageConfigurationLeave "$(TEXT_CONF_PAGETITLE)"
-  Page custom pageChooseJVM pageChooseJVMLeave "$(TEXT_JVM_PAGETITLE)"
-  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageDirectoryLeave
-  !insertmacro MUI_PAGE_DIRECTORY
-  !insertmacro MUI_PAGE_INSTFILES
-  Page custom CheckUserType
-  !insertmacro MUI_PAGE_FINISH
-
-  ;Uninstall Page order
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
   ;Component-selection page
-;Descriptions
-LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet 
container as a Windows service."
-LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet 
container core and create the Windows service."
-LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the 
Tomcat service when the computer is started."
-LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat 
native .dll for better performance and scalability in production environments."
-LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group 
for Tomcat."
-LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation 
bundle. This includes documentation on the servlet container and its 
configuration options, on the Jasper JSP page compiler, as well as on the 
native webserver connectors."
-LangString DESC_SecManager ${LANG_ENGLISH} "Install the Tomcat Manager 
administrative web application."
-LangString DESC_SecHostManager ${LANG_ENGLISH} "Install the Tomcat Host 
Manager administrative web application."
-LangString DESC_SecExamples ${LANG_ENGLISH} "Install the Servlet and JSP 
examples web application."
-
-  ;Language
-  !insertmacro MUI_LANGUAGE English
+  LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet 
container as a Windows service."
+  LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet 
container core and create the Windows service."
+  LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the 
Tomcat service when the computer is started."
+  LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Install APR based Tomcat 
native .dll for better performance and scalability in production environments."
+  LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group 
for Tomcat."
+  LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation 
bundle. This includes documentation on the servlet container and its 
configuration options, on the Jasper JSP page compiler, as well as on the 
native webserver connectors."
+  LangString DESC_SecManager ${LANG_ENGLISH} "Install the 

svn commit: r1786175 - in /tomcat/tc6.0.x/trunk: ./ build.properties.default res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 14:18:42 2017
New Revision: 1786175

URL: http://svn.apache.org/viewvc?rev=1786175=rev
Log:
Update NSIS installer to 3.01

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 14:18:42 2017
@@ -1,4 +1,4 @@
-/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,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,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,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,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,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016,1779353,1779659,1781602
+/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,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,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,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1704482,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,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759
 
567,1761631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675-1767676,1771211,1772177,1772262,1772270,1773421,1774139,1774252,1774321,1774323,1774325,1774345,1777016,1779353,1779659,1781602,1786147
 

svn commit: r1786174 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 14:15:09 2017
New Revision: 1786174

URL: http://svn.apache.org/viewvc?rev=1786174=rev
Log:
Increment version for next dev cycle

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

Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1786174=1786173=1786174=diff
==
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Thu Mar  9 14:15:09 2017
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=7
 version.minor=0
-version.build=76
+version.build=77
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1786174=1786173=1786174=diff
==
--- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Thu Mar  9 14:15:09 
2017
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=7.0.76
+maven.asf.release.deploy.version=7.0.77
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1786174=1786173=1786174=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar  9 14:15:09 2017
@@ -57,7 +57,9 @@
   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: [VOTE] Release Apache Tomcat 7.0.76

[Mark Thomas]

On 09/03/17 14:11, Mark Thomas wrote:
> The proposed Apache Tomcat 7.0.76 release is now available for voting.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.76/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1123/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
> 
> The proposed 7.0.76 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 7.0.76 Stable
> 
> Regards,

Whoops. I hit sent before editing the signature.

Mark


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


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

[VOTE] Release Apache Tomcat 7.0.76

[Mark Thomas]

The proposed Apache Tomcat 7.0.76 release is now available for voting.

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

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

Regards,
Violeta


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

[ANN] TomcatCon schedule announced

[Mark Thomas]

All,

I am delighted to announce that the schedule for TomcatCon has been
published:

https://apachecon2017.sched.com/overview/type/TomcatCon

Registration is open at:

http://events.linuxfoundation.org/events/apachecon-north-america/attend/register-

with early bird pricing ($600) through Sunday 12th March saving 25% on
the standard registration fee.

Note that registration for TomcatCon includes access to ApacheCon and
Apache Big Data.

See you in Miami!

Mark

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

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

[markt]

Author: markt
Date: Thu Mar  9 14:08:41 2017
New Revision: 18641

Log:
Upload 7.0.76 for voting

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

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

[markt]

Added: dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.tar.gz.sha1
==
--- dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.tar.gz.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.tar.gz.sha1 Thu 
Mar  9 14:08:41 2017
@@ -0,0 +1 @@
+0a432e0853b399d7e9aec6df0679e11c6622ed51 *apache-tomcat-7.0.76-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.asc
==
--- dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.asc Thu Mar  9 
14:08:41 2017
@@ -0,0 +1,7 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2
+
+iEYEABECAAYFAljBXeoACgkQb7IeiTPGAkODSQCfeWn1FvuLqaQhb/+dUPqwT4QI
+6hIAn35QlYaXAUwclp8wu4HtKZzaDqgS
+=QvMF
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.md5
==
--- dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.md5 Thu Mar  9 
14:08:41 2017
@@ -0,0 +1 @@
+d2cdacc54ed4323cbd81dbed44ca977e *apache-tomcat-7.0.76-src.zip
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.sha1
==
--- dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.sha1 (added)
+++ dev/tomcat/tomcat-7/v7.0.76/src/apache-tomcat-7.0.76-src.zip.sha1 Thu Mar  
9 14:08:41 2017
@@ -0,0 +1 @@
+cb5a32374d15abae4515a48d09a32af3d0891a41 *apache-tomcat-7.0.76-src.zip
\ No newline at end of file



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

svn commit: r1786169 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_76: ./ build.properties.default

[markt]

Author: markt
Date: Thu Mar  9 13:45:55 2017
New Revision: 1786169

URL: http://svn.apache.org/viewvc?rev=1786169=rev
Log:
Tag 7.0.76

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_76/   (props changed)
  - copied from r1786167, tomcat/tc7.0.x/trunk/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_76/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
bugtraq:append = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Mar  9 13:45:55 2017
@@ -0,0 +1,2 @@
+(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+)
+(\d+)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
--- subclipse:tags (added)
+++ subclipse:tags Thu Mar  9 13:45:55 2017
@@ -0,0 +1,27 @@
+933020,TOMCAT_7_0_0_RC1,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1,tag
+945257,TOMCAT_7_0_0_RC2,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC2,tag
+947494,TOMCAT_7_0_0_RC3,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3,tag
+952212,TOMCAT_7_0_0_RC4,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC4,tag
+954232,TOMCAT_7_0_0,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0,tag
+981255,TOMCAT_7_0_1,/tomcat/tc7.0.x/tags/TOMCAT_7_0_1,tag
+982035,TOMCAT_7_0_2,/tomcat/tc7.0.x/tags/TOMCAT_7_0_2,tag
+1003912,TOMCAT_7_0_3,/tomcat/tc7.0.x/tags/TOMCAT_7_0_3,tag
+1022637,TOMCAT_7_0_4,/tomcat/tc7.0.x/tags/TOMCAT_7_0_4,tag
+1038717,TOMCAT_7_0_5,/tomcat/tc7.0.x/tags/TOMCAT_7_0_5,tag
+1057288,TOMCAT_7_0_6,/tomcat/tc7.0.x/tags/TOMCAT_7_0_6,tag
+1066773,TOMCAT_7_0_7,/tomcat/tc7.0.x/tags/TOMCAT_7_0_7,tag
+1067169,TOMCAT_7_0_8,/tomcat/tc7.0.x/tags/TOMCAT_7_0_8,tag
+1075337,TOMCAT_7_0_9,/tomcat/tc7.0.x/tags/TOMCAT_7_0_9,tag
+1078282,TOMCAT_7_0_10,/tomcat/tc7.0.x/tags/TOMCAT_7_0_10,tag
+1080182,TOMCAT_7_0_11,/tomcat/tc7.0.x/tags/TOMCAT_7_0_11,tag
+1087797,TOMCAT_7_0_12,/tomcat/tc7.0.x/tags/TOMCAT_7_0_12,tag
+1101230,TOMCAT_7_0_14,/tomcat/tc7.0.x/tags/TOMCAT_7_0_14,tag
+1101232,TOMCAT_7_0_13,/tomcat/tc7.0.x/tags/TOMCAT_7_0_13,tag
+1131469,TOMCAT_7_0_15,/tomcat/tc7.0.x/tags/TOMCAT_7_0_15,tag
+1134562,TOMCAT_7_0_16,/tomcat/tc7.0.x/tags/TOMCAT_7_0_16,tag
+1142314,TOMCAT_7_0_17,/tomcat/tc7.0.x/tags/TOMCAT_7_0_17,tag
+1143610,TOMCAT_7_0_18,/tomcat/tc7.0.x/tags/TOMCAT_7_0_18,tag
+1146504,TOMCAT_7_0_19,/tomcat/tc7.0.x/tags/TOMCAT_7_0_19,tag
+1155255,TOMCAT_7_0_20,/tomcat/tc7.0.x/tags/TOMCAT_7_0_20,tag
+1162976,TOMCAT_7_0_21,/tomcat/tc7.0.x/tags/TOMCAT_7_0_21,tag
+1176597,TOMCAT_7_0_22,/tomcat/tc7.0.x/tags/TOMCAT_7_0_22,tag

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
--- svn:ignore (added)
+++ svn:ignore Thu Mar  9 13:45:55 2017
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_76/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Mar  9 13:45:55 2017
@@ -0,0 +1,3 @@
+/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
 

[Bug 59706] HTTP/2 load testing performance

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=59706

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #4 from Remy Maucherat  ---
There's now a good balance between supporting HTTP/2 and limiting concurrency
enough.

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

buildbot success in on tomcat-trunk

[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/2173

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] 1786158
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1786158 - /tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

[remm]

Author: remm
Date: Thu Mar  9 12:54:49 2017
New Revision: 1786158

URL: http://svn.apache.org/viewvc?rev=1786158=rev
Log:
Oops, fix test build.

Modified:

tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1786158=1786157=1786158=diff
==
--- 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 (original)
+++ 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 Thu Mar  9 12:54:49 2017
@@ -50,6 +50,7 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.SSLSupport;
 import org.apache.tomcat.util.net.SocketEvent;
 import org.apache.tomcat.util.net.SocketWrapperBase;
+import org.apache.tomcat.util.net.SocketWrapperBase.BlockingMode;
 import org.apache.tomcat.util.net.SocketWrapperBase.CompletionState;
 
 public class TestUpgradeInternalHandler extends TomcatBaseTest {
@@ -193,7 +194,7 @@ public class TestUpgradeInternalHandler
 // Note: the completion check used will not call the completion 
handler if the IO completed inline and without error.
 // Using a completion check that always calls complete would be 
easier here since the action is the same even with inline completion.
 final ByteBuffer buffer = ByteBuffer.allocate(1024);
-CompletionState state = wrapper.read(false, 10, TimeUnit.SECONDS, 
null, SocketWrapperBase.READ_DATA, new CompletionHandler() {
+CompletionState state = wrapper.read(BlockingMode.NON_BLOCK, 10, 
TimeUnit.SECONDS, null, SocketWrapperBase.READ_DATA, new 
CompletionHandler() {
 @Override
 public void completed(Long result, Void attachment) {
 System.out.println("Read: " + result.longValue());
@@ -212,7 +213,7 @@ public class TestUpgradeInternalHandler
 
 private void write(ByteBuffer buffer) {
 buffer.flip();
-CompletionState state = wrapper.write(true, 10, TimeUnit.SECONDS, 
null, SocketWrapperBase.COMPLETE_WRITE, new CompletionHandler() {
+CompletionState state = wrapper.write(BlockingMode.BLOCK, 10, 
TimeUnit.SECONDS, null, SocketWrapperBase.COMPLETE_WRITE, new 
CompletionHandler() {
 @Override
 public void completed(Long result, Void attachment) {
 System.out.println("Write: " + result.longValue());



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

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/689

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1786150
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

buildbot failure in on tomcat-trunk

[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/2172

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] 1786153
Blamelist: remm

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: r1786153 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SocketWrapperBase.java

[remm]

Author: remm
Date: Thu Mar  9 12:26:34 2017
New Revision: 1786153

URL: http://svn.apache.org/viewvc?rev=1786153=rev
Log:
Add blocking mode tweak, as I accidentally found out blocking does make a 
difference.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1786153=1786152=1786153=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Mar  9 
12:26:34 2017
@@ -971,9 +971,9 @@ public class Nio2Endpoint extends Abstra
 
 @Override
 public  CompletionState read(ByteBuffer[] dsts, int offset, int 
length,
-boolean block, long timeout, TimeUnit unit, A attachment,
+BlockingMode block, long timeout, TimeUnit unit, A attachment,
 CompletionCheck check, CompletionHandler 
handler) {
-if (block) {
+if (block != BlockingMode.NON_BLOCK) {
 try {
 if (!readPending.tryAcquire(timeout, unit)) {
 handler.failed(new SocketTimeoutException(), 
attachment);
@@ -992,7 +992,7 @@ public class Nio2Endpoint extends Abstra
 Nio2Endpoint.startInline();
 getSocket().read(dsts, offset, length, timeout, unit, state, new 
ScatterReadCompletionHandler<>());
 Nio2Endpoint.endInline();
-if (block && state.state == CompletionState.PENDING) {
+if (block == BlockingMode.BLOCK && state.state == 
CompletionState.PENDING) {
 if (!awaitReadComplete(timeout, unit)) {
 handler.failed(new SocketTimeoutException(), attachment);
 return CompletionState.ERROR;
@@ -1010,9 +1010,9 @@ public class Nio2Endpoint extends Abstra
 
 @Override
 public   CompletionState write(ByteBuffer[] srcs, int offset, int 
length,
-boolean block, long timeout, TimeUnit unit, A attachment,
+BlockingMode block, long timeout, TimeUnit unit, A attachment,
 CompletionCheck check, CompletionHandler 
handler) {
-if (block) {
+if (block != BlockingMode.NON_BLOCK) {
 try {
 if (!writePending.tryAcquire(timeout, unit)) {
 handler.failed(new SocketTimeoutException(), 
attachment);
@@ -1031,7 +1031,7 @@ public class Nio2Endpoint extends Abstra
 Nio2Endpoint.startInline();
 getSocket().write(srcs, offset, length, timeout, unit, state, new 
GatherWriteCompletionHandler<>());
 Nio2Endpoint.endInline();
-if (block && state.state == CompletionState.PENDING) {
+if (block == BlockingMode.BLOCK && state.state == 
CompletionState.PENDING) {
 if (!awaitWriteComplete(timeout, unit)) {
 handler.failed(new SocketTimeoutException(), attachment);
 return CompletionState.ERROR;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1786153=1786152=1786153=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu Mar 
 9 12:26:34 2017
@@ -764,6 +764,23 @@ public abstract class SocketWrapperBase<
 // --- NIO 2 style APIs
 
 
+public enum BlockingMode {
+/**
+ * The operation will now block. If there are pending operations,
+ * the operation will return CompletionState.NOT_DONE.
+ */
+NON_BLOCK,
+/**
+ * The operation will block until pending operations are completed, but
+ * will not block after performing it.
+ */
+SEMI_BLOCK,
+/**
+ * The operation will block until completed.
+ */
+BLOCK
+}
+
 public enum CompletionState {
 /**
  * Operation is still pending.
@@ -921,11 +938,7 @@ public abstract class SocketWrapperBase<
  * behavior is used: the completion handler will be called as soon
  * as some data has been read, even if the read has completed inline.
  *
- * @param block true to block until any pending read is done, if the
- *timeout occurs and a read is still pending, a
- *ReadPendingException will be thrown; false to
- *not block but any 

svn commit: r1786150 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default build.xml res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 12:03:22 2017
New Revision: 1786150

URL: http://svn.apache.org/viewvc?rev=1786150=rev
Log:
Re-work NSIS build so NSIS 2.x can be used easily (3.x remains the default)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/res/tomcat.nsi
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 12:03:22 2017
@@ -1,3 +1,3 @@
 
/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,1681703,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,1702
 
742,1702744,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,1715866,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,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670

svn commit: r1786149 - in /tomcat/tc7.0.x/trunk: ./ res/tomcat.nsi

[markt]

Author: markt
Date: Thu Mar  9 12:01:06 2017
New Revision: 1786149

URL: http://svn.apache.org/viewvc?rev=1786149=rev
Log:
Fix i18n related warnings that are reported with NSIS 3.0. (The problem existed 
with 2.x but no warning was generated.)

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 12:01:06 2017
@@ -1,3 +1,3 @@
 
/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,1681703,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,1702
 
742,1702744,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,1715866,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,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670

buildbot failure in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/688

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

Buildslave for this Build: silvanus_ubuntu

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

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

svn commit: r1786147 - in /tomcat/tc7.0.x/trunk: ./ build.properties.default res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 11:54:48 2017
New Revision: 1786147

URL: http://svn.apache.org/viewvc?rev=1786147=rev
Log:
Update NSIS installer to 3.01

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/tomcat.nsi
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 11:54:48 2017
@@ -1,3 +1,3 @@
 
/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,1681703,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,1702
 
742,1702744,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,1715866,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,1
 
726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670

svn commit: r1786137 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SocketWrapperBase.java

[remm]

Author: remm
Date: Thu Mar  9 11:19:55 2017
New Revision: 1786137

URL: http://svn.apache.org/viewvc?rev=1786137=rev
Log:
Readd blocking (for now) and fix loop indexes (ooops).

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1786137=1786136=1786137=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Mar  9 
11:19:55 2017
@@ -1031,6 +1031,12 @@ public class Nio2Endpoint extends Abstra
 Nio2Endpoint.startInline();
 getSocket().write(srcs, offset, length, timeout, unit, state, new 
GatherWriteCompletionHandler<>());
 Nio2Endpoint.endInline();
+if (block && state.state == CompletionState.PENDING) {
+if (!awaitWriteComplete(timeout, unit)) {
+handler.failed(new SocketTimeoutException(), attachment);
+return CompletionState.ERROR;
+}
+}
 return state.state;
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1786137=1786136=1786137=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu Mar 
 9 11:19:55 2017
@@ -832,8 +832,8 @@ public abstract class SocketWrapperBase<
 @Override
 public CompletionHandlerCall callHandler(CompletionState state, 
ByteBuffer[] buffers,
 int offset, int length) {
-for (int i = 0; i < offset; i++) {
-if (buffers[i].remaining() > 0) {
+for (int i = 0; i < length; i++) {
+if (buffers[offset + i].remaining() > 0) {
 return CompletionHandlerCall.CONTINUE;
 }
 }



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

svn commit: r1786133 - in /tomcat/tc8.0.x/trunk: ./ build.properties.default build.xml res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 11:10:47 2017
New Revision: 1786133

URL: http://svn.apache.org/viewvc?rev=1786133=rev
Log:
Re-work NSIS build so NSIS 2.x can be used easily (3.x remains the default)

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/res/tomcat.nsi
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 11:10:47 2017
@@ -1,2 +1,2 @@
 
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669
-/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: r1786132 - in /tomcat/tc8.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 11:07:21 2017
New Revision: 1786132

URL: http://svn.apache.org/viewvc?rev=1786132=rev
Log:
Increment version for next dev cycle

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

Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1786132=1786131=1786132=diff
==
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Thu Mar  9 11:07:21 2017
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=0
-version.build=42
+version.build=43
 version.patch=0
 version.suffix=-dev
 

Modified: tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default?rev=1786132=1786131=1786132=diff
==
--- tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc8.0.x/trunk/res/maven/mvn.properties.default Thu Mar  9 11:07:21 
2017
@@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos
 maven.asf.release.repo.repositoryId=apache.releases
 
 # Release version info
-maven.asf.release.deploy.version=8.0.42
+maven.asf.release.deploy.version=8.0.43
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib

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=1786132=1786131=1786132=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar  9 11:07:21 2017
@@ -44,7 +44,9 @@
   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

[VOTE] Release Apache Tomcat 8.0.42

[Mark Thomas]

Correcting the subject.

On 08/03/17 20:26, Mark Thomas wrote:
> The proposed Apache Tomcat 8.0.42 release is now available for voting.
> 
> The main changes since 8.0.41 are:
> 
> - Limited relaxation of the HTTP request line validation
> 
> - Support for Java 9 during annotation scanning
> 
> - Update Tomcat Native to 1.2.12 to pick up the latest Windows binaries
>   built with OpenSSL 1.0.2k
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.0.42/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1122/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.0.x/tags/TOMCAT_8_0_42/
> 
> The proposed 8.0.42 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 8.0.42
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

svn commit: r1786131 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default build.xml res/tomcat.nsi webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Mar  9 11:03:33 2017
New Revision: 1786131

URL: http://svn.apache.org/viewvc?rev=1786131=rev
Log:
Re-work NSIS build so NSIS 2.x can be used easily (3.x remains the default)

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/build.xml
tomcat/tc8.5.x/trunk/res/tomcat.nsi
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  9 11:03:33 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
 
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
 
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,1762168,176217
 

Re: buildbot failure in on tomcat-trunk

[Mark Thomas]

On 09/03/17 00:03, Mark Thomas wrote:
> On 08/03/17 22:56, build...@apache.org wrote:
>> 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/2165
>>
>> Buildbot URL: https://ci.apache.org/
>>
>> Buildslave for this Build: bb_1604_test_ubuntu
>>
>> Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
>> triggered this build
>> Build Source Stamp: [branch tomcat/trunk] 1786089
>> Blamelist: markt
>>
>> BUILD FAILED: failed compile
> 
> wine + NSIS appears to be less broken on 1604 but still not working. I
> plan on looking at this some more tomorrow.

I wasn't able to make any progress with this. My solution was to
refactor the build so it is easy to switch to NSIS 2.51 for the CI systems.

trunk builds are green again and I'll beback-porting the necessary
changes to 8.5.x and 8.0.x shortly.

Mark


-
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

[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/2169

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

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

[markt]

Author: markt
Date: Thu Mar  9 10:46:24 2017
New Revision: 1786129

URL: http://svn.apache.org/viewvc?rev=1786129=rev
Log:
Changelog entry for re-worked NSIS builds

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=1786129=1786128=1786129=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Mar  9 10:46:24 2017
@@ -45,6 +45,17 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Refactor the build script and the NSIS installer script so that either
+NSIS 2.x or NSIS 3.x can be used to build the installer. This is
+primarily to re-enable building the installer on the Linux based CI
+system where the combination of NSIS 3.x and wine leads to failed
+installer builds. (markt)
+  
+
+  
 
 
   



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

svn commit: r1786128 - /tomcat/trunk/java/org/apache/catalina/ContainerEvent.java

[markt]

Author: markt
Date: Thu Mar  9 10:35:16 2017
New Revision: 1786128

URL: http://svn.apache.org/viewvc?rev=1786128=rev
Log:
Trivial ws change to trigger CI for test

Modified:
tomcat/trunk/java/org/apache/catalina/ContainerEvent.java

Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=1786128=1786127=1786128=diff
==
--- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Thu Mar  9 
10:35:16 2017
@@ -16,7 +16,6 @@
  */
 package org.apache.catalina;
 
-
 import java.util.EventObject;
 
 /**



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

svn commit: r1786127 - /tomcat/trunk/build.properties.default

[markt]

Author: markt
Date: Thu Mar  9 10:22:50 2017
New Revision: 1786127

URL: http://svn.apache.org/viewvc?rev=1786127=rev
Log:
Parameterise to simply making changes

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1786127=1786126=1786127=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar  9 10:22:50 2017
@@ -136,11 +136,12 @@ tomcat-native.win.2=${base-tomcat.loc.2}
 nsis.version=3.01
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
-nsis.installoptions.dll=${nsis.home}/Plugins/x86-unicode/InstallOptions.dll
-nsis.nsexec.dll=${nsis.home}/Plugins/x86-unicode/nsExec.dll
-nsis.nsisdl.dll=${nsis.home}/Plugins/x86-unicode/NSISdl.dll
-nsis.system.dll=${nsis.home}/Plugins/x86-unicode/System.dll
-nsis.nsdialogs.dll=${nsis.home}/Plugins/x86-unicode/nsDialogs.dll
+nsis.arch.dir=x86-unicode/
+nsis.installoptions.dll=${nsis.home}/Plugins/${nsis.arch.dir}InstallOptions.dll
+nsis.nsexec.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsExec.dll
+nsis.nsisdl.dll=${nsis.home}/Plugins/${nsis.arch.dir}NSISdl.dll
+nsis.system.dll=${nsis.home}/Plugins/${nsis.arch.dir}System.dll
+nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -



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

svn commit: r1786124 - /tomcat/trunk/build.properties.default

[markt]

Author: markt
Date: Thu Mar  9 10:07:19 2017
New Revision: 1786124

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

Modified:
tomcat/trunk/build.properties.default

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1786124=1786123=1786124=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar  9 10:07:19 2017
@@ -140,7 +140,7 @@ nsis.installoptions.dll=${nsis.home}/Plu
 nsis.nsexec.dll=${nsis.home}/Plugins/x86-unicode/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/x86-unicode/NSISdl.dll
 nsis.system.dll=${nsis.home}/Plugins/x86-unicode/System.dll
-nsis.nsdialogs.dll=${nsis.home}/Plugins/x86-unicode/nsDialogs.dll.dll
+nsis.nsdialogs.dll=${nsis.home}/Plugins/x86-unicode/nsDialogs.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -



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

svn commit: r1786123 - in /tomcat/trunk: build.properties.default build.xml res/tomcat.nsi

[markt]

Author: markt
Date: Thu Mar  9 10:04:23 2017
New Revision: 1786123

URL: http://svn.apache.org/viewvc?rev=1786123=rev
Log:
First attempt at re-working NSIS so the installer builds on Windows and Linux 
with 2.x and 3.x NSIS binaries (and appropriate properties)

Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1786123=1786122=1786123=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Mar  9 10:04:23 2017
@@ -139,6 +139,8 @@ nsis.exe=${nsis.home}/makensis.exe
 nsis.installoptions.dll=${nsis.home}/Plugins/x86-unicode/InstallOptions.dll
 nsis.nsexec.dll=${nsis.home}/Plugins/x86-unicode/nsExec.dll
 nsis.nsisdl.dll=${nsis.home}/Plugins/x86-unicode/NSISdl.dll
+nsis.system.dll=${nsis.home}/Plugins/x86-unicode/System.dll
+nsis.nsdialogs.dll=${nsis.home}/Plugins/x86-unicode/nsDialogs.dll.dll
 nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
 
 # - Commons Daemon, version 1.0-Alpha or later -

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1786123=1786122=1786123=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Mar  9 10:04:23 2017
@@ -2012,6 +2012,8 @@ skip.installer property in build.propert
 
 
 
+
+
 
   
 

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1786123=1786122=1786123=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Mar  9 10:04:23 2017
@@ -157,8 +157,8 @@ Var ServiceInstallLog
   InstType Minimum
   InstType Full
 
-  ReserveFile "${NSISDIR}\Plugins\x86-unicode\System.dll"
-  ReserveFile "${NSISDIR}\Plugins\x86-unicode\nsDialogs.dll"
+  ReserveFile System.dll
+  ReserveFile nsDialogs.dll
   ReserveFile confinstall\tomcat-users_1.xml
   ReserveFile confinstall\tomcat-users_2.xml
 



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