Re: [tomcat] branch master updated: Filter out classes streams through class file transformers

[Martin Grigorov]

On Wed, Feb 17, 2021 at 5:49 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> remm 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 6ef6875  Filter out classes streams through class file
> transformers
> 6ef6875 is described below
>
> commit 6ef68752dc43f9d459e0ae23a4a767112ab531b9
> Author: remm 
> AuthorDate: Wed Feb 17 16:46:41 2021 +0100
>
> Filter out classes streams through class file transformers
>
> Make getResourceAsStream go through the ClassFileTransformer(s) for
> .class resources. In a way this is consistent, but the actual reason is
> helping JSP work better [JDT uses that to do its compilation] if
> choosing a very basic runtime Jakarta conversion. I'm not seeing any
> basis for doing it, but it's completely unlikely to break anything
> either.
> ---
>  .../catalina/loader/WebappClassLoaderBase.java | 37
> ++
>  1 file changed, 37 insertions(+)
>
> diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
> b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
> index 2bc07a1..d809c3e 100644
> --- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
> +++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
> @@ -16,6 +16,8 @@
>   */
>  package org.apache.catalina.loader;
>
> +import java.io.ByteArrayInputStream;
> +import java.io.ByteArrayOutputStream;
>  import java.io.File;
>  import java.io.FilePermission;
>  import java.io.IOException;
> @@ -1136,6 +1138,41 @@ public abstract class WebappClassLoaderBase extends
> URLClassLoader
>  WebResource resource = resources.getClassLoaderResource(path);
>  if (resource.exists()) {
>  stream = resource.getInputStream();
> +// Filter out .class resources through the ClassFileTranformer
> +if (name.endsWith(".class") && transformers.size() > 0) {
>

nit: you could use CLASS_FILE_SUFFIX as you did below


> +// If the resource is a class, decorate it with any
> attached transformers
> +ByteArrayOutputStream baos = new ByteArrayOutputStream();
> +byte[] buf = new byte[8192];
> +int numRead;
> +try {
> +while ((numRead = stream.read(buf)) >= 0) {
> +baos.write(buf, 0, numRead);
> +}
> +} catch (IOException e) {
> +
> log.error(sm.getString("webappClassLoader.transformError", name), e);
> +return null;
> +} finally {
> +try {
> +stream.close();
> +} catch (IOException e) {
> +}
> +}
> +byte[] binaryContent = baos.toByteArray();
> +String internalName = path.substring(1, path.length() -
> CLASS_FILE_SUFFIX.length());
> +for (ClassFileTransformer transformer :
> this.transformers) {
> +try {
> +byte[] transformed = transformer.transform(
> +this, internalName, null, null,
> binaryContent);
> +if (transformed != null) {
> +binaryContent = transformed;
> +}
> +} catch (IllegalClassFormatException e) {
> +
> log.error(sm.getString("webappClassLoader.transformError", name), e);
> +return null;
> +}
> +}
> +stream = new ByteArrayInputStream(binaryContent);
> +}
>  trackLastModified(path, resource);
>  }
>  try {
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch master updated: Use available constant

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 16d4beb  Use available constant
16d4beb is described below

commit 16d4bebe84550bfd934895796aad780b7a6a0241
Author: remm 
AuthorDate: Thu Feb 18 09:56:42 2021 +0100

Use available constant
---
 java/org/apache/catalina/loader/WebappClassLoaderBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java 
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index d809c3e..ffd9f25 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -1139,7 +1139,7 @@ public abstract class WebappClassLoaderBase extends 
URLClassLoader
 if (resource.exists()) {
 stream = resource.getInputStream();
 // Filter out .class resources through the ClassFileTranformer
-if (name.endsWith(".class") && transformers.size() > 0) {
+if (name.endsWith(CLASS_FILE_SUFFIX) && transformers.size() > 0) {
 // If the resource is a class, decorate it with any attached 
transformers
 ByteArrayOutputStream baos = new ByteArrayOutputStream();
 byte[] buf = new byte[8192];


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

Re: [tomcat] branch master updated: Renew all the server test certs

[Mark Thomas]

On 17/02/2021 21:58, Christopher Schultz wrote:



>> Yeah, creation on demand would be nice but it currently requires OpenSSL
>> which isn't guaranteed to be available.
> 
> Why not keytool or a "simple" Java driver to do the same?
> 
>> The entropy issue is a larger concern.
> 
> Yup. Unless we can convince the system to use /dev/urandom for key
> generation, which is something we *always* recommend against, and for
> good reason.
> 
> If we write our own cert-creator, perhaps we can rig it to use an awful
> source of entropy so it's nice and fast.

As is pretty much always the case, someone else has made the point I'd
like to make in response and far more eloquently than I ever could:

https://xkcd.com/1205/

The only thing I'd like to add is that generating new certs on the fly
every time is going require compute time/energy on every test run.

Mark

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

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

[Mark Thomas]

The following votes were cast:

Binding:
+1: markt, remm, mgrigorov

Non-binding:
+1: rmannibucau, (alitokmen implied via GitHub comment)

The vote therefore passes.

Thank you 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: r46178 - /dev/tomcat/jakartaee-migration/v0.2.0/ /release/tomcat/jakartaee-migration/v0.2.0/

[markt]

Author: markt
Date: Thu Feb 18 09:29:11 2021
New Revision: 46178

Log:
Release the Apache Tomcat migration tool for Jakarta EE 0.2.0

Added:
release/tomcat/jakartaee-migration/v0.2.0/
  - copied from r46177, dev/tomcat/jakartaee-migration/v0.2.0/
Removed:
dev/tomcat/jakartaee-migration/v0.2.0/


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

[Bug 65137] Invalid chunk encoding in the tomcat answer

[bugzilla]

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

--- Comment #1 from Mark Thomas  ---
Can you confirm which HTTP connector you used for this test. I am going to
assume NIO (the default) but confirmation would be helpful.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 65118] Spurious null pointer exception in Http2UpgradeHandler when reloading web page

[bugzilla]

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

--- Comment #4 from Mark Thomas  ---
That patch looks to be tackling the symptom rather than the root cause. My
concern is that the root cause may trigger other errors.

What would really help here is a test case (ideally a simple WAR) that
demonstrates the issue.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 65118] Spurious null pointer exception in Http2UpgradeHandler when reloading web page

[bugzilla]

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

--- Comment #5 from Mattias  ---
(In reply to Mark Thomas from comment #4)
> That patch looks to be tackling the symptom rather than the root cause. My
> concern is that the root cause may trigger other errors.
> 
> What would really help here is a test case (ideally a simple WAR) that
> demonstrates the issue.

I understand. I will try to create a test case that you can use.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 65137] Invalid chunk encoding in the tomcat answer

[bugzilla]

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

--- Comment #2 from barm...@adobe.com ---
Hi,

Thanks for the answer.

I use the Nio connector (and I can reproduce on tomcat 7 with the nio connector
too). I can reproduce on tomcat 8.5 with the apr and the nio2 connector too.

I did have time to investigate a little: it seems that the timeout detection in
NioBlockingSelector.write() is quite unreliable. MBs of data will be written on
the socket initially, after some point, the code may have to wait more than 20s
to write 8192 bytes (default chunk size), we will get a timeout even if the
socket has still its buffer quite full and data are still be sent

What I have tried:
1 - increase the timeout. It works but the timeout is used for other things and
it does not seem a very good idea to change it.

2 - reduce socket.txBufSize to 8191, it forces smaller writes in
NioBlockingSelector.write(), time is updated more often, the timeout does not
trigger.

It seems to work correctly on debian 10 (openjdk 11).

However:
- this has no effect on openjdk 8 (debian 9; MBs of data are still accepted by
the socket even if the SO_SNDBUF is under 8192bytes).
- there is performance degradation (around 10% for 100MB reply).

3 - I have tried to tweak the code so that it wait a little more before writing
data to the socket:
keycount is initially set to 0 (instead of 1)
I replaced the following code:
if (cnt > 0) {
  time = System.currentTimeMillis(); //reset our timeout timer
  continue; //we successfully wrote, try again without a selector
}
by
if (cnt > 0) {
  if (!buf.hasRemaining())
break;
  time = System.currentTimeMillis(); //reset our timeout timer
}
(the continue has been removed)

The behavior is quite the same as 2/: it works on openjdk11 but not on
openjdk8. I did not test the perf (I would bet it is less than 10%).

Regards.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 65137] Invalid chunk encoding in the tomcat answer

[bugzilla]

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

--- Comment #3 from Remy Maucherat  ---
Got it. In the case of NIO2, I'm afraid it is expected known behavior however.
Increase the timeout or reduce the buffer (which is what you are doing).

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

[tomcat] branch master updated: Ensure ReadListener.onError() is fired if client drops the connection

[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.git


The following commit(s) were added to refs/heads/master by this push:
 new 86ccc43  Ensure ReadListener.onError() is fired if client drops the 
connection
86ccc43 is described below

commit 86ccc43940861703c2be96a5f35384407522125a
Author: Mark Thomas 
AuthorDate: Thu Feb 18 16:41:57 2021 +

Ensure ReadListener.onError() is fired if client drops the connection
---
 .../apache/coyote/http11/Http11InputBuffer.java|  34 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java | 170 +-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 192 +
 webapps/docs/changelog.xml |   6 +
 4 files changed, 388 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java 
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index c12df8a..e3ace89 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -761,11 +761,13 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
 private boolean fill(boolean block) throws IOException {
 
 if (log.isDebugEnabled()) {
-log.debug("Before fill(): [" + parsingHeader +
+log.debug("Before fill(): parsingHeader: [" + parsingHeader +
 "], parsingRequestLine: [" + parsingRequestLine +
 "], parsingRequestLinePhase: [" + parsingRequestLinePhase +
 "], parsingRequestLineStart: [" + parsingRequestLineStart +
-"], byteBuffer.position() [" + byteBuffer.position() + 
"]");
+"], byteBuffer.position(): [" + byteBuffer.position() +
+"], byteBuffer.limit(): [" + byteBuffer.limit() +
+"], end: [" + end + "]");
 }
 
 if (parsingHeader) {
@@ -780,19 +782,25 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
 byteBuffer.limit(end).position(end);
 }
 
-byteBuffer.mark();
-if (byteBuffer.position() < byteBuffer.limit()) {
-byteBuffer.position(byteBuffer.limit());
-}
-byteBuffer.limit(byteBuffer.capacity());
-SocketWrapperBase socketWrapper = this.wrapper;
 int nRead = -1;
-if (socketWrapper != null) {
-nRead = socketWrapper.read(block, byteBuffer);
-} else {
-throw new CloseNowException(sm.getString("iib.eof.error"));
+byteBuffer.mark();
+try {
+if (byteBuffer.position() < byteBuffer.limit()) {
+byteBuffer.position(byteBuffer.limit());
+}
+byteBuffer.limit(byteBuffer.capacity());
+SocketWrapperBase socketWrapper = this.wrapper;
+if (socketWrapper != null) {
+nRead = socketWrapper.read(block, byteBuffer);
+} else {
+throw new CloseNowException(sm.getString("iib.eof.error"));
+}
+} finally {
+// Ensure that the buffer limit and position are returned to a
+// consistent "ready for read" state if an error occurs during in
+// the above code block.
+byteBuffer.limit(byteBuffer.position()).reset();
 }
-byteBuffer.limit(byteBuffer.position()).reset();
 
 if (log.isDebugEnabled()) {
 log.debug("Received ["
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index c8607e7..e242917 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -17,6 +17,7 @@
 package org.apache.catalina.core;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -866,7 +867,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 }
 }
 
-private static class TrackingListener implements AsyncListener {
+public static class TrackingListener implements AsyncListener {
 
 private final boolean completeOnError;
 private final boolean completeOnTimeout;
@@ -3016,4 +3017,171 @@ public class TestAsyncContextImpl extends 
TomcatBaseTest {
 }
 }
 
+
+/*
+ * Tests an error on an async thread when the client closes the connection
+ * before fully writing the request body.
+ *
+ * Required sequence is:
+ * - enter Servlet's service() method
+ * - startAsync()
+ * - start async thread
+ * - read partial body
+ * - close client connection
+ * - read on async thread -> I/O error
+ * - exit Servlet's service() method
+ *
+ * This test makes exten

[tomcat] branch 9.0.x updated: Ensure ReadListener.onError() is fired if client drops the connection

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ce4b154  Ensure ReadListener.onError() is fired if client drops the 
connection
ce4b154 is described below

commit ce4b154e7b48f66bd98858626347747cd2514311
Author: Mark Thomas 
AuthorDate: Thu Feb 18 16:41:57 2021 +

Ensure ReadListener.onError() is fired if client drops the connection
---
 .../apache/coyote/http11/Http11InputBuffer.java|  34 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java | 170 +-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 192 +
 webapps/docs/changelog.xml |   6 +
 4 files changed, 388 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java 
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index 483b08e..fb3dadf 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -761,11 +761,13 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
 private boolean fill(boolean block) throws IOException {
 
 if (log.isDebugEnabled()) {
-log.debug("Before fill(): [" + parsingHeader +
+log.debug("Before fill(): parsingHeader: [" + parsingHeader +
 "], parsingRequestLine: [" + parsingRequestLine +
 "], parsingRequestLinePhase: [" + parsingRequestLinePhase +
 "], parsingRequestLineStart: [" + parsingRequestLineStart +
-"], byteBuffer.position() [" + byteBuffer.position() + 
"]");
+"], byteBuffer.position(): [" + byteBuffer.position() +
+"], byteBuffer.limit(): [" + byteBuffer.limit() +
+"], end: [" + end + "]");
 }
 
 if (parsingHeader) {
@@ -780,19 +782,25 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
 byteBuffer.limit(end).position(end);
 }
 
-byteBuffer.mark();
-if (byteBuffer.position() < byteBuffer.limit()) {
-byteBuffer.position(byteBuffer.limit());
-}
-byteBuffer.limit(byteBuffer.capacity());
-SocketWrapperBase socketWrapper = this.wrapper;
 int nRead = -1;
-if (socketWrapper != null) {
-nRead = socketWrapper.read(block, byteBuffer);
-} else {
-throw new CloseNowException(sm.getString("iib.eof.error"));
+byteBuffer.mark();
+try {
+if (byteBuffer.position() < byteBuffer.limit()) {
+byteBuffer.position(byteBuffer.limit());
+}
+byteBuffer.limit(byteBuffer.capacity());
+SocketWrapperBase socketWrapper = this.wrapper;
+if (socketWrapper != null) {
+nRead = socketWrapper.read(block, byteBuffer);
+} else {
+throw new CloseNowException(sm.getString("iib.eof.error"));
+}
+} finally {
+// Ensure that the buffer limit and position are returned to a
+// consistent "ready for read" state if an error occurs during in
+// the above code block.
+byteBuffer.limit(byteBuffer.position()).reset();
 }
-byteBuffer.limit(byteBuffer.position()).reset();
 
 if (log.isDebugEnabled()) {
 log.debug("Received ["
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 7081d9e..761bf49 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -17,6 +17,7 @@
 package org.apache.catalina.core;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -866,7 +867,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 }
 }
 
-private static class TrackingListener implements AsyncListener {
+public static class TrackingListener implements AsyncListener {
 
 private final boolean completeOnError;
 private final boolean completeOnTimeout;
@@ -3016,4 +3017,171 @@ public class TestAsyncContextImpl extends 
TomcatBaseTest {
 }
 }
 
+
+/*
+ * Tests an error on an async thread when the client closes the connection
+ * before fully writing the request body.
+ *
+ * Required sequence is:
+ * - enter Servlet's service() method
+ * - startAsync()
+ * - start async thread
+ * - read partial body
+ * - close client connection
+ * - read on async thread -> I/O error
+ * - exit Servlet's service() method
+ *
+ * This test makes extensi

[tomcat] branch 8.5.x updated: Ensure ReadListener.onError() is fired if client drops the connection

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 9b44626  Ensure ReadListener.onError() is fired if client drops the 
connection
9b44626 is described below

commit 9b44626e136c89a107dd4458ad4bde6123359fd6
Author: Mark Thomas 
AuthorDate: Thu Feb 18 16:41:57 2021 +

Ensure ReadListener.onError() is fired if client drops the connection
---
 .../apache/coyote/http11/Http11InputBuffer.java|  23 ++-
 .../apache/catalina/core/TestAsyncContextImpl.java | 170 +-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 192 +
 webapps/docs/changelog.xml |   6 +
 4 files changed, 383 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java 
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index 3fe2b2b..d32d6ff 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -765,11 +765,13 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
 private boolean fill(boolean block) throws IOException {
 
 if (log.isDebugEnabled()) {
-log.debug("Before fill(): [" + parsingHeader +
+log.debug("Before fill(): parsingHeader: [" + parsingHeader +
 "], parsingRequestLine: [" + parsingRequestLine +
 "], parsingRequestLinePhase: [" + parsingRequestLinePhase +
 "], parsingRequestLineStart: [" + parsingRequestLineStart +
-"], byteBuffer.position() [" + byteBuffer.position() + 
"]");
+"], byteBuffer.position(): [" + byteBuffer.position() +
+"], byteBuffer.limit(): [" + byteBuffer.limit() +
+"], end: [" + end + "]");
 }
 
 if (parsingHeader) {
@@ -784,13 +786,20 @@ public class Http11InputBuffer implements InputBuffer, 
ApplicationBufferHandler
 byteBuffer.limit(end).position(end);
 }
 
+int nRead = -1;
 byteBuffer.mark();
-if (byteBuffer.position() < byteBuffer.limit()) {
-byteBuffer.position(byteBuffer.limit());
+try {
+if (byteBuffer.position() < byteBuffer.limit()) {
+byteBuffer.position(byteBuffer.limit());
+}
+byteBuffer.limit(byteBuffer.capacity());
+nRead = wrapper.read(block, byteBuffer);
+} finally {
+// Ensure that the buffer limit and position are returned to a
+// consistent "ready for read" state if an error occurs during in
+// the above code block.
+byteBuffer.limit(byteBuffer.position()).reset();
 }
-byteBuffer.limit(byteBuffer.capacity());
-int nRead = wrapper.read(block, byteBuffer);
-byteBuffer.limit(byteBuffer.position()).reset();
 
 if (log.isDebugEnabled()) {
 log.debug("Received ["
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 6128a96..6650d3c 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -17,6 +17,7 @@
 package org.apache.catalina.core;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -866,7 +867,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
 }
 }
 
-private static class TrackingListener implements AsyncListener {
+public static class TrackingListener implements AsyncListener {
 
 private final boolean completeOnError;
 private final boolean completeOnTimeout;
@@ -3016,4 +3017,171 @@ public class TestAsyncContextImpl extends 
TomcatBaseTest {
 }
 }
 
+
+/*
+ * Tests an error on an async thread when the client closes the connection
+ * before fully writing the request body.
+ *
+ * Required sequence is:
+ * - enter Servlet's service() method
+ * - startAsync()
+ * - start async thread
+ * - read partial body
+ * - close client connection
+ * - read on async thread -> I/O error
+ * - exit Servlet's service() method
+ *
+ * This test makes extensive use of instance fields in the Servlet that
+ * would normally be considered very poor practice. It is only safe in this
+ * test as the Servlet only processes a single request.
+ */
+@Test
+public void testCanceledPost() throws Exception {
+CountDownLatch partialReadLatch = new CountDownLatch(1);
+CountDownLatch clientCloseLatch = new CountDownLatch(1);
+CountDownLatch threadCompleteLatch = new CountDownLatch(

[tomcat] branch master updated: Expand test cases. Remove debug logging.

[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.git


The following commit(s) were added to refs/heads/master by this push:
 new a969108  Expand test cases. Remove debug logging.
a969108 is described below

commit a9691087718618262b19e4cf44581466a138d724
Author: Mark Thomas 
AuthorDate: Thu Feb 18 19:01:30 2021 +

Expand test cases. Remove debug logging.
---
 .../apache/catalina/core/TestAsyncContextImpl.java | 35 ++-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 40 +++---
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index e242917..a650ea7 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -3018,6 +3018,31 @@ public class TestAsyncContextImpl extends TomcatBaseTest 
{
 }
 
 
+@Test
+public void testCanceledPostChunked() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Transfer-Encoding: Chunked" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"10" + SimpleHttpClient.CRLF +
+"This is 16 bytes" + SimpleHttpClient.CRLF
+});
+}
+
+
+@Test
+public void testCanceledPostNoChunking() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Content-Length: 100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"This is 16 bytes"
+});
+}
+
+
 /*
  * Tests an error on an async thread when the client closes the connection
  * before fully writing the request body.
@@ -3035,8 +3060,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
  * would normally be considered very poor practice. It is only safe in this
  * test as the Servlet only processes a single request.
  */
-@Test
-public void testCanceledPost() throws Exception {
+private void doTestCanceledPost(String[] request) throws Exception {
 CountDownLatch partialReadLatch = new CountDownLatch(1);
 CountDownLatch clientCloseLatch = new CountDownLatch(1);
 CountDownLatch threadCompleteLatch = new CountDownLatch(1);
@@ -3058,12 +3082,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest 
{
 
 PostClient client = new PostClient();
 client.setPort(getPort());
-client.setRequest(new String[] { "POST / HTTP/1.1" + 
SimpleHttpClient.CRLF +
- "Host: localhost:" + 
SimpleHttpClient.CRLF +
- "Content-Length: 100" + 
SimpleHttpClient.CRLF +
- SimpleHttpClient.CRLF +
- "This is 16 bytes"
- });
+client.setRequest(request);
 client.connect();
 client.sendRequest();
 
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 0578b5f..6bb20ee 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -34,8 +34,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
 
 import javax.net.SocketFactory;
 
@@ -1122,6 +1120,31 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 }
 
 
+@Test
+public void testCanceledPostChunked() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Transfer-Encoding: Chunked" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"10" + SimpleHttpClient.CRLF +
+"This is 16 bytes" + SimpleHttpClient.CRLF
+});
+}
+
+
+@Test
+public void testCanceledPostNoChunking() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Content-Length: 100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"This is 16 bytes"
+});
+ 

[tomcat] branch 9.0.x updated: Expand test cases. Remove debug logging.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new b3559ca  Expand test cases. Remove debug logging.
b3559ca is described below

commit b3559ca81359ca0526ebe78b9277301e745c5307
Author: Mark Thomas 
AuthorDate: Thu Feb 18 19:01:30 2021 +

Expand test cases. Remove debug logging.
---
 .../apache/catalina/core/TestAsyncContextImpl.java | 35 ++-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 40 +++---
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 761bf49..e1672d3 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -3018,6 +3018,31 @@ public class TestAsyncContextImpl extends TomcatBaseTest 
{
 }
 
 
+@Test
+public void testCanceledPostChunked() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Transfer-Encoding: Chunked" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"10" + SimpleHttpClient.CRLF +
+"This is 16 bytes" + SimpleHttpClient.CRLF
+});
+}
+
+
+@Test
+public void testCanceledPostNoChunking() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Content-Length: 100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"This is 16 bytes"
+});
+}
+
+
 /*
  * Tests an error on an async thread when the client closes the connection
  * before fully writing the request body.
@@ -3035,8 +3060,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
  * would normally be considered very poor practice. It is only safe in this
  * test as the Servlet only processes a single request.
  */
-@Test
-public void testCanceledPost() throws Exception {
+private void doTestCanceledPost(String[] request) throws Exception {
 CountDownLatch partialReadLatch = new CountDownLatch(1);
 CountDownLatch clientCloseLatch = new CountDownLatch(1);
 CountDownLatch threadCompleteLatch = new CountDownLatch(1);
@@ -3058,12 +3082,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest 
{
 
 PostClient client = new PostClient();
 client.setPort(getPort());
-client.setRequest(new String[] { "POST / HTTP/1.1" + 
SimpleHttpClient.CRLF +
- "Host: localhost:" + 
SimpleHttpClient.CRLF +
- "Content-Length: 100" + 
SimpleHttpClient.CRLF +
- SimpleHttpClient.CRLF +
- "This is 16 bytes"
- });
+client.setRequest(request);
 client.connect();
 client.sendRequest();
 
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 64d6397..6a6d478 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -34,8 +34,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
 
 import javax.net.SocketFactory;
 import javax.servlet.AsyncContext;
@@ -1121,6 +1119,31 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 }
 
 
+@Test
+public void testCanceledPostChunked() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Transfer-Encoding: Chunked" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"10" + SimpleHttpClient.CRLF +
+"This is 16 bytes" + SimpleHttpClient.CRLF
+});
+}
+
+
+@Test
+public void testCanceledPostNoChunking() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Content-Length: 100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"This is 1

[tomcat] branch 8.5.x updated: Expand test cases. Remove debug logging.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new d31a193  Expand test cases. Remove debug logging.
d31a193 is described below

commit d31a193827b90c91c9d728a733c1a447b0647b12
Author: Mark Thomas 
AuthorDate: Thu Feb 18 19:01:30 2021 +

Expand test cases. Remove debug logging.
---
 .../apache/catalina/core/TestAsyncContextImpl.java | 35 ++-
 .../catalina/nonblocking/TestNonBlockingAPI.java   | 40 +++---
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java 
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 6650d3c..3790d00 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -3018,6 +3018,31 @@ public class TestAsyncContextImpl extends TomcatBaseTest 
{
 }
 
 
+@Test
+public void testCanceledPostChunked() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Transfer-Encoding: Chunked" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"10" + SimpleHttpClient.CRLF +
+"This is 16 bytes" + SimpleHttpClient.CRLF
+});
+}
+
+
+@Test
+public void testCanceledPostNoChunking() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Content-Length: 100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"This is 16 bytes"
+});
+}
+
+
 /*
  * Tests an error on an async thread when the client closes the connection
  * before fully writing the request body.
@@ -3035,8 +3060,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest {
  * would normally be considered very poor practice. It is only safe in this
  * test as the Servlet only processes a single request.
  */
-@Test
-public void testCanceledPost() throws Exception {
+private void doTestCanceledPost(String[] request) throws Exception {
 CountDownLatch partialReadLatch = new CountDownLatch(1);
 CountDownLatch clientCloseLatch = new CountDownLatch(1);
 CountDownLatch threadCompleteLatch = new CountDownLatch(1);
@@ -3058,12 +3082,7 @@ public class TestAsyncContextImpl extends TomcatBaseTest 
{
 
 PostClient client = new PostClient();
 client.setPort(getPort());
-client.setRequest(new String[] { "POST / HTTP/1.1" + 
SimpleHttpClient.CRLF +
- "Host: localhost:" + 
SimpleHttpClient.CRLF +
- "Content-Length: 100" + 
SimpleHttpClient.CRLF +
- SimpleHttpClient.CRLF +
- "This is 16 bytes"
- });
+client.setRequest(request);
 client.connect();
 client.sendRequest();
 
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index ccdc085..dc0fd04 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -34,8 +34,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
 
 import javax.net.SocketFactory;
 import javax.servlet.AsyncContext;
@@ -1125,6 +1123,31 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 }
 
 
+@Test
+public void testCanceledPostChunked() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Transfer-Encoding: Chunked" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"10" + SimpleHttpClient.CRLF +
+"This is 16 bytes" + SimpleHttpClient.CRLF
+});
+}
+
+
+@Test
+public void testCanceledPostNoChunking() throws Exception {
+doTestCanceledPost(new String[] {
+"POST / HTTP/1.1" + SimpleHttpClient.CRLF +
+"Host: localhost:" + SimpleHttpClient.CRLF +
+"Content-Length: 100" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF +
+"This is 1

svn commit: r1886673 - in /tomcat/site/trunk: docs/download-migration.html xdocs/download-migration.xml

[markt]

Author: markt
Date: Thu Feb 18 19:06:40 2021
New Revision: 1886673

URL: http://svn.apache.org/viewvc?rev=1886673&view=rev
Log:
Update (currently unlinked) download page

Modified:
tomcat/site/trunk/docs/download-migration.html
tomcat/site/trunk/xdocs/download-migration.xml

Modified: tomcat/site/trunk/docs/download-migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-migration.html?rev=1886673&r1=1886672&r2=1886673&view=diff
==
--- tomcat/site/trunk/docs/download-migration.html (original)
+++ tomcat/site/trunk/docs/download-migration.html Thu Feb 18 19:06:40 2021
@@ -9,7 +9,7 @@
 
   Quick Navigation
 
-[define v]0.1.0[end]
+[define v]0.2.0[end]
 https://downloads.apache.org/tomcat/jakartaee-migration/KEYS";>KEYS |
 [v] |
 Browse |
@@ -59,6 +59,11 @@
   (https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-bin.tar.gz.asc";>pgp,
 
   https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-bin.tar.gz.sha512";>sha512)
 
+
+  shaded jar 
+  (https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-shaded.jar.asc";>pgp,
 
+  https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-shaded.jar.sha512";>sha512)
+
   
   
   

Modified: tomcat/site/trunk/xdocs/download-migration.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-migration.xml?rev=1886673&r1=1886672&r2=1886673&view=diff
==
--- tomcat/site/trunk/xdocs/download-migration.xml (original)
+++ tomcat/site/trunk/xdocs/download-migration.xml Thu Feb 18 19:06:40 2021
@@ -19,7 +19,7 @@
  Define variable to hold the current version number.
  Documentation for ezt.py: https://code.google.com/p/ezt/wiki/Syntax
 -->
-[define v]0.1.0[end]
+[define v]0.2.0[end]
 https://downloads.apache.org/tomcat/jakartaee-migration/KEYS";>KEYS |
 [v] |
 Browse |
@@ -80,6 +80,11 @@
   (https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-bin.tar.gz.asc";>pgp,
 
   https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-bin.tar.gz.sha512";>sha512)
 
+
+  shaded jar 
+  (https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-shaded.jar.asc";>pgp,
 
+  https://downloads.apache.org/tomcat/jakartaee-migration/v[v]/binaries/jakartaee-migration-[v]-shaded.jar.sha512";>sha512)
+
   
   
   



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

svn commit: r1886674 [1/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Author: markt
Date: Thu Feb 18 19:15:50 2021
New Revision: 1886674

URL: http://svn.apache.org/viewvc?rev=1886674&view=rev
Log:
Add link for migration tool downloads

Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/conference.html
tomcat/site/trunk/docs/contact.html
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/download-70.html
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/download-90.html
tomcat/site/trunk/docs/download-connectors.html
tomcat/site/trunk/docs/download-migration.html
tomcat/site/trunk/docs/download-native.html
tomcat/site/trunk/docs/download-taglibs.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/docs/heritage.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/irc.html
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/docs/maven-plugin.html
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/docs/migration-6.html
tomcat/site/trunk/docs/migration-7.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/docs/oldnews-2010.html
tomcat/site/trunk/docs/oldnews-2011.html
tomcat/site/trunk/docs/oldnews-2012.html
tomcat/site/trunk/docs/oldnews-2013.html
tomcat/site/trunk/docs/oldnews-2014.html
tomcat/site/trunk/docs/oldnews-2015.html
tomcat/site/trunk/docs/oldnews-2016.html
tomcat/site/trunk/docs/oldnews-2017.html
tomcat/site/trunk/docs/oldnews-2018.html
tomcat/site/trunk/docs/oldnews-2019.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/docs/resources.html
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-3.html
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/docs/security-impact.html
tomcat/site/trunk/docs/security-jk.html
tomcat/site/trunk/docs/security-native.html
tomcat/site/trunk/docs/security-taglibs.html
tomcat/site/trunk/docs/security.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/docs/taglibs.html
tomcat/site/trunk/docs/tomcat-55-eol.html
tomcat/site/trunk/docs/tomcat-60-eol.html
tomcat/site/trunk/docs/tomcat-70-eol.html
tomcat/site/trunk/docs/tomcat-80-eol.html
tomcat/site/trunk/docs/tools.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/docs/whoweare.html
tomcat/site/trunk/xdocs/migration-10.xml
tomcat/site/trunk/xdocs/stylesheets/project.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Reporting Bugshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache
 .org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.

svn commit: r1886674 [7/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/security.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Reporting Security 
Problemshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentSecurity Updates
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentSecurity Updates
 
 Please note that, except in rare circumstances, binary patches are not
produced for individual vulnerabilities. To obtain the binary fix for a

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Repository 
Accesshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" 
class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/ev

svn commit: r1886674 [4/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Migration Guidehttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.
 apache.org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentBefore upgrading or migrating
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentBefore upgrading or migrating
 
 When updating from one major Apache Tomcat version a newer one, please make
 sure that the JVM that is installed on your system supports at least the

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Old news! - 2010http://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www
 .apache.org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-eve

svn commit: r1886674 [3/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/lists.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Mailing Listshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apach
 e.org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTable of Contents
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTable of Contents
 Apache Tomcat Mailing 
Liststomcat-userstomcat-announcetomcat-devtaglibs-user
 Apache Tomcat Mailing 
Lists
 

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Tomcat Maven Pluginhttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www
 .apache.org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 

svn commit: r1886674 [5/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/oldnews-2018.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2018.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2018.html (original)
+++ tomcat/site/trunk/docs/oldnews-2018.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Old news!http://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache
 .org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentOlder news
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentOlder news
 Announcements from previous years can be found here:
 
   year 2020

Modified: tomcat/site/trunk/docs/oldnews-2019.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2019.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/oldnews-2019.html (original)
+++ tomcat/site/trunk/docs/oldnews-2019.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Old news!http://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache
 .org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-  

svn commit: r1886674 [8/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/whoweare.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Who We Arehttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" 
class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentWho We Are
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentWho We Are
 
 The Apache Tomcat Project operates on a meritocracy: the more you do,
 the more responsibility you will obtain. This page lists all of the

Modified: tomcat/site/trunk/xdocs/migration-10.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.xml?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/xdocs/migration-10.xml (original)
+++ tomcat/site/trunk/xdocs/migration-10.xml Thu Feb 18 19:15:50 2021
@@ -39,9 +39,14 @@ of Apache Tomcat.
 JakartaWebSocket 2.0 and Jakarta Authentication 2.0
 https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications.
 
+
 There is a significant breaking change between Tomcat 9.0.x and Tomcat
 10.0.x. The Java package used by the specification APIs has changed from
-javax... to jakarta
+javax... to jakarta It will be necessary
+to recompile web applications against the new APIs. Alterna

svn commit: r1886674 [6/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Apache Tomcat 6 
vulnerabilitieshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apache.org/"; target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTable of Contents
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTable of Contents
 Apache Tomcat 6.x 
vulnerabilitiesFixed in 
Apache Tomcat 6.0.53Fixed 
in Apache Tomcat 6.0.50Fixed in Apache Tomcat 
6.0.48Fixed in Apache 
Tomcat 6.0.47Fixed in 
Apache Tomcat 6.0.45Fixed 
in Apache Tomcat 6.0.44Fixed in Apache Tomcat 
6.0.43Fixed in Apache 
Tomcat 6.0.41Fixed in 
Apache Tomcat 6.0.39Fixed 
in Apache Tomcat 6.0.37Fixed in Apache Tomcat 6.0.
 36Fixed in Apache Tomcat 
6.0.35Fixed in Apache 
Tomcat 6.0.33Fixed in 
Apache Tomcat 6.0.32Fixed 
in Apache Tomcat 6.0.30Fixed in Apache Tomcat 
6.0.28Fixed in Apache 
Tomcat 6.0.24Fixed in 
Apache Tomcat 6.0.20Fixed 
in Apache Tomcat 6.0.18Fixed in Apache Tomcat 
6.0.16Fixed in Apache 
Tomcat 6.0.14Fixed in 
Apache Tomcat 6.0.11Fixed 
in Apache Tomcat 6.0.1
 0Fixed in Apache Tomcat 
6.0.9Fixed in Apache 
Tomcat 6.0.6Not a 
vulnerability in Tomcat
 Apache Tomcat 6.x 
vulnerabilities
 This page lists all security vulnerabilities fixed in released versions

Modified: tomcat/site/trunk/docs/

svn commit: r1886674 [2/8] - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

[markt]

Modified: tomcat/site/trunk/docs/download-migration.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-migration.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/download-migration.html (original)
+++ tomcat/site/trunk/docs/download-migration.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Apache Tomcat Migration Tool for 
Jakarta EE Software Downloadshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png"; class="support-asf" 
alt="Support Apache">http://www.apach
 e.org/" target="_blank" class="pull-left">https://www.google.com/search"; method="get">GOhttps://www.apache.org/events/current-event.html";>https://www.apache.org/events/current-event-234x60.png"; alt="Next ASF 
event">
   Save the date!
-Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>ArchivesDocumentationTomcat 
 10.0Tomcat 
9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource 
codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html";>Support 
ApacheSponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTomcat Migration 
Tool for Jakarta EE Software Downloads
+Apache TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi";>Tomcat 10https://tomcat.apache.org/download-90.cgi";>Tomcat 9https://tomcat.apache.org/download-80.cgi";>Tomcat 8https://tomcat.apache.org/download-70.cgi";>Tomcat 7https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi";>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi";>Taglibshttps://archive.apache.org/dist/tomcat/";>A
 rchivesDocumentationTomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat 7.0Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT";>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg";>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQMailing ListsBug 
Databas
 eIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ";>TranslationsToolsMediahttps://twitter.com/theapachetomcat";>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial";>YouTubehttps://blogs.apache.org/tomcat/";>BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>SwagHeritagehttp://www.apache.org";>Apache HomeResourcesContactLegal<
 /li>https://www.apache.org/foundation/contributing.html";>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html";>Sponsorshiphttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/licenses/";>LicenseContentTomcat Migration 
Tool for Jakarta EE Software Downloads
 Welcome to the Apache Tomcat® Migration tool for Jakarta
 EE software download page. This page provides download links for obtaining
 the latest version of Tomcat Migration Tool for Jakarta EE software, as 
well

Modified: tomcat/site/trunk/docs/download-native.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1886674&r1=1886673&r2=1886674&view=diff
==
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Thu Feb 18 19:15:50 2021
@@ -1,7 +1,7 @@
 
 Apache Tomcat® - Tomcat Native 
Downloadshttp://tomcat.apache.org/";>Apache 
Tomcat®https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left">https://www.apac

svn commit: r1886675 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[markt]

Author: markt
Date: Thu Feb 18 19:21:41 2021
New Revision: 1886675

URL: http://svn.apache.org/viewvc?rev=1886675&view=rev
Log:
Add release information for migration tool 0.2.0

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1886675&r1=1886674&r2=1886675&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Feb 18 19:21:41 2021
@@ -28,6 +28,26 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2021-02-18 Tomcat Migration Tool for Jakarta EE 0.2.0 
Released
+
+The Apache Tomcat Project is proud to announce the release of 0.2.0 of the
+Apache Tomcat Migration Tool for Jakarta EE. This release contains a number of
+bug fixes and improvements compared to version 0.1.0.
+The notable changes in this release are:
+
+Various fixes to the packages that are and are not converted
+A new option to process zip archives in memory to support zip files
+that use options that are incompatible with a streaming approach
+A new option to exclude files from transformation
+
+
+Full details of these changes, and all the other changes, are available in the
+https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md";>changelog.
+
+
+
+https://tomcat.apache.org/download-migration.cgi";>Download
+
 2021-02-05 Tomcat 7.0.108 Released
 
 The Apache Tomcat Project is proud to announce the release of version 7.0.108 
of

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1886675&r1=1886674&r2=1886675&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Thu Feb 18 19:21:41 2021
@@ -40,6 +40,28 @@ project logo are trademarks of the Apach
 
 
 
+
+
+The Apache Tomcat Project is proud to announce the release of 0.2.0 of the
+Apache Tomcat Migration Tool for Jakarta EE. This release contains a number of
+bug fixes and improvements compared to version 0.1.0.
+The notable changes in this release are:
+
+Various fixes to the packages that are and are not converted
+A new option to process zip archives in memory to support zip files
+that use options that are incompatible with a streaming approach
+A new option to exclude files from transformation
+
+
+Full details of these changes, and all the other changes, are available in the
+https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md";>changelog.
+
+
+
+Download
+
+
+
 
 
 The Apache Tomcat Project is proud to announce the release of version 7.0.108 
of



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

[tomcat-jakartaee-migration] branch master updated: Add a download link

[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-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 787600a  Add a download link
787600a is described below

commit 787600a71c1bb4b2fdde269f5078a059ac92b894
Author: Mark Thomas 
AuthorDate: Thu Feb 18 19:27:08 2021 +

Add a download link
---
 README.md | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 439bcfe..9ccbff2 100644
--- a/README.md
+++ b/README.md
@@ -17,17 +17,26 @@ The tool can be used from the command line or as an Ant 
task.
 
 ## Usage
 
+### Download
+
+Download a source or binary distribution from
+[https://tomcat.apache.org/download-migration.cgi](https://tomcat.apache.org/download-migration.cgi)
+
 ### Build
 
-Build the migration tool with:
+Build the migration tool from source with:
 
 ./mvnw verify
 
+To run the migration tool locally, you are most likely to want:
+
+target/jakartaee-migration-*-shaded.jar
+
 ### Migrate
 
 Migrate your Servlet application with:
 
-java -jar target/jakartaee-migration-*-shaded.jar  
+java -jar jakartaee-migration-*-shaded.jar  
 
 The source should be a path to a compressed archive, a folder or an individual
 file. The destination will be created at the specified path as a resource of


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

[ANN] Apache Tomcat Migration tool for Jakarta EE 0.2.0

[Mark Thomas]

The Apache Tomcat team announces the immediate availability of Apache
Tomcat Migration Tool for Jakarta EE 0.2.0

Apache Tomcat Migration Tool for Jakarta EE is an open source software
tool for migrating binary web applications (WAR files) and other binary
artefacts from Java EE 8 to Jakarta EE 9.

The notable changes since 0.1.0 include:

- Various fixes to the packages that are and are not converted

- A new option to process zip archives in memory to support zip files
  that use options that are incompatible with a streaming approach

- A new option to exclude files from transformation

Please refer to the change log for the complete list of changes:
https://github.com/apache/tomcat-jakartaee-migration/blob/master/CHANGES.md

Downloads:
http://tomcat.apache.org/download-migration.cgi

Enjoy!

- The Apache Tomcat team


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

[tomcat] 01/02: Add legacyAppBase property with default of "webapps-javaee"

[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.git

commit 9e6f3b7328b89259a222e85c838e6104c9eb2a22
Author: Mark Thomas 
AuthorDate: Thu Feb 11 12:27:30 2021 +

Add legacyAppBase property with default of "webapps-javaee"
---
 build.xml  |  1 +
 java/org/apache/catalina/Host.java | 24 
 .../apache/catalina/core/LocalStrings.properties   |  1 +
 java/org/apache/catalina/core/StandardHost.java| 65 +-
 .../apache/catalina/core/mbeans-descriptors.xml|  4 ++
 test/org/apache/tomcat/unittest/TesterHost.java| 15 +
 6 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 455edf9..98d180e 100644
--- a/build.xml
+++ b/build.xml
@@ -808,6 +808,7 @@
 
 
 
+
 
 
 
 
+
+
 
diff --git a/test/org/apache/tomcat/unittest/TesterHost.java 
b/test/org/apache/tomcat/unittest/TesterHost.java
index ae3379e..b194879 100644
--- a/test/org/apache/tomcat/unittest/TesterHost.java
+++ b/test/org/apache/tomcat/unittest/TesterHost.java
@@ -291,6 +291,21 @@ public class TesterHost implements Host {
 }
 
 @Override
+public String getLegacyAppBase() {
+return null;
+}
+
+@Override
+public File getLegacyAppBaseFile() {
+return null;
+}
+
+@Override
+public void setLegacyAppBase(String legacyAppBase) {
+// NO-OP
+}
+
+@Override
 public boolean getAutoDeploy() {
 return false;
 }


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

[tomcat] 02/02: Integrate Java EE -> Jakarta EE migration with automatic deployment

[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.git

commit e08dbf4559da7612c4060b68dfee8ce03560ce07
Author: Mark Thomas 
AuthorDate: Thu Feb 11 17:13:52 2021 +

Integrate Java EE -> Jakarta EE migration with automatic deployment
---
 build.properties.default   |  12 +++
 build.xml  |  22 +
 conf/catalina.properties   |   1 +
 java/org/apache/catalina/startup/HostConfig.java   | 109 +
 .../catalina/startup/LocalStrings.properties   |   1 +
 webapps/docs/changelog.xml |  11 ++-
 6 files changed, 154 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 7253e7a..6d4476b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -303,3 +303,15 @@ 
osgi-annotations.checksum.value=153054f987534244f95a399539b11375|b6e802bceba0682
 osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
 
osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
 
osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
+
+# - Tomcat Migration Tool for Jakarta EE -
+migration-lib.version=0.2.0
+
+# checksums for jakartaee-migration-0.2.0-shaded.jar
+migration-lib.checksum.enabled=true
+migration-lib.checksum.algorithm=MD5|SHA-1
+migration-lib.checksum.value=c7dc838f46901157722ac2f49af854c8|73f53ba52e443f0e992a2aa57d42927d884709eb
+
+migration-lib.home=${base.path}/migration-${migration-lib.version}
+migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
+migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
diff --git a/build.xml b/build.xml
index 98d180e..a4c9d05 100644
--- a/build.xml
+++ b/build.xml
@@ -240,6 +240,7 @@
 
 
 
+
   
 
   
@@ -1462,6 +1463,17 @@
 
 
 
+
+
+
+
+  
+
+
+  
+
+
+
 
 
   
@@ -3125,6 +3137,16 @@ skip.installer property in build.properties" />
   
 
 
+
+
+  
+  
+  
+  
+  
+  
+
+
   
 
   > results = new ArrayList<>();
+
+String[] migrationCandidates = legacyAppBase.list();
+for (String migrationCandidate : migrationCandidates) {
+File source = new File(legacyAppBase, migrationCandidate);
+File destination = new File(appBase, migrationCandidate);
+
+ContextName cn;
+if (source.lastModified() > destination.lastModified()) {
+if (source.isFile() && 
source.getName().toLowerCase(Locale.ENGLISH).endsWith(".war")) {
+cn = new ContextName(migrationCandidate, true);
+} else if (source.isDirectory()) {
+cn = new ContextName(migrationCandidate, false);
+} else {
+continue;
+}
+
+if (tryAddServiced(cn.getBaseName())) {
+try {
+// MigrateApp will call removeServiced
+results.add(es.submit(new MigrateApp(this, cn, source, 
destination)));
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+removeServiced(cn.getName());
+throw t;
+}
+}
+}
+}
+
+for (Future result : results) {
+try {
+result.get();
+} catch (Exception e) {
+
log.error(sm.getString("hostConfig.migrateApp.threaded.error"), e);
+}
+}
+}
+
+
+protected void migrateLegacyApp(File source, File destination) {
+File tempNew = null;
+File tempOld = null;
+try {
+tempNew = File.createTempFile("new", null, 
host.getLegacyAppBaseFile());
+tempOld = File.createTempFile("old", null, 
host.getLegacyAppBaseFile());
+
+// The use of defaults is deliberate here to avoid having to
+// recreate every configuration option on the host. Better to 
change
+// the defaults if necessary than to start adding configuration
+// options. Users that need non-default options can convert 
manually
+// via migration.[sh|bat]
+Migration migration = new Migration();
+migration.setSource(source);
+migration.setDestination(tempNew);
+migration.execute();
+
+// Use rename
+destination.renameTo(tempOld);
+tempNew.renameTo(de

[tomcat] branch master updated (a969108 -> e08dbf4)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


from a969108  Expand test cases. Remove debug logging.
 new 9e6f3b7  Add legacyAppBase property with default of "webapps-javaee"
 new e08dbf4  Integrate Java EE -> Jakarta EE migration with automatic 
deployment

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.properties.default   |  12 +++
 build.xml  |  23 +
 conf/catalina.properties   |   1 +
 java/org/apache/catalina/Host.java |  24 +
 .../apache/catalina/core/LocalStrings.properties   |   1 +
 java/org/apache/catalina/core/StandardHost.java|  65 +---
 .../apache/catalina/core/mbeans-descriptors.xml|   4 +
 java/org/apache/catalina/startup/HostConfig.java   | 109 +
 .../catalina/startup/LocalStrings.properties   |   1 +
 test/org/apache/tomcat/unittest/TesterHost.java|  15 +++
 webapps/docs/changelog.xml |  11 ++-
 11 files changed, 250 insertions(+), 16 deletions(-)


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

Re: [tomcat] 02/02: Integrate Java EE -> Jakarta EE migration with automatic deployment

[Mark Thomas]

On 18/02/2021 20:56, ma...@apache.org wrote:
> 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.git
> 
> commit e08dbf4559da7612c4060b68dfee8ce03560ce07
> Author: Mark Thomas 
> AuthorDate: Thu Feb 11 17:13:52 2021 +
> 
> Integrate Java EE -> Jakarta EE migration with automatic deployment

Functionally, I think this is there. What is lacking is documentatoion.
I plan to work on that over the next few days.

Mark

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

[tomcat-jakartaee-migration] branch master updated: Better toString

[remm]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new f5c9fc9  Better toString
f5c9fc9 is described below

commit f5c9fc9df35439202c7a288d40e7b3b795ef0379
Author: remm 
AuthorDate: Thu Feb 18 23:28:45 2021 +0100

Better toString

This is used by logging in Tomcat in addTransformer, so the profile used
is shown.
---
 src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index ca536fb..d3fbaae 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -46,6 +46,11 @@ public class ClassConverter implements Converter, 
ClassFileTransformer {
 }
 
 @Override
+public String toString() {
+return ClassConverter.class.getCanonicalName() + '[' + 
profile.toString() + ']';
+}
+
+@Override
 public boolean accepts(String filename) {
 String extension = Util.getExtension(filename);
 return "class".equals(extension);


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

[tomcat] branch master updated: Drop some reflection

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 5ac227d  Drop some reflection
5ac227d is described below

commit 5ac227ded1eb966daddcaf4b5b22ae0b8a17b697
Author: remm 
AuthorDate: Thu Feb 18 23:29:37 2021 +0100

Drop some reflection
---
 .../apache/catalina/loader/LocalStrings.properties |  1 -
 java/org/apache/catalina/loader/WebappLoader.java  | 28 +-
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/catalina/loader/LocalStrings.properties 
b/java/org/apache/catalina/loader/LocalStrings.properties
index dee7e2c..7c6c976 100644
--- a/java/org/apache/catalina/loader/LocalStrings.properties
+++ b/java/org/apache/catalina/loader/LocalStrings.properties
@@ -59,7 +59,6 @@ webappClassLoader.wrongVersion=(unable to load class [{0}])
 webappClassLoaderParallel.registrationFailed=Registration of 
org.apache.catalina.loader.ParallelWebappClassLoader as capable of loading 
classes in parallel failed
 
 webappLoader.deploy=Deploying class repositories to work directory [{0}]
-webappLoader.noJakartaConverter=The Jakarta converter provided by the Tomcat 
migration tool could not be loaded
 webappLoader.noResources=No resources found for context [{0}]
 webappLoader.reloadable=Cannot set reloadable property to [{0}]
 webappLoader.setContext.ise=Setting the Context is not permitted while the 
loader is started.
diff --git a/java/org/apache/catalina/loader/WebappLoader.java 
b/java/org/apache/catalina/loader/WebappLoader.java
index 33aad92..7e1405a 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -24,7 +24,6 @@ import java.io.IOException;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
@@ -42,6 +41,8 @@ import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.catalina.util.ToStringUtil;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.jakartaee.ClassConverter;
+import org.apache.tomcat.jakartaee.EESpecProfile;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.compat.JreCompat;
@@ -366,24 +367,17 @@ public class WebappLoader extends LifecycleMBeanBase 
implements Loader{
 
 // Set Jakarta class converter
 if (getJakartaConverter() != null) {
+ClassFileTransformer transformer = null;
 try {
-ClassFileTransformer transformer = null;
-try {
-Class jakartaEnumClass = 
Class.forName("org.apache.tomcat.jakartaee.EESpecProfile");
-Method valueOf = jakartaEnumClass.getMethod("valueOf", 
String.class);
-Object profile = valueOf.invoke(null, 
getJakartaConverter());
-transformer =
-(ClassFileTransformer) 
Class.forName("org.apache.tomcat.jakartaee.ClassConverter")
-
.getConstructor(jakartaEnumClass).newInstance(profile);
-} catch (InvocationTargetException | NoSuchMethodException 
ignored) {
-// Use default value with no argument constructor
-transformer =
-(ClassFileTransformer) 
Class.forName("org.apache.tomcat.jakartaee.ClassConverter").newInstance();
-}
-classLoader.addTransformer(transformer);
-} catch (InstantiationException | IllegalAccessException | 
ClassNotFoundException e) {
-log.warn(sm.getString("webappLoader.noJakartaConverter"), 
e);
+EESpecProfile profile = 
EESpecProfile.valueOf(getJakartaConverter());
+// FIXME: transformer = new ClassConverter(profile); after 
0.2
+transformer =
+(ClassFileTransformer) 
ClassConverter.class.getConstructor(EESpecProfile.class).newInstance(profile);
+} catch (InvocationTargetException | NoSuchMethodException | 
IllegalArgumentException ignored) {
+// Use default value with no argument constructor
+transformer = new ClassConverter();
 }
+classLoader.addTransformer(transformer);
 }
 
 // Configure our repositories


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