[GitHub] [tomcat] zzk0 opened a new pull request #396: update Servlet version in ServletContext.java

2020-12-21 Thread GitBox


zzk0 opened a new pull request #396:
URL: https://github.com/apache/tomcat/pull/396


   I am reading the Servlet spec and I found a number mismatched.
   
   What I have changed:
   
   - Update a number from 4 to 5
   
   
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



[tomcat] branch master updated: update Javadoc return value for ServletContext#getMajorVersion()

2020-12-21 Thread mgrigorov
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 538fb42  update Javadoc return value for 
ServletContext#getMajorVersion()
538fb42 is described below

commit 538fb427d32d574006372a319c276adac873006e
Author: zzk0 <30856589+z...@users.noreply.github.com>
AuthorDate: Mon Dec 21 17:51:40 2020 +0800

update Javadoc return value for ServletContext#getMajorVersion()
---
 java/jakarta/servlet/ServletContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 82427ca..38dd583 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -95,7 +95,7 @@ public interface ServletContext {
  * container supports. All implementations that comply with Version 5.0 
must
  * have this method return the integer 5.
  *
- * @return 4
+ * @return 5
  */
 public int getMajorVersion();
 


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



[GitHub] [tomcat] martin-g merged pull request #396: update Servlet version in ServletContext.java

2020-12-21 Thread GitBox


martin-g merged pull request #396:
URL: https://github.com/apache/tomcat/pull/396


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



[GitHub] [tomcat] martin-g commented on pull request #396: update Servlet version in ServletContext.java

2020-12-21 Thread GitBox


martin-g commented on pull request #396:
URL: https://github.com/apache/tomcat/pull/396#issuecomment-748882032


   Thank you, @zzk0 !



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



[VOTE][RESULT] Release Apache Tomcat Native 1.2.26

2020-12-21 Thread Mark Thomas
The following votes were cast:

Binding:
+1: isapir, markt, mgrigorov

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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



svn commit: r45037 - /dev/tomcat/tomcat-connectors/native/1.2.26/ /release/tomcat/tomcat-connectors/native/1.2.26/

2020-12-21 Thread markt
Author: markt
Date: Mon Dec 21 12:08:11 2020
New Revision: 45037

Log:
Release Tomcat Native 1.2.26

Added:
release/tomcat/tomcat-connectors/native/1.2.26/
  - copied from r45036, dev/tomcat/tomcat-connectors/native/1.2.26/
Removed:
dev/tomcat/tomcat-connectors/native/1.2.26/


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



svn commit: r1884675 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html news/2020.html

2020-12-21 Thread markt
Author: markt
Date: Mon Dec 21 12:20:50 2020
New Revision: 1884675

URL: http://svn.apache.org/viewvc?rev=1884675&view=rev
Log:
Update docs for Native 1.2.26 release

Modified:
tomcat/site/trunk/docs/native-doc/index.html
tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
tomcat/site/trunk/docs/native-doc/news/2020.html

Modified: tomcat/site/trunk/docs/native-doc/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1884675&r1=1884674&r2=1884675&view=diff
==
--- tomcat/site/trunk/docs/native-doc/index.html (original)
+++ tomcat/site/trunk/docs/native-doc/index.html Mon Dec 21 12:20:50 2020
@@ -22,15 +22,16 @@
 Non-blocking I/O for Keep-Alive requests (between requests)
 Uses OpenSSL for TLS/SSL capabilities (if supported by linked APR 
library)
 FIPS 140-2 support for TLS/SSL (if supported by linked OpenSSL 
library)
+Support for IPv4, IPv6 and Unix Domain Sockets
   
 
 Headlines
 
 
-3 Sep 2020 - TC-Native-1.2.25
+21 Dec 2020 - TC-Native-1.2.26
 released
 The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.25 Stable.
+Tomcat Native 1.2.26 Stable.
 
 The sources and the binaries for selected platforms are available from the
 Download page.
@@ -133,6 +134,14 @@ list of changes.
 
   Please see the Apache Tomcat documentation for configuration specifics.
 
+
+
+  When using Unix Domain Sockets a cleanup is registered to delete the
+  socket on destruction of the socket, or shutdown of the application.
+  Should the application terminate abnormally, the socket deletion will
+  need to be handled by the caller or by the administrator.
+
+
   
 
 UNIX
@@ -145,11 +154,11 @@ export LD_LIBRARY_PATH
Start tomcat and check for the messages like this ones:
   
-   Feb 8, 2015 12:27:41 PM 
org.apache.catalina.core.AprLifecycleListener init
+   Nov 29, 2020 12:27:41 PM 
org.apache.catalina.core.AprLifecycleListener init
 INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
-Feb 8, 2015 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
-INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true].
-Feb 8, 2015 12:27:41 PM org.apache.coyote.http11.Http11AprProtocol init
+Nov 29, 2020 12:27:41 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: APR capabilities: IPv6 [true], sendfile [true], accept filters [false], 
random [true], UDS [true].
+Nov 29, 2020 12:27:41 PM org.apache.coyote.http11.Http11AprProtocol init
 INFO: Initializing Coyote HTTP/1.1 on http-8080
 
   
@@ -170,11 +179,11 @@ INFO: Initializing Coyote HTTP/1.1 on ht
   
 Start tomcat and check for the messages like this ones:
   
-  Feb 8, 2015 2:48:17 PM 
org.apache.catalina.core.AprLifecycleListener init
+  Nov 29, 2020 2:48:17 PM 
org.apache.catalina.core.AprLifecycleListener init
 INFO: Loaded APR based Apache Tomcat Native library 1.x.y.
-Feb 8, 2015 2:48:17 PM org.apache.catalina.core.AprLifecycleListener init
-INFO: APR capabilities: IPv6 [false], sendfile [true], accept filters [false], 
random [true].
-Feb 8, 2015 2:48:18 PM org.apache.coyote.http11.Http11AprProtocol init
+Nov 29, 2020 2:48:17 PM org.apache.catalina.core.AprLifecycleListener init
+INFO: APR capabilities: IPv6 [false], sendfile [true], accept filters [false], 
random [true], UDS [false].
+Nov 29, 2020 2:48:18 PM org.apache.coyote.http11.Http11AprProtocol init
 INFO: Initializing Coyote HTTP/1.1 on http-8080
 
 

Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1884675&r1=1884674&r2=1884675&view=diff
==
--- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original)
+++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Mon Dec 21 
12:20:50 2020
@@ -3,6 +3,18 @@
   
   This is the Changelog for Tomcat Native 1.2.
   
+Changes in 1.2.26
+  
+
+  Enable building to continue against OpenSSL 3.x and 1.1.1. (markt)
+
+
+  http://issues.apache.org/bugzilla/show_bug.cgi?id=64942";>64942: 
Expose support for Unix Domain Sockets in APR v1.6 and up. (minfrin)
+
+
+  Update recommended OpenSSL version to 1.1.1i or later. (markt)
+
+  
 Changes in 1.2.25
   
 

Modified: tomcat/site/trunk/docs/native-doc/news/2020.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2020.html?rev=1884675&r1=1884674&r2=1884675&view=diff
==
--- tomcat/site/trunk/docs/native-doc/news/2020.html (original)
+++ tomcat/site/trunk/docs/native-doc/news/2020.html Mon Dec 21 12:20:50 2020
@@ -1,5 +1,10 @@
 
 The Apache Tomcat Native - News - 2020 News and 
Statu

[tomcat-native] branch master updated: Update to correct release date. Fix missing version update.

2020-12-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
 new 9f984b5  Update to correct release date. Fix missing version update.
9f984b5 is described below

commit 9f984b53b5d63364a0e4dafafa1de3e4ef6c6bff
Author: Mark Thomas 
AuthorDate: Mon Dec 21 12:21:48 2020 +

Update to correct release date. Fix missing version update.
---
 xdocs/index.xml | 2 +-
 xdocs/news/2020.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xdocs/index.xml b/xdocs/index.xml
index 32d0d91..f778e5c 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,7 +60,7 @@
 
 
 
-18 Dec 2020 - TC-Native-1.2.26
+21 Dec 2020 - TC-Native-1.2.26
 released
 The Apache Tomcat team is proud to announce the immediate availability of
 Tomcat Native 1.2.26 Stable.
diff --git a/xdocs/news/2020.xml b/xdocs/news/2020.xml
index cf1ce79..3f96ff0 100644
--- a/xdocs/news/2020.xml
+++ b/xdocs/news/2020.xml
@@ -29,9 +29,9 @@
 
 
 
- 
+ 
   The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.25. This is a bugfix release.
+  Tomcat Native 1.2.26. This is a bugfix release.
   
  
  


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



svn commit: r1884678 - in /tomcat/site/trunk/xdocs: download-native.xml index.xml oldnews.xml

2020-12-21 Thread markt
Author: markt
Date: Mon Dec 21 12:29:18 2020
New Revision: 1884678

URL: http://svn.apache.org/viewvc?rev=1884678&view=rev
Log:
Update site for 1.2.26 release

Modified:
tomcat/site/trunk/xdocs/download-native.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/oldnews.xml

Modified: tomcat/site/trunk/xdocs/download-native.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1884678&r1=1884677&r2=1884678&view=diff
==
--- tomcat/site/trunk/xdocs/download-native.xml (original)
+++ tomcat/site/trunk/xdocs/download-native.xml Mon Dec 21 12:29:18 2020
@@ -50,22 +50,22 @@
   Source (please choose the 
correct format for your platform)
   
 
-  
-Native 1.2.25 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
+  
+Native 1.2.26 Source Release tar.gz (e.g. Unix, Linux, Mac 
OS)
 
   
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-src.tar.gz.asc";>PGP],
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-src.tar.gz.sha512";>SHA512]
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-src.tar.gz.asc";>PGP],
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-src.tar.gz.sha512";>SHA512]
   
 
 
 
-  
-Native 1.2.25 Source Release zip (e.g. Windows)
+  
+Native 1.2.26 Source Release zip (e.g. Windows)
 
   
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-win32-src.zip.asc";>PGP],
-[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/source/tomcat-native-1.2.25-win32-src.zip.sha512";>SHA512]
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-win32-src.zip.asc";>PGP],
+[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/source/tomcat-native-1.2.26-win32-src.zip.sha512";>SHA512]
   
 
 
@@ -74,7 +74,7 @@
 
 You can find binaries release too.
 You may download them from
-  HERE
+  HERE
 
 
   
@@ -92,22 +92,22 @@
 Binaries for Microsoft Windows built with 
OpenSSL 1.1.1c
 
   
-
-  Native 1.2.25 Windows Binaries zip (recommended)
+
+  Native 1.2.26 Windows Binaries zip (recommended)
   
 
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip.asc";>PGP],
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-win32-bin.zip.sha512";>SHA512]
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1g-win32-bin.zip.asc";>PGP],
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1g-win32-bin.zip.sha512";>SHA512]
 
   
   
   
-
-  Native 1.2.25 Windows OCSP-enabled Binaries zip
+
+  Native 1.2.26 Windows OCSP-enabled Binaries zip
   
 
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.asc";>PGP],
-  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.25/binaries/tomcat-native-1.2.25-openssl-1.1.1g-ocsp-win32-bin.zip.sha512";>SHA512]
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1g-ocsp-win32-bin.zip.asc";>PGP],
+  [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.26/binaries/tomcat-native-1.2.26-openssl-1.1.1g-ocsp-win32-bin.zip.sha512";>SHA512]
 
   
   

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1884678&r1=1884677&r2=1884678&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Mon Dec 21 12:29:18 2020
@@ -40,6 +40,21 @@ project logo are trademarks of the Apach
 
 
 
+
+

[VOTE][RESULT] Apache Tomcat migration tool for Jakarta EE 0.1.0

2020-12-21 Thread Mark Thomas
The following votes were cast:

Binding:
+1 remm, ebourg, mgrigorov
0: schultz, isapir

No other votes were cast.

Since this is the first release of this component rather more work that
usual is required to updated the website. I might not get to that until
early January. I'll get the release out to Maven central and to the
mirrors shortly but I'll hold off on the official announcement until the
web site is ready.

Mark

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



svn commit: r45038 - /release/tomcat/jakartaee-migration/

2020-12-21 Thread markt
Author: markt
Date: Mon Dec 21 12:37:20 2020
New Revision: 45038

Log:
Prep for release of new component

Added:
release/tomcat/jakartaee-migration/


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



svn commit: r45039 - /dev/tomcat/jakartaee-migration/v0.1.0/ /release/tomcat/jakartaee-migration/v0.1.0/

2020-12-21 Thread markt
Author: markt
Date: Mon Dec 21 12:38:00 2020
New Revision: 45039

Log:
Release Apache Tomcat migration tool for Jakarta EE 0.1.0

Added:
release/tomcat/jakartaee-migration/v0.1.0/
  - copied from r45038, dev/tomcat/jakartaee-migration/v0.1.0/
Removed:
dev/tomcat/jakartaee-migration/v0.1.0/


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



Re: Replacement for Windows service wrapper (procrun)

2020-12-21 Thread Christopher Schultz

Mladen,

On 12/20/20 09:40, Mladen Turk wrote:

On 19/12/2020 00:16, Christopher Schultz wrote:

Mladen,

On 12/18/20 15:10, Mladen Turk wrote:


It can be used for various deployments.
Apache Tomcat can use catalina.bat directly
for running service ... more details at
https://github.com/mturk/svcbatch/blob/master/docs/examples/apachetomcat.md 




I'd love to get some feedback from folks
that are using Apache Tomcat on Windows platform.


I don't generally use Windows, so I don't have a horse in this race, 
but I'm curious as to the complaints against procrun versus what 
SvcBatch provides. Can you give some examples of problems that 
SvcBatch solves?




The major problem it solves is single point of configuration.
SvcBatch uses catalina.bat to run Tomcat, so there is no
need for additional configuration which Procrun saves in registry.


Gotcha. This is indeed a significant improvement IMO. Being able to more 
easily script things is always good, and working with on-disk config 
files is always easier (again, IMHO).



Also using GUI for configuration is unproductive
when there are many instances that need to be configured,
and particularly for servers versions that do not have GUI.


You can theoretically specify everything from the command-line but if 
you want to change something you essentially have to delete the service 
and re-create it unless you want to use the GUI. The recent addition of 
being able to export the registry-based configuration to a script helps 
significantly, but it's still putting the live config into the registry.



The process for SvcBatch seems to be fairly similar to that of procrun.



Nope. They are quite far apart.


Not really from a novice's perspective (i.e. mine). Perhaps from a 
power-admin's perspective, SvcBatch is more powerful.


-chris

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