date:20200113

[Bug 64068] Tomcat failes to start when JVM start option specified for new line by "\" on linux.

2020-01-13 Thread bugzilla

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

--- Comment #3 from Rintaro ISONO  ---
Thank you for your comments !

We're going to discuss this solution and try to V for this bug with 8.5.50
in-house.
So the adoption of 8.5.49 and fix JVM options (Comment 1) are suspended.
If 8.5.50 could not start, we would skip the version-up of Tomcat from 8.5.34
to the one.

Truly yours,

-- 
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 64074] New: getResource() for directories started to return nulls instead of list of files that directory contains

2020-01-13 Thread bugzilla

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

Bug ID: 64074
   Summary: getResource() for directories started to return nulls
instead of list of files that directory contains
   Product: Tomcat 9
   Version: 9.0.30
  Hardware: PC
OS: All
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: kcicho...@atlassian.com
  Target Milestone: -

Created attachment 36963
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=36963=edit
a test case that reproduces a bug

In tomcat 9.0.27 when you invoke
getClass().getResource().getInputStream() you would get an input
stream containing all files from the directory. In tomcat 9.0.30 that logic has
changed and you get a null instead of an input stream.

We created a small test project to reproduce this error (added to this ticket
as an attachment). When you deploy it to the tomcat 9.0.27 (under namespace
test_tomcat9_war) and access http://localhost:8080/test_tomcat9_war/DemoServlet
you will get 

"Full: blah.txt blah2.txt test" message

while when you deploy the same artifact to the tomcat 9.0.30 you will get 

"Full was null"
We did some investigation on our side about what has changed and it looks like


When you, in a DemoServlet, invoke getClass().getResource("/full/") you get an
URL object back in both cases. 
in tomcat 9.0.30:
you will get an URL object with a handler of class
org.apache.catalina.webresources.CachedResource$CachedResourceURLStreamHandler
then when you call openConnection on that URL object it will delegate the
openConnection to the mentioned handler. That will return
org.apache.catalina.webresources.CachedResource$CachedResourceURLConnection
object. Then when you call getInputStream on it it will return you a null
because it doesn't handle properly a case when the resource is a directory. 
This is a simplified description as there are more layers of delegation here -
eventually the org/apache/catalina/webresources/FileResource.java
doGetInputStream() method is invoked and it fails when it tries to return
FileInputStream(resource) - because the resource is a directory. 

in tomcat 9.0.27
you will get an URL object with a handler of class
sun.net.www.protocol.file.Handler then when you call openConnection on that RUL
object it will delegate the openConnection to the mentioned handler again. That
will return class sun.net.www.protocol.file.FileURLConnection object. Then when
you call getInputStream() method on it it will return you an input stream that
has a list of files in that directory (the FileURL connection object has a
special logic to handle directories.


Parts of our system rely on this functionality and because of this bug we can't
update to the newest version of tomcat which may be an issue especially when
there is some security fix to be applied.

-- 
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 64073] New: CompressionConfig does not clear Content-Length header if already set

2020-01-13 Thread bugzilla

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

Bug ID: 64073
   Summary: CompressionConfig does not clear Content-Length header
if already set
   Product: Tomcat 9
   Version: 9.0.30
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: bclo...@pivotal.io
  Target Milestone: -

This issue happens in the following case:

1. the connector is configured to compress HTTP responses
2. an application sets the following response header "Content-Length: 3000"
3. the CompressionConfig class checks that the request+response qualify for
compression
4. if they do, the response content length is set to "-1" (see:
https://github.com/apache/tomcat/blob/740e15e858993221fab4cbe025f408333255b785/java/org/apache/coyote/CompressionConfig.java#L326)
but the actual "Content-Length" header is never cleared.
5. the HTTP response has then both "Content-Length: 3000" and
"Transfer-Encoding: chunked" headers

It seems to be against the HTTP spec and is actively enforced by popular HTTP
clients, see
https://github.com/netty/netty/commit/8494b046ec7e4f28dbd44bc699cc4c4c92251729

-- 
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 63815] Expansion of JAVA_OPTS in catalina.sh containing '*' stops startup on linux

2020-01-13 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 CC||ris...@kogei.jp

--- Comment #15 from Mark Thomas  ---
*** Bug 64068 has been marked as a duplicate of this bug. ***

-- 
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 64068] Tomcat failes to start when JVM start option specified for new line by "\" on linux.

2020-01-13 Thread bugzilla

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

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #2 from Mark Thomas  ---
I can't reproduce this with the current fix in trunk.

I recommend trying with 8.5.50. If that doesn;t work, the fix will be in
8.5.51.

*** This bug has been marked as a duplicate of bug 63815 ***

-- 
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: More version numbers 9 -> 10

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 740e15e  More version numbers 9 -> 10
740e15e is described below

commit 740e15e858993221fab4cbe025f408333255b785
Author: Mark Thomas 
AuthorDate: Mon Jan 13 21:59:38 2020 +

More version numbers 9 -> 10
---
 webapps/docs/tomcat-docs.xsl | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index e507780..1898dee 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -37,18 +37,18 @@
   
   
   
-  
-  
-  
+  
+  
+  
   
   
   
   
   https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   https://svn.apache.org/viewvc?view=revrev='"/>
-  https://tomcat.apache.org/tomcat-9.0-doc'"/>
-  https://tomcat.apache.org/security-9.html'"/>
-  https://tomcat.apache.org/download-90.cgi'"/>
+  https://tomcat.apache.org/tomcat-10.0-doc'"/>
+  https://tomcat.apache.org/security-10.html'"/>
+  https://tomcat.apache.org/download-10.cgi'"/>
   
   
 


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

buildbot success in on tomcat-trunk

2020-01-13 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 5fd108ac62ca30001cde3ecaf0b48ae23a586d60
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-trunk

2020-01-13 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 2544d4ecf2aa56983d54af6a52858fffd66f436c
Blamelist: Mark Thomas 

BUILD FAILED: failed

Sincerely,
 -The Buildbot




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

[tomcat] branch master updated: Delete deprecated code marked for removal in Tomcat 10

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 5fd108a  Delete deprecated code marked for removal in Tomcat 10
5fd108a is described below

commit 5fd108ac62ca30001cde3ecaf0b48ae23a586d60
Author: Mark Thomas 
AuthorDate: Mon Jan 13 21:29:27 2020 +

Delete deprecated code marked for removal in Tomcat 10
---
 java/org/apache/catalina/connector/Request.java  | 37 
 java/org/apache/catalina/connector/Response.java | 10 ---
 2 files changed, 47 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 6cb160f..a4860d5 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -25,7 +25,6 @@ import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.Principal;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -36,7 +35,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -138,11 +136,6 @@ public class Request implements HttpServletRequest {
  */
 public Request(Connector connector) {
 this.connector = connector;
-
-formats = new SimpleDateFormat[formatsTemplate.length];
-for(int i = 0; i < formats.length; i++) {
-formats[i] = (SimpleDateFormat) formatsTemplate[i].clone();
-}
 }
 
 
@@ -177,13 +170,6 @@ public class Request implements HttpServletRequest {
 // - Variables
 
 /**
- * @deprecated Unused. This will be removed in Tomcat 10.
- */
-@Deprecated
-protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
-
-
-/**
  * The string manager for this package.
  */
 protected static final StringManager sm = 
StringManager.getManager(Request.class);
@@ -196,25 +182,6 @@ public class Request implements HttpServletRequest {
 
 
 /**
- * The set of SimpleDateFormat formats to use in getDateHeader().
- *
- * Notice that because SimpleDateFormat is not thread-safe, we can't
- * declare formats[] as a static variable.
- *
- * @deprecated Unused. This will be removed in Tomcat 10
- */
-@Deprecated
-protected final SimpleDateFormat formats[];
-
-@Deprecated
-private static final SimpleDateFormat formatsTemplate[] = {
-new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, Locale.US),
-new SimpleDateFormat("EE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
-new SimpleDateFormat("EEE  d HH:mm:ss ", Locale.US)
-};
-
-
-/**
  * The default Locale if none are specified.
  */
 protected static final Locale defaultLocale = Locale.getDefault();
@@ -3514,9 +3481,5 @@ public class Request implements HttpServletRequest {
 // NO-OP
 }
 });
-
-for (SimpleDateFormat sdf : formatsTemplate) {
-sdf.setTimeZone(GMT_ZONE);
-}
 }
 }
diff --git a/java/org/apache/catalina/connector/Response.java 
b/java/org/apache/catalina/connector/Response.java
index f038343..70baffb 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -26,7 +26,6 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -91,15 +90,6 @@ public class Response implements HttpServletResponse {
 
 // - Instance Variables
 
-/**
- * The date format we will use for creating date headers.
- *
- * @deprecated Unused. This will be removed in Tomcat 10
- */
-@Deprecated
-protected SimpleDateFormat format = null;
-
-
 public Response() {
 this(OutputBuffer.DEFAULT_BUFFER_SIZE);
 }


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

[tomcat] branch master updated: Delete deprecated code marked for removal in Tomcat 10

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 2544d4e  Delete deprecated code marked for removal in Tomcat 10
2544d4e is described below

commit 2544d4ecf2aa56983d54af6a52858fffd66f436c
Author: Mark Thomas 
AuthorDate: Mon Jan 13 21:18:35 2020 +

Delete deprecated code marked for removal in Tomcat 10

I'm doing this in stages so I can test the buildbot changes I just made
using meaningful changes.
---
 .../catalina/authenticator/BasicAuthenticator.java | 18 --
 java/org/apache/catalina/authenticator/Constants.java  |  8 
 2 files changed, 26 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java 
b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index cd342d9..a34f08b 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -159,24 +159,6 @@ public class BasicAuthenticator extends AuthenticatorBase {
  * as per RFC 2617 section 2, and the Base64 encoded credentials
  * as per RFC 2045 section 6.8.
  *
- * @param input   The header value to parse in-place
- * @param charset The character set to use to convert the bytes to a
- *string
- *
- * @throws IllegalArgumentException If the header does not conform
- *  to RFC 2617
- * @deprecated Unused. Will be removed in Tomcat 10. Use 3-arg 
constructor
- */
-@Deprecated
-public BasicCredentials(ByteChunk input, Charset charset) throws 
IllegalArgumentException {
-this(input, charset, true);
-}
-
-/**
- * Parse the HTTP Authorization header for BASIC authentication
- * as per RFC 2617 section 2, and the Base64 encoded credentials
- * as per RFC 2045 section 6.8.
- *
  * @param input   The header value to parse in-place
  * @param charset The character set to use to convert the bytes
  *to a string
diff --git a/java/org/apache/catalina/authenticator/Constants.java 
b/java/org/apache/catalina/authenticator/Constants.java
index a8e9a47..7977d55 100644
--- a/java/org/apache/catalina/authenticator/Constants.java
+++ b/java/org/apache/catalina/authenticator/Constants.java
@@ -82,14 +82,6 @@ public class Constants {
  */
 
 /**
- * The previously authenticated principal (if caching is disabled).
- *
- * @deprecated Unused. Will be removed in Tomcat 10.
- */
-@Deprecated
-public static final String FORM_PRINCIPAL_NOTE = 
"org.apache.catalina.authenticator.PRINCIPAL";
-
-/**
  * The original request information, to which the user will be
  * redirected if authentication succeeds.
  */


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

[Bug 62971] Revert the fix for 49464 in tomcat 9

2020-01-13 Thread bugzilla

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

fuminz...@crd.com changed:

   What|Removed |Added

 Resolution|DUPLICATE   |---
 Status|RESOLVED|REOPENED

--- Comment #2 from fuminz...@crd.com ---
The fix to bug 49464 potentially missed a scenario in its consideration, and
may have introduced a "new" bug. However, we have not been able to create an
isolated test scenario to demonstrate such yet.

In comments to bug 49464, it listed 3 scenarios considered: "
There are three scenarios to consider:
a) directly returning a file
b) including a file into an output stream
c) including a file into a writer".

However, a fourth scenario  for standard tag library core appears
to be impacted.

To my understanding, if a jsp contains a:

it is supposed to populate the content from that file "sample.xsl" into the
"variable" "xslt", for later code to use.

The issue behavior that we (in certain conditions) observed, is that the
"variable" "xslt" would become empty, yet the jsp or the result html would
receive the content of "sample.xsl" as part of its own content, making it
behaving as if it is a "include" tag instead of an import tag.

We have not identified the exact conditions that would trigger such behavior
yet - thus no isolated test case created to demonstrate such yet.  But since
the issue behavior looks to match the comments of the bug/fix for 49464, I am
adding this comment to start the communication. - We will update when/if we
have more specific info.

We are using tomcat 9.0.26

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

Re: [tomcat-jakartaee-migration] branch master updated: Add a build script. Experiment with Maven.

2020-01-13 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 1/13/20 10:20 AM, Mark Thomas wrote:
> On 13/01/2020 15:04, Christopher Schultz wrote:
>> Mark,
>> 
>> OMG hell must be freezing over...
> 
> :)
> 
> I'm slowly getting more familiar with Maven as all the Jakarta EE 
> projects use it so I thought I would try it here as this should be
> a very simple project.
> 
> It is early days but so far my impressions are:
> 
> - For a simple project, it takes less configuration that Ant to do 
> stuff.

+1

> - There appear to be lots of ways to do the same thing and I
> haven't yet found the docs that enable me to work out which way is
> right - or at least judge the pros and cons of each.

My experience with Maven has been minimal. To add my own impressions:

- - You must go all-in on Maven or you will be fighting everything all
the time.

- - If your dependencies don't have Maven artifacts, it's a PITA (which
is why we constantly get questions about Maven builds, artifacts, etc.)

- - Once you embrace the Dark Side, almost everything "just works"

- - When things don't "just work" it is nearly impossible to figure out wh
y

I don't know if it still exists, but all the Maven people I know say
"you can always use the ant-plug-in for Maven if you still want to use
ant for parts of your build, but you really should use a custom
plug-in for whatever you need".

So I guess the question is "has anyone written a Maven plug-in that
builds a Windows installer?"

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl4cxvAACgkQHPApP6U8
pFidOg/+JUuf9IGvnJYXQ+xbr6GbG7GQ0JzxREKEZ55SJv1gbGIBqiP8L2rYKk1x
HqNZ0f41p/+Hm1R17dAiJgV+LnuuUJkRdNxbwooqkmIKhCKd+44KXd7YgM1QfrJR
yq5/jD9rZY2HDkp4jC/5FZYSwCYEJFCL1vfwMBuuj9mSXK9Z3Yr278E05T+QrCAL
tgH3aXMQ8thIHK+gw1lbUhiyuBIEgwKhL5y1jEuAPGmZmf64d1R9R9QyEl6DO8Rz
UPsNZp53OSHOnwX+keAiKmFQfdKyqcVHywDZd2QQ4KutYvuZ+LjtK6ZDGpTS7yIH
6VRpjWFzXqT3YObmwvxzfmQrTD5vWHrRF/DOoqMtrN0WsDHl+NwOtDyzUmrw07WA
/42TQGG8yzMNsPLYbmEr0Yf954C05ipHvZIePyBjBGA1gFLKDOcrbORjGB1WRX2O
lvvwCTSZYiU0GZjTShKfcAB6tQo0bB7CpEcTOYRJaAMhI14dNGz3I1l4VWcI8Uoq
ZyAAkIeuuUTDrMOXSls5F0zCyxOelPgCc5bNHVlTxSrSUo2omslscQ8uNMdWEC8y
KvOUgj7TkKF5H919kBz9HJez0AiOQCyepS61NtHe9ggpcCfPtRVwcUqbbl/e+38o
J2L7FD7Ysx6ZjfpVL6IVFn8OyIMbKxnGhpkvz5uwApD3gK9knsM=
=ixxg
-END PGP SIGNATURE-

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

Re: [tomcat] branch master updated: Remove deprecated constructors for now as they create ambiguous calls

2020-01-13 Thread Rémy Maucherat

On Mon, Jan 13, 2020 at 6:05 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 cb791c1  Remove deprecated constructors for now as they create
> ambiguous calls
> cb791c1 is described below
>

Ok, so it's not possible to have both constructors set (with and without
the password.

Decision time:
- Keep the Tomcat 9 constructors, with one ignored argument
- Remove the ignored argument (that's what I did here)

Comments ?

Rémy


>
> commit cb791c14e5760247a0bfd585b67a48e2494e4323
> Author: remm 
> AuthorDate: Mon Jan 13 18:04:56 2020 +0100
>
> Remove deprecated constructors for now as they create ambiguous calls
> ---
>  .../apache/catalina/realm/GenericPrincipal.java| 25
> --
>  1 file changed, 25 deletions(-)
>
> diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java
> b/java/org/apache/catalina/realm/GenericPrincipal.java
> index 26d4ef6..1c29f5c 100644
> --- a/java/org/apache/catalina/realm/GenericPrincipal.java
> +++ b/java/org/apache/catalina/realm/GenericPrincipal.java
> @@ -50,11 +50,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
>  this(name, roles, null);
>  }
>
> -@Deprecated
> -public GenericPrincipal(String name, String password, List
> roles) {
> -this(name, roles, null);
> -}
> -
>  /**
>   * Construct a new Principal, associated with the specified Realm,
> for the
>   * specified username, with the specified role names (as Strings).
> @@ -69,12 +64,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
>  this(name, roles, userPrincipal, null);
>  }
>
> -@Deprecated
> -public GenericPrincipal(String name, String password, List
> roles,
> -Principal userPrincipal) {
> -this(name, roles, userPrincipal, null);
> -}
> -
>  /**
>   * Construct a new Principal, associated with the specified Realm,
> for the
>   * specified username, with the specified role names (as Strings).
> @@ -91,12 +80,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
>  this(name, roles, userPrincipal, loginContext, null);
>  }
>
> -@Deprecated
> -public GenericPrincipal(String name, String password, List
> roles,
> -Principal userPrincipal, LoginContext loginContext) {
> -this(name, roles, userPrincipal, loginContext, null);
> -}
> -
>  /**
>   * Construct a new Principal, associated with the specified Realm,
> for the
>   * specified username, with the specified role names (as Strings).
> @@ -128,14 +111,6 @@ public class GenericPrincipal implements
> TomcatPrincipal, Serializable {
>  }
>
>
> -@Deprecated
> -public GenericPrincipal(String name, String password, List
> roles,
> -Principal userPrincipal, LoginContext loginContext,
> -GSSCredential gssCredential) {
> -this(name, roles, userPrincipal, loginContext, gssCredential);
> -}
> -
> -
>  // --
> Properties
>
>  /**
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

buildbot success in on tomcat-trunk

2020-01-13 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 4f98507c6780df8224a3a9c9b3a8289a660cd731
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch master updated: Another location where a version update is required

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4f98507  Another location where a version update is required
4f98507 is described below

commit 4f98507c6780df8224a3a9c9b3a8289a660cd731
Author: Mark Thomas 
AuthorDate: Mon Jan 13 18:02:06 2020 +

Another location where a version update is required
---
 res/maven/mvn.properties.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index a258b78..dffc7be 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.31
+maven.asf.release.deploy.version=10.0.0.0
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib


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

[tomcat] branch master updated: Remove deprecated constructors for now as they create ambiguous calls

2020-01-13 Thread 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 cb791c1  Remove deprecated constructors for now as they create 
ambiguous calls
cb791c1 is described below

commit cb791c14e5760247a0bfd585b67a48e2494e4323
Author: remm 
AuthorDate: Mon Jan 13 18:04:56 2020 +0100

Remove deprecated constructors for now as they create ambiguous calls
---
 .../apache/catalina/realm/GenericPrincipal.java| 25 --
 1 file changed, 25 deletions(-)

diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java 
b/java/org/apache/catalina/realm/GenericPrincipal.java
index 26d4ef6..1c29f5c 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -50,11 +50,6 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 this(name, roles, null);
 }
 
-@Deprecated
-public GenericPrincipal(String name, String password, List roles) {
-this(name, roles, null);
-}
-
 /**
  * Construct a new Principal, associated with the specified Realm, for the
  * specified username, with the specified role names (as Strings).
@@ -69,12 +64,6 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 this(name, roles, userPrincipal, null);
 }
 
-@Deprecated
-public GenericPrincipal(String name, String password, List roles,
-Principal userPrincipal) {
-this(name, roles, userPrincipal, null);
-}
-
 /**
  * Construct a new Principal, associated with the specified Realm, for the
  * specified username, with the specified role names (as Strings).
@@ -91,12 +80,6 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 this(name, roles, userPrincipal, loginContext, null);
 }
 
-@Deprecated
-public GenericPrincipal(String name, String password, List roles,
-Principal userPrincipal, LoginContext loginContext) {
-this(name, roles, userPrincipal, loginContext, null);
-}
-
 /**
  * Construct a new Principal, associated with the specified Realm, for the
  * specified username, with the specified role names (as Strings).
@@ -128,14 +111,6 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 }
 
 
-@Deprecated
-public GenericPrincipal(String name, String password, List roles,
-Principal userPrincipal, LoginContext loginContext,
-GSSCredential gssCredential) {
-this(name, roles, userPrincipal, loginContext, gssCredential);
-}
-
-
 // -- 
Properties
 
 /**


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

[tomcat] branch master updated: Forgot test update

2020-01-13 Thread 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 23b3d8d  Forgot test update
23b3d8d is described below

commit 23b3d8d789eea08a25e22e1fdd4652ec0df67063
Author: remm 
AuthorDate: Mon Jan 13 17:55:49 2020 +0100

Forgot test update
---
 test/org/apache/catalina/realm/TestGenericPrincipal.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/catalina/realm/TestGenericPrincipal.java 
b/test/org/apache/catalina/realm/TestGenericPrincipal.java
index f43fc24..5a99415 100644
--- a/test/org/apache/catalina/realm/TestGenericPrincipal.java
+++ b/test/org/apache/catalina/realm/TestGenericPrincipal.java
@@ -32,7 +32,6 @@ import org.junit.Test;
 public class TestGenericPrincipal {
 
 private static final String USER = "user";
-private static final String PASSWORD = "pwd";
 private static final List ROLES = Collections.unmodifiableList(
 Arrays.asList(new String[] { "ROLE1", "ROLE2" }));
 private static final TesterPrincipal PRINCIPAL = new 
TesterPrincipal("Principal");
@@ -41,19 +40,19 @@ public class TestGenericPrincipal {
 
 @Test
 public void testSerialize01() throws ClassNotFoundException, IOException {
-GenericPrincipal gpIn = new GenericPrincipal(USER, PASSWORD, ROLES);
+GenericPrincipal gpIn = new GenericPrincipal(USER, ROLES);
 doTest(gpIn);
 }
 
 @Test
 public void testSerialize02() throws ClassNotFoundException, IOException {
-GenericPrincipal gpIn = new GenericPrincipal(USER, PASSWORD, ROLES, 
PRINCIPAL);
+GenericPrincipal gpIn = new GenericPrincipal(USER, ROLES, PRINCIPAL);
 doTest(gpIn);
 }
 
 @Test
 public void testSerialize03() throws ClassNotFoundException, IOException {
-GenericPrincipal gpIn = new GenericPrincipal(USER, PASSWORD, ROLES, 
PRINCIPAL_NON_SERIALIZABLE);
+GenericPrincipal gpIn = new GenericPrincipal(USER, ROLES, 
PRINCIPAL_NON_SERIALIZABLE);
 doTest(gpIn);
 }
 


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

[tomcat] branch master updated: GenericPrincipal API cleanup

2020-01-13 Thread 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 e96edf2  GenericPrincipal API cleanup
e96edf2 is described below

commit e96edf229eb78df2be55e16e5c7f277501a71181
Author: remm 
AuthorDate: Mon Jan 13 17:51:33 2020 +0100

GenericPrincipal API cleanup

Leave deprecated constructors to allow easier branch compatibility, but
actually remove everything. I hesitated on leaving them, but it's likely
too hard to write a realm compatible with both 9 and 10 otherwise.
Cleanup all the code using the new constructors. Verified everything
uses RealmBase.getPassword.
---
 .../authenticator/jaspic/CallbackHandlerImpl.java  |  2 +-
 .../org/apache/catalina/realm/DataSourceRealm.java |  5 +-
 .../apache/catalina/realm/GenericPrincipal.java| 62 --
 java/org/apache/catalina/realm/JAASRealm.java  |  2 +-
 java/org/apache/catalina/realm/JDBCRealm.java  |  6 +--
 java/org/apache/catalina/realm/JNDIRealm.java  |  6 +--
 java/org/apache/catalina/realm/MemoryRealm.java|  3 +-
 .../apache/catalina/realm/UserDatabaseRealm.java   |  2 +-
 java/org/apache/catalina/startup/Tomcat.java   |  2 +-
 test/org/apache/catalina/realm/TestRealmBase.java  |  8 +--
 .../apache/catalina/startup/TesterMapRealm.java|  2 +-
 11 files changed, 51 insertions(+), 49 deletions(-)

diff --git 
a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java 
b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index a43a3a5..dc539c7 100644
--- a/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -117,6 +117,6 @@ public class CallbackHandlerImpl implements CallbackHandler 
{
 roles = Arrays.asList(groups);
 }
 
-return new GenericPrincipal(name, null, roles, principal);
+return new GenericPrincipal(name, roles, principal);
 }
 }
diff --git a/java/org/apache/catalina/realm/DataSourceRealm.java 
b/java/org/apache/catalina/realm/DataSourceRealm.java
index c638967..9e1c1f7 100644
--- a/java/org/apache/catalina/realm/DataSourceRealm.java
+++ b/java/org/apache/catalina/realm/DataSourceRealm.java
@@ -334,7 +334,7 @@ public class DataSourceRealm extends RealmBase {
 ArrayList list = getRoles(dbConnection, username);
 
 // Create and return a suitable Principal for this user
-return new GenericPrincipal(username, credentials, list);
+return new GenericPrincipal(username, list);
 }
 
 
@@ -455,11 +455,10 @@ public class DataSourceRealm extends RealmBase {
 protected Principal getPrincipal(String username) {
 Connection dbConnection = open();
 if (dbConnection == null) {
-return new GenericPrincipal(username, null, null);
+return new GenericPrincipal(username, null);
 }
 try {
 return new GenericPrincipal(username,
-getPassword(dbConnection, username),
 getRoles(dbConnection, username));
 } finally {
 close(dbConnection);
diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java 
b/java/org/apache/catalina/realm/GenericPrincipal.java
index 1511b2d..26d4ef6 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -41,58 +41,67 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 
 /**
  * Construct a new Principal, associated with the specified Realm, for the
- * specified username and password, with the specified role names
- * (as Strings).
+ * specified username, with the specified role names (as Strings).
  *
  * @param name The username of the user represented by this Principal
- * @param password Credentials used to authenticate this user
  * @param roles List of roles (must be Strings) possessed by this user
  */
+public GenericPrincipal(String name, List roles) {
+this(name, roles, null);
+}
+
+@Deprecated
 public GenericPrincipal(String name, String password, List roles) {
-this(name, password, roles, null);
+this(name, roles, null);
 }
 
 /**
  * Construct a new Principal, associated with the specified Realm, for the
- * specified username and password, with the specified role names
- * (as Strings).
+ * specified username, with the specified role names (as Strings).
  *
  * @param name The username of the user represented by this Principal
- * @param password Credentials used to authenticate this user
  * @param roles List of roles (must be Strings) possessed by this user
  * @param userPrincipal - the principal to be returned from

Re: [tomcat-jakartaee-migration] tag 0.0.1 created (now dc69f8d)

2020-01-13 Thread Mark Thomas

On 13/01/2020 16:17, ma...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a change to tag 0.0.1
> in repository 
> https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.
> 
> 
>   at dc69f8d  (commit)
> This tag includes the following new commits:
> 
>  new 31d728d  Fix various issues when doing a clean build
>  new ca90f2a  Add a feature that updates the MANIFEST version info during 
> migration
>  new dc69f8d  Tag 0.0.1

I created this tag so we have a tag for the code I used to convert the
JSTL JARs used in Tomcat 10.

Mark

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

[tomcat-jakartaee-migration] 01/01: Increment version number

2020-01-13 Thread markt

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

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

commit 47e40ad151a154d0bd071f86405a731232caabd9
Author: Mark Thomas 
AuthorDate: Mon Jan 13 16:17:26 2020 +

Increment version number
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7c53547..1370d14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  0.0.1-SNAPSHOT
+  0.0.2-SNAPSHOT
  
   
 This tool is a work in progress.


-
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 (0419aa6 -> 47e40ad)

2020-01-13 Thread 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-jakartaee-migration.git.


from 0419aa6  Add a build script. Experiment with Maven.
 add 31d728d  Fix various issues when doing a clean build
 add ca90f2a  Add a feature that updates the MANIFEST version info during 
migration
 new 47e40ad  Increment version number

The 1 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:
 pom.xml|  6 +--
 src/assembly/bin.xml   |  3 +-
 .../jakartaee/{NoOpConverter.java => Info.java}| 44 ++
 .../org/apache/tomcat/jakartaee/Migration.java | 18 +
 src/main/resources/info.properties | 16 
 src/main/scripts/migrate.sh|  5 +--
 6 files changed, 67 insertions(+), 25 deletions(-)
 copy src/main/java/org/apache/tomcat/jakartaee/{NoOpConverter.java => 
Info.java} (57%)
 create mode 100644 src/main/resources/info.properties


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

[tomcat-jakartaee-migration] 02/03: Add a feature that updates the MANIFEST version info during migration

2020-01-13 Thread markt

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

markt pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit ca90f2ab5c6e9d01c2ff153198ec0a96c7d5a6fd
Author: Mark Thomas 
AuthorDate: Mon Jan 13 15:51:20 2020 +

Add a feature that updates the MANIFEST version info during migration
---
 .../java/org/apache/tomcat/jakartaee/Info.java | 54 ++
 .../org/apache/tomcat/jakartaee/Migration.java | 18 
 src/main/resources/info.properties | 16 +++
 3 files changed, 88 insertions(+)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Info.java 
b/src/main/java/org/apache/tomcat/jakartaee/Info.java
new file mode 100644
index 000..a8de1a0
--- /dev/null
+++ b/src/main/java/org/apache/tomcat/jakartaee/Info.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jakartaee;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class Info {
+
+private static final String VERSION;
+
+static {
+Properties props = new Properties();
+
+String version = null;
+try {
+
props.load(Info.class.getClassLoader().getResourceAsStream("info.properties"));
+
+version = props.getProperty("version");
+
+} catch (IOException e) {
+// Handled below
+}
+
+if (version == null) {
+VERSION = "UNKNOWN";
+} else {
+VERSION = version;
+}
+}
+
+public static String getVersion() {
+return VERSION;
+}
+
+
+private Info() {
+// Utility class. Hide default constructor.
+}
+}
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 5950195..80fb2b1 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
@@ -97,6 +98,7 @@ public class Migration {
 JarOutputStream jarOs = new JarOutputStream(new 
NonClosingOutputStream(dest))) {
 Manifest manifest = jarIs.getManifest();
 if (manifest != null) {
+updateVersion(manifest);
 JarEntry manifestEntry = new JarEntry(JarFile.MANIFEST_NAME);
 jarOs.putNextEntry(manifestEntry);
 manifest.write(jarOs);
@@ -129,6 +131,22 @@ public class Migration {
 }
 
 
+private void updateVersion(Manifest manifest) {
+updateVersion(manifest.getMainAttributes());
+for (Attributes attributes : manifest.getEntries().values()) {
+updateVersion(attributes);
+}
+}
+
+
+private void updateVersion(Attributes attributes) {
+if (attributes.containsKey(Attributes.Name.IMPLEMENTATION_VERSION)) {
+String newValue = 
attributes.get(Attributes.Name.IMPLEMENTATION_VERSION) + "-" + 
Info.getVersion();
+attributes.put(Attributes.Name.IMPLEMENTATION_VERSION, newValue);
+}
+}
+
+
 public static void main(String[] args) {
 if (args.length != 2) {
 usage();
diff --git a/src/main/resources/info.properties 
b/src/main/resources/info.properties
new file mode 100644
index 000..2ba48b9
--- /dev/null
+++ b/src/main/resources/info.properties
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+#

[tomcat-jakartaee-migration] tag 0.0.1 created (now dc69f8d)

2020-01-13 Thread markt

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

markt pushed a change to tag 0.0.1
in repository 
https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git.


  at dc69f8d  (commit)
This tag includes the following new commits:

 new 31d728d  Fix various issues when doing a clean build
 new ca90f2a  Add a feature that updates the MANIFEST version info during 
migration
 new dc69f8d  Tag 0.0.1

The 3 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.



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

[tomcat-jakartaee-migration] 01/03: Fix various issues when doing a clean build

2020-01-13 Thread markt

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

markt pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit 31d728d82cf2b1f4afc571d6e7e814576988ee00
Author: Mark Thomas 
AuthorDate: Mon Jan 13 15:05:29 2020 +

Fix various issues when doing a clean build
---
 pom.xml | 4 
 src/assembly/bin.xml| 3 ++-
 src/main/scripts/migrate.sh | 5 +
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2e65e7..7c53547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,10 +79,6 @@
 src/main/resources
 true
   
-  
-src/main/scripot
-bin
-  

 
   
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index 79f13c0..6397296 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -17,7 +17,8 @@
   
 
 
-  ${project.build.directpry}/bin
+  ${project.basedir}/src/main/scripts
+  bin
   
 *.sh
   
diff --git a/src/main/scripts/migrate.sh b/src/main/scripts/migrate.sh
index 3d3004f..4f8826b 100644
--- a/src/main/scripts/migrate.sh
+++ b/src/main/scripts/migrate.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
 
-# Assumes current layout of Maven's target directory
-cd ..
-
 # Assumes java is on the path
-java -cp lib/* org.apache.tomcat.jakartaee.Migration "$@"
+java -cp "../lib/*" org.apache.tomcat.jakartaee.Migration "$@"


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

[tomcat-jakartaee-migration] 03/03: Tag 0.0.1

2020-01-13 Thread markt

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

markt pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git

commit dc69f8d1bd28d24556de11e80fa9bd7e54a3908d
Author: Mark Thomas 
AuthorDate: Mon Jan 13 16:16:35 2020 +

Tag 0.0.1
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7c53547..11eab0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  0.0.1-SNAPSHOT
+  0.0.1
  
   
 This tool is a work in progress.


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

[tomcat] branch master updated (cf239bb -> f796b98)

2020-01-13 Thread 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 cf239bb  Remove GenericPrincipal.getPassword
 add f796b98  First pass at migrating JSTL lists using migration tool

No new revisions were added by this update.

Summary of changes:
 test/jakarta/el/TestCompositeELResolver.java   |   2 --
 .../servlet/jsp/el/TestScopedAttributeELResolver.java  |   2 --
 .../catalina/core/TestStandardContextAliases.java  |   8 
 test/org/apache/el/TestELInJsp.java|   5 +
 test/org/apache/jasper/compiler/TestParser.java|   3 ---
 .../apache/jasper/runtime/TestJspContextWrapper.java   |   2 --
 test/org/apache/jasper/servlet/TestTldScanner.java |   4 ++--
 .../jasper/tagplugins/jstl/core/TestForEach.java   |   4 +---
 .../apache/jasper/tagplugins/jstl/core/TestOut.java|   4 +---
 .../apache/jasper/tagplugins/jstl/core/TestSet.java|   3 ---
 .../lib/taglibs-standard-impl-1.2.5-migrated-0.0.1.jar | Bin 0 -> 206775 bytes
 .../WEB-INF/lib/taglibs-standard-impl-1.2.5.jar| Bin 206430 -> 0 bytes
 .../lib/taglibs-standard-spec-1.2.5-migrated-0.0.1.jar | Bin 0 -> 40390 bytes
 .../WEB-INF/lib/taglibs-standard-spec-1.2.5.jar| Bin 40153 -> 0 bytes
 14 files changed, 9 insertions(+), 28 deletions(-)
 create mode 100644 
webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5-migrated-0.0.1.jar
 delete mode 100644 webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar
 create mode 100644 
webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5-migrated-0.0.1.jar
 delete mode 100644 webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar


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

Re: [tomcat-jakartaee-migration] branch master updated: Add a build script. Experiment with Maven.

2020-01-13 Thread Mark Thomas

On 13/01/2020 15:04, Christopher Schultz wrote:
> Mark,
> 
> OMG hell must be freezing over...

:)

I'm slowly getting more familiar with Maven as all the Jakarta EE
projects use it so I thought I would try it here as this should be a
very simple project.

It is early days but so far my impressions are:

- For a simple project, it takes less configuration that Ant to do
  stuff.
- There appear to be lots of ways to do the same thing and I haven't yet
  found the docs that enable me to work out which way is right - or at
  least judge the pros and cons of each.

Mark

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

Re: [tomcat-jakartaee-migration] branch master updated: Add a build script. Experiment with Maven.

2020-01-13 Thread Christopher Schultz

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

OMG hell must be freezing over...

On 1/13/20 9:56 AM, 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-jakartaee-migration.git
> 
> 
> The following commit(s) were added to refs/heads/master by this
> push: new 0419aa6  Add a build script. Experiment with Maven. 
> 0419aa6 is described below
> 
> commit 0419aa64562cf7d1f014eebaaa3840a96b89acd4 Author: Mark Thomas
>  AuthorDate: Mon Jan 13 14:55:38 2020 +
> 
> Add a build script. Experiment with Maven. --- .gitignore
> |   2 +- pom.xml | 103
>  src/assembly/bin.xml
> |  33 ++ src/main/scripts/migrate.sh |   7 +++ 4 files
> changed, 144 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore index 107422a..beef00d 100644 
> --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .classpath 
> .project .settings -bin \ No newline at end of file +target diff
> --git a/pom.xml b/pom.xml new file mode 100644 index
> 000..d2e65e7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,103 @@ 
> + + 
> +http://maven.apache.org/POM/4.0.0;
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +
> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/xsd/maven-4.0.0.xsd;> +
> 4.0.0 + +   +
> org.apache +apache 
> +22 +   + +
> org.apache.tomcat +
> jakartaee-migration +
> 0.0.1-SNAPSHOT + +   +This tool
> is a work in progress. +The aim of the tool is to take a web
> application written for Java EE 8 that +runs on Apache Tomcat 9
> and convert it automatically so it runs on Apache +Tomcat 10
> which implements Jakarta EE 9. +   +   +
> https://tomcat.apache.org +   +
>  +  Apache Tomcat Announce List +
> announce-subscr...@tomcat.apache.org +
> announce-unsubscr...@tomcat.apache.org +
> https://lists.apache.org/list.html?annou...@tomcat.apache.org

>
> 
+
> + +  Apache Tomcat Developer
> List +
> dev-subscr...@tomcat.apache.org +
> dev-unsubscr...@tomcat.apache.org +
> dev@tomcat.apache.org +
> https://lists.apache.org/list.html?dev@tomcat.apache.org
>
> 
+
> + +  Apache Tomcat Users List +
> users-subscr...@tomcat.apache.org +
> users-unsubscr...@tomcat.apache.org +
> us...@tomcat.apache.org +
> https://lists.apache.org/list.html?us...@tomcat.apache.org
>
> 
+
> +   + +   +
> 8 +
> 8 +   +
>  +   + +
> org.apache.bcel +
> bcel +  6.4.1 +
>  +   + +   + +
>  +src/main/resources +
> true +   +   +
> src/main/scripot +
> bin +   +
>  + +   + +maven-assembly-plugin +
> 3.2.0 + +
>  +
> src/assembly/bin.xml +
>  + +   +
>  +   + + \ No newline at end of file 
> diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml new file
> mode 100644 index 000..79f13c0 --- /dev/null +++
> b/src/assembly/bin.xml @@ -0,0 +1,33 @@ + xmlns="http://maven.apache.org/ASSEMBLY/2.0.0; +
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +
> xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
> http://maven.apache.org/xsd/assembly-2.0.0.xsd;> +  bin +
>  +tar.gz +zip +
>  +   + +
> ${project.basedir} +
>  +   +
> README* +LICENSE* +
> NOTICE* +   + +
>  +
> ${project.build.directpry}/bin +
>  +*.sh +   +
> 0755 + +   +
>  + +
> lib +
>  + +
>  + \ No newline at end of file diff
> --git a/src/main/scripts/migrate.sh b/src/main/scripts/migrate.sh 
> new file mode 100644 index 000..3d3004f --- /dev/null +++
> b/src/main/scripts/migrate.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +#
> Assumes current layout of Maven's target directory +cd .. + +#
> Assumes java is on the path +java -cp lib/*
> org.apache.tomcat.jakartaee.Migration "$@"
> 
> 
> -
>
> 
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl4chvoACgkQHPApP6U8
pFj+aw/+PP/gxye6fLJ5o/fsLWRpkVi/ToLD2chNou6YiDmGHXoBfKn1fOJ/gx0Q
jFDHeLpJyIPV3C2fCX2TPwe7Qzcw7fVqzvtv4nEOZHbyJJouhPkzxlPX/jt200QS
DV+68KG2hvaJKMynRJMqKLpGggT0MbtjEqfelZtxe1vtOwDrBGU5KneMtGLnJsek
+g7QUC9K7JWqoQVuDn57bkOZBu6DrjikxF5tFMUUgLJEs1RBaege3YBdWM6udzOQ
GMReSwxNfxhL0e9hgA6eD9YCAthhe9tMbDQTsNs2pqnl+rH/hbaXI9zqnlqFzg2d
B8b3S8g34d444PEWyH+wk5VC0wGjeNJYyjhsehIXkiA362On4Yr8I3wzw38B/uDM
tHqEolgZO8bKS5Uhe9C1hFJoYnKUqlUuItxV3BR7O8MfsFHoBrOaGrs+bgVQEZu2
c1kA1SPY8ey+WJVvvxEYtP0sXeYpF/nWwnNQwwmEtEX3W9U8r3ZHFclt0EHEvBK3
J05R/2g7V3M8N6wdP5H7HPwtVClxsJyWEm/0mq8zYZ/bFCdHhGdR9ssUUjDGt6Sm
e1jnADRtABACPaMdWiDr8cIAsM/4T2LddnZYavUkZJD9whj8mB2v1+u1sxO9YFFc
7ACnqyc5WxCG/fm2T8gLQ3mHEzq8aTBaB3NlaY+LQ6oSsXeUnIw=
=LI1l

[tomcat-jakartaee-migration] branch master updated: Add a build script. Experiment with Maven.

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 0419aa6  Add a build script. Experiment with Maven.
0419aa6 is described below

commit 0419aa64562cf7d1f014eebaaa3840a96b89acd4
Author: Mark Thomas 
AuthorDate: Mon Jan 13 14:55:38 2020 +

Add a build script. Experiment with Maven.
---
 .gitignore  |   2 +-
 pom.xml | 103 
 src/assembly/bin.xml|  33 ++
 src/main/scripts/migrate.sh |   7 +++
 4 files changed, 144 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 107422a..beef00d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .classpath
 .project
 .settings
-bin
\ No newline at end of file
+target
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000..d2e65e7
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,103 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+  4.0.0
+ 
+  
+org.apache
+apache
+22
+  
+
+  org.apache.tomcat
+  jakartaee-migration
+  0.0.1-SNAPSHOT
+ 
+  
+This tool is a work in progress.
+The aim of the tool is to take a web application written for Java EE 8 that
+runs on Apache Tomcat 9 and convert it automatically so it runs on Apache
+Tomcat 10 which implements Jakarta EE 9.
+  
+  
+  https://tomcat.apache.org
+  
+
+  Apache Tomcat Announce List
+  announce-subscr...@tomcat.apache.org
+  announce-unsubscr...@tomcat.apache.org
+  
https://lists.apache.org/list.html?annou...@tomcat.apache.org
+
+
+  Apache Tomcat Developer List
+  dev-subscr...@tomcat.apache.org
+  dev-unsubscr...@tomcat.apache.org
+  dev@tomcat.apache.org
+  
https://lists.apache.org/list.html?dev@tomcat.apache.org
+
+
+  Apache Tomcat Users List
+  users-subscr...@tomcat.apache.org
+  users-unsubscr...@tomcat.apache.org
+  us...@tomcat.apache.org
+  
https://lists.apache.org/list.html?us...@tomcat.apache.org
+
+  
+  
+  
+8
+8
+  
+ 
+  
+
+  org.apache.bcel
+  bcel
+  6.4.1
+
+  
+
+  
+
+  
+src/main/resources
+true
+  
+  
+src/main/scripot
+bin
+  
+   
+
+  
+
+maven-assembly-plugin
+3.2.0
+
+  
+src/assembly/bin.xml
+  
+
+  
+
+  
+
+
\ No newline at end of file
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
new file mode 100644
index 000..79f13c0
--- /dev/null
+++ b/src/assembly/bin.xml
@@ -0,0 +1,33 @@
+http://maven.apache.org/ASSEMBLY/2.0.0;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
+  bin
+  
+tar.gz
+zip
+  
+  
+
+  ${project.basedir}
+  
+  
+README*
+LICENSE*
+NOTICE*
+  
+
+
+  ${project.build.directpry}/bin
+  
+*.sh
+  
+  0755
+
+  
+  
+
+  lib
+  
+
+  
+
\ No newline at end of file
diff --git a/src/main/scripts/migrate.sh b/src/main/scripts/migrate.sh
new file mode 100644
index 000..3d3004f
--- /dev/null
+++ b/src/main/scripts/migrate.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Assumes current layout of Maven's target directory
+cd ..
+
+# Assumes java is on the path
+java -cp lib/* org.apache.tomcat.jakartaee.Migration "$@"


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

buildbot failure in on tomcat-trunk

2020-01-13 Thread buildbot

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

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

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] cf239bb4450927fbc03d6648ea593306380725ba
Blamelist: Mark Thomas ,remm 

BUILD FAILED: failed shell_11

Sincerely,
 -The Buildbot




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

[GitHub] [tomcat] DoiMasayuki opened a new pull request #234: PrepareStatement methods are extracted

2020-01-13 Thread GitBox

DoiMasayuki opened a new pull request #234: PrepareStatement methods are 
extracted
URL: https://github.com/apache/tomcat/pull/234
 
 
   `prepareStatement()` methods are duplicated.
   This PR extracts a private method from the `prepareStatement()` methods and 
simplifies codes.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[tomcat] branch master updated: Remove GenericPrincipal.getPassword

2020-01-13 Thread 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 cf239bb  Remove GenericPrincipal.getPassword
cf239bb is described below

commit cf239bb4450927fbc03d6648ea593306380725ba
Author: remm 
AuthorDate: Mon Jan 13 14:23:35 2020 +0100

Remove GenericPrincipal.getPassword

The credentials should remain managed by the realm.
---
 TOMCAT-NEXT.txt|  2 --
 .../apache/catalina/realm/GenericPrincipal.java| 24 +-
 java/org/apache/catalina/realm/MemoryRealm.java| 24 +-
 .../apache/catalina/realm/UserDatabaseRealm.java   | 17 ---
 .../catalina/realm/TestGenericPrincipal.java   |  1 -
 test/org/apache/catalina/realm/TestJNDIRealm.java  |  4 ++--
 webapps/docs/changelog.xml |  8 
 7 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index 87eadaa..271ae5e 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -63,8 +63,6 @@ New items for 10.0.x onwards:
 
 12. Consider disabling the AJP connector by default.
 
-13. Remove GenericPrincipal.getPassword().
-
 14. Remove unused NIO blocking code.
 
 15. Change SocketProperties cache sizes default values.
diff --git a/java/org/apache/catalina/realm/GenericPrincipal.java 
b/java/org/apache/catalina/realm/GenericPrincipal.java
index 6a848de..1511b2d 100644
--- a/java/org/apache/catalina/realm/GenericPrincipal.java
+++ b/java/org/apache/catalina/realm/GenericPrincipal.java
@@ -105,7 +105,6 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 GSSCredential gssCredential) {
 super();
 this.name = name;
-this.password = password;
 this.userPrincipal = userPrincipal;
 if (roles == null) {
 this.roles = new String[0];
@@ -132,25 +131,24 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 return this.name;
 }
 
-
 /**
- * The authentication credentials for the user represented by
- * this Principal.
+ * @deprecated Will be removed in Tomcat 10, the password should be 
accessed
+ *  using RealmBase.getPassword
+ * @return null
  */
-protected final String password;
-
+@Deprecated
 public String getPassword() {
-return this.password;
+return null;
 }
 
 
 /**
  * The set of roles associated with this user.
  */
-protected final String roles[];
+protected final String[] roles;
 
 public String[] getRoles() {
-return this.roles;
+return this.roles.clone();
 }
 
 
@@ -242,21 +240,19 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 // --- 
Serialization
 
 private Object writeReplace() {
-return new SerializablePrincipal(name, password, roles, userPrincipal);
+return new SerializablePrincipal(name, roles, userPrincipal);
 }
 
 private static class SerializablePrincipal implements Serializable {
 private static final long serialVersionUID = 1L;
 
 private final String name;
-private final String password;
 private final String[] roles;
 private final Principal principal;
 
-public SerializablePrincipal(String name, String password, String[] 
roles,
+public SerializablePrincipal(String name, String[] roles,
 Principal principal) {
 this.name = name;
-this.password = password;
 this.roles = roles;
 if (principal instanceof Serializable) {
 this.principal = principal;
@@ -266,7 +262,7 @@ public class GenericPrincipal implements TomcatPrincipal, 
Serializable {
 }
 
 private Object readResolve() {
-return new GenericPrincipal(name, password, Arrays.asList(roles), 
principal);
+return new GenericPrincipal(name, null, Arrays.asList(roles), 
principal);
 }
 }
 }
diff --git a/java/org/apache/catalina/realm/MemoryRealm.java 
b/java/org/apache/catalina/realm/MemoryRealm.java
index e57cd2f..db51794 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -69,6 +69,12 @@ public class MemoryRealm  extends RealmBase {
 private final Map principals = new HashMap<>();
 
 
+/**
+ * The set of credentials for this Realm, keyed by user name.
+ */
+private final Map credentials = new HashMap<>();
+
+
 // - Properties
 
 /**
@@ -118,8 +124,12 @@ public class MemoryRealm  extends RealmBase {
 }
 
 GenericPrincipal principal =

[tomcat-jakartaee-migration] branch master updated: Fix typo

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new bf5477c  Fix typo
bf5477c is described below

commit bf5477c52cf69e8f68f24dd082b9aac9f3947a22
Author: Mark Thomas 
AuthorDate: Mon Jan 13 13:23:16 2020 +

Fix typo
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1bf86b2..334d031 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 This tool is a work in progress.
 
-The aim of the tool is to take a web application written for Java EE 8 that 
runs on Apache Tomcat 9 and convert it automatically so it runs on Apache 
Tomact 10 which implements Jakarta EE 9.
+The aim of the tool is to take a web application written for Java EE 8 that 
runs on Apache Tomcat 9 and convert it automatically so it runs on Apache 
Tomcat 10 which implements Jakarta EE 9.
 
 ## Differences between Java EE 8 and Jakarta EE 9
 


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

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 44ec7de  Add ALv2 headers
44ec7de is described below

commit 44ec7deec3336dc08053ddceca32b9bc82bcf37e
Author: Mark Thomas 
AuthorDate: Mon Jan 13 13:02:09 2020 +

Add ALv2 headers
---
 .../java/org/apache/tomcat/jakartaee/ClassConverter.java | 16 
 src/main/java/org/apache/tomcat/jakartaee/Converter.java | 16 
 src/main/java/org/apache/tomcat/jakartaee/Migration.java | 16 
 .../java/org/apache/tomcat/jakartaee/NoOpConverter.java  | 16 
 .../apache/tomcat/jakartaee/NonClosingInputStream.java   | 16 
 .../apache/tomcat/jakartaee/NonClosingOutputStream.java  | 16 
 .../java/org/apache/tomcat/jakartaee/TextConverter.java  | 16 
 src/main/java/org/apache/tomcat/jakartaee/Util.java  | 16 
 8 files changed, 128 insertions(+)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 8a2eaf8..01957af 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.tomcat.jakartaee;
 
 import java.io.IOException;
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Converter.java 
b/src/main/java/org/apache/tomcat/jakartaee/Converter.java
index 8346b4c..e569636 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Converter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Converter.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.tomcat.jakartaee;
 
 import java.io.IOException;
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index 80b1721..5950195 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.tomcat.jakartaee;
 
 import java.io.File;
diff --git a/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java
index 1e25491..2d918a0 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/NoOpConverter.java
+++

[tomcat-jakartaee-migration] branch master updated: Create README.md

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4a4a348  Create README.md
4a4a348 is described below

commit 4a4a348e43df4c07f4d1fc476bd3b514c45469a4
Author: Mark Thomas 
AuthorDate: Mon Jan 13 12:56:23 2020 +

Create README.md
---
 README.md | 20 
 1 file changed, 20 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..1bf86b2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,20 @@
+# Apache Tomcat migration tool for Jakarta EE
+
+## Overview
+
+This tool is a work in progress.
+
+The aim of the tool is to take a web application written for Java EE 8 that 
runs on Apache Tomcat 9 and convert it automatically so it runs on Apache 
Tomact 10 which implements Jakarta EE 9.
+
+## Differences between Java EE 8 and Jakarta EE 9
+
+Jakarta EE 9 is still under development and there are some details that remain 
to be worked out.
+
+The differences currently supported by this tool are:
+* Renaming packages for Jakarta EE 9 APIs from javax.* to jakarta.*
+
+The differences yet to be implemented by this tool are:
+* Remaining issues once resolved
+
+The issues still to be resolved by the Jakarta EE projects that will impact 
this tool are:
+* XML schemas


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

[tomcat-jakartaee-migration] 01/01: Initial import

2020-01-13 Thread markt

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

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

commit 749b6e6483a970d7afa5234a58ba7edcdadc07af
Author: Mark Thomas 
AuthorDate: Mon Jan 13 12:49:49 2020 +

Initial import
---
 .gitignore |   4 +
 LICENSE| 177 +
 NOTICE |   5 +
 .../apache/tomcat/jakartaee/ClassConverter.java|  48 ++
 .../org/apache/tomcat/jakartaee/Converter.java |  12 ++
 .../org/apache/tomcat/jakartaee/Migration.java | 147 +
 .../org/apache/tomcat/jakartaee/NoOpConverter.java |  24 +++
 .../tomcat/jakartaee/NonClosingInputStream.java|  68 
 .../tomcat/jakartaee/NonClosingOutputStream.java   |  44 +
 .../org/apache/tomcat/jakartaee/TextConverter.java |  74 +
 .../java/org/apache/tomcat/jakartaee/Util.java |  31 
 11 files changed, 634 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..107422a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+bin
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..f433b1a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,177 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of

[tomcat-jakartaee-migration] branch master created (now 749b6e6)

2020-01-13 Thread 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-jakartaee-migration.git.


  at 749b6e6  Initial import

This branch includes the following new commits:

 new 749b6e6  Initial import

The 1 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.



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

Tomcat 10 - JSTL

2020-01-13 Thread Mark Thomas

Currently, the tests that use JSTL are disabled. The next tasks on my
TODO list are:

- get the javax -> jakarta migration tool committed
- when working with JARs/WARs, update it to modify the version number in
  the manifest so we know which version of the tool was used to create a
  modified JAR/WAR
- use it to create jakarta versions of the JSTL JARs
- commit those and re-enable the tests that need JSTL

Mark

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

[tomcat] branch 7.0.x updated: Add placeholder for when annotation API docs are not installed

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 5c81607  Add placeholder for when annotation API docs are not installed
5c81607 is described below

commit 5c816070b6689d4b9658b508ad3066cabb6ed6ef
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:57:58 2020 +

Add placeholder for when annotation API docs are not installed
---
 webapps/docs/annotationapi/index.html | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/webapps/docs/annotationapi/index.html 
b/webapps/docs/annotationapi/index.html
new file mode 100644
index 000..2c633f5
--- /dev/null
+++ b/webapps/docs/annotationapi/index.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+API docs
+
+
+
+
+The Annotation API Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/;>
+documentation bundle.
+
+
+


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

[tomcat] branch 8.5.x updated: Add placeholder for when annotation API docs are not installed

2020-01-13 Thread 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 efa27ed  Add placeholder for when annotation API docs are not installed
efa27ed is described below

commit efa27ed78bd5433d6f886b709d4dd69902d50151
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:57:58 2020 +

Add placeholder for when annotation API docs are not installed
---
 webapps/docs/annotationapi/index.html | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/webapps/docs/annotationapi/index.html 
b/webapps/docs/annotationapi/index.html
new file mode 100644
index 000..2c633f5
--- /dev/null
+++ b/webapps/docs/annotationapi/index.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+API docs
+
+
+
+
+The Annotation API Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/;>
+documentation bundle.
+
+
+


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

[tomcat] branch 9.0.x updated: Add placeholder for when annotation API docs are not installed

2020-01-13 Thread 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 9653a58  Add placeholder for when annotation API docs are not installed
9653a58 is described below

commit 9653a582e44d906ffc49a64b7cfa914e22eac857
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:57:58 2020 +

Add placeholder for when annotation API docs are not installed
---
 webapps/docs/annotationapi/index.html | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/webapps/docs/annotationapi/index.html 
b/webapps/docs/annotationapi/index.html
new file mode 100644
index 000..2c633f5
--- /dev/null
+++ b/webapps/docs/annotationapi/index.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+API docs
+
+
+
+
+The Annotation API Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/;>
+documentation bundle.
+
+
+


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

[tomcat] branch master updated: Add placeholder for when annotation API docs are not installed

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 849d5a0  Add placeholder for when annotation API docs are not installed
849d5a0 is described below

commit 849d5a0dcfa76997a6f194fcc886b847c9051478
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:57:58 2020 +

Add placeholder for when annotation API docs are not installed
---
 webapps/docs/annotationapi/index.html | 34 ++
 1 file changed, 34 insertions(+)

diff --git a/webapps/docs/annotationapi/index.html 
b/webapps/docs/annotationapi/index.html
new file mode 100644
index 000..2c633f5
--- /dev/null
+++ b/webapps/docs/annotationapi/index.html
@@ -0,0 +1,34 @@
+
+
+
+
+
+API docs
+
+
+
+
+The Annotation API Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/;>
+documentation bundle.
+
+
+


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

[tomcat] 11/18: Rename "javax.websocket." to "jakarta.websocket."

2020-01-13 Thread markt

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

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

commit 8f9e7bca3bb80785aef8c490a7d08ff83948b96b
Author: Mark Thomas 
AuthorDate: Thu Nov 28 19:33:00 2019 +

Rename "javax.websocket.*" to "jakarta.websocket.*"
---
 build.xml  |  8 ++---
 .../websocket/ClientEndpoint.java  |  4 +--
 .../websocket/ClientEndpointConfig.java|  2 +-
 java/{javax => jakarta}/websocket/CloseReason.java |  2 +-
 .../websocket/ContainerProvider.java   |  2 +-
 .../websocket/DecodeException.java |  2 +-
 java/{javax => jakarta}/websocket/Decoder.java |  2 +-
 .../websocket/DefaultClientEndpointConfig.java |  2 +-
 .../websocket/DeploymentException.java |  2 +-
 .../websocket/EncodeException.java |  2 +-
 java/{javax => jakarta}/websocket/Encoder.java |  2 +-
 java/{javax => jakarta}/websocket/Endpoint.java|  2 +-
 .../websocket/EndpointConfig.java  |  2 +-
 java/{javax => jakarta}/websocket/Extension.java   |  2 +-
 .../websocket/HandshakeResponse.java   |  2 +-
 .../websocket/MessageHandler.java  |  2 +-
 java/{javax => jakarta}/websocket/OnClose.java |  2 +-
 java/{javax => jakarta}/websocket/OnError.java |  2 +-
 java/{javax => jakarta}/websocket/OnMessage.java   |  2 +-
 java/{javax => jakarta}/websocket/OnOpen.java  |  2 +-
 java/{javax => jakarta}/websocket/PongMessage.java |  2 +-
 .../websocket/RemoteEndpoint.java  |  2 +-
 java/{javax => jakarta}/websocket/SendHandler.java |  2 +-
 java/{javax => jakarta}/websocket/SendResult.java  |  2 +-
 java/{javax => jakarta}/websocket/Session.java |  8 ++---
 .../websocket/SessionException.java|  2 +-
 .../websocket/WebSocketContainer.java  |  2 +-
 .../server/DefaultServerEndpointConfig.java|  8 ++---
 .../websocket/server/HandshakeRequest.java |  2 +-
 .../websocket/server/PathParam.java|  2 +-
 .../websocket/server/ServerApplicationConfig.java  |  4 +--
 .../websocket/server/ServerContainer.java  |  6 ++--
 .../websocket/server/ServerEndpoint.java   |  6 ++--
 .../websocket/server/ServerEndpointConfig.java | 12 +++
 java/org/apache/tomcat/websocket/Constants.java|  2 +-
 java/org/apache/tomcat/websocket/DecoderEntry.java |  2 +-
 .../tomcat/websocket/FutureToSendHandler.java  |  4 +--
 .../tomcat/websocket/MessageHandlerResult.java |  2 +-
 java/org/apache/tomcat/websocket/MessagePart.java  |  2 +-
 .../apache/tomcat/websocket/PerMessageDeflate.java |  6 ++--
 .../apache/tomcat/websocket/Transformation.java|  2 +-
 .../tomcat/websocket/TransformationFactory.java|  2 +-
 java/org/apache/tomcat/websocket/Util.java | 28 
 .../tomcat/websocket/WrappedMessageHandler.java|  2 +-
 .../tomcat/websocket/WsContainerProvider.java  |  4 +--
 java/org/apache/tomcat/websocket/WsExtension.java  |  2 +-
 .../tomcat/websocket/WsExtensionParameter.java |  2 +-
 java/org/apache/tomcat/websocket/WsFrameBase.java  | 10 +++---
 .../org/apache/tomcat/websocket/WsFrameClient.java |  4 +--
 .../tomcat/websocket/WsHandshakeResponse.java  |  2 +-
 .../org/apache/tomcat/websocket/WsIOException.java |  2 +-
 .../org/apache/tomcat/websocket/WsPongMessage.java |  2 +-
 .../tomcat/websocket/WsRemoteEndpointAsync.java|  4 +--
 .../tomcat/websocket/WsRemoteEndpointBase.java |  2 +-
 .../tomcat/websocket/WsRemoteEndpointBasic.java|  4 +--
 .../tomcat/websocket/WsRemoteEndpointImplBase.java | 18 +--
 .../websocket/WsRemoteEndpointImplClient.java  |  4 +--
 java/org/apache/tomcat/websocket/WsSession.java| 32 +--
 .../tomcat/websocket/WsWebSocketContainer.java | 21 ++--
 .../tomcat/websocket/pojo/PojoEndpointBase.java| 10 +++---
 .../tomcat/websocket/pojo/PojoEndpointClient.java  | 12 +++
 .../tomcat/websocket/pojo/PojoEndpointServer.java  | 10 +++---
 .../websocket/pojo/PojoMessageHandlerBase.java |  8 ++---
 .../pojo/PojoMessageHandlerPartialBase.java|  6 ++--
 .../pojo/PojoMessageHandlerPartialBinary.java  |  2 +-
 .../pojo/PojoMessageHandlerPartialText.java|  2 +-
 .../pojo/PojoMessageHandlerWholeBase.java  |  6 ++--
 .../pojo/PojoMessageHandlerWholeBinary.java| 12 +++
 .../pojo/PojoMessageHandlerWholePong.java  |  4 +--
 .../pojo/PojoMessageHandlerWholeText.java  | 12 +++
 .../tomcat/websocket/pojo/PojoMethodMapping.java   | 28 
 .../tomcat/websocket/pojo/PojoPathParam.java   |  8 ++---
 .../apache/tomcat/websocket/pojo/package-info.java |  2 +-
 .../apache/tomcat/websocket/server/Constants.java  |  2 +-
 .../server/DefaultServerEndpointConfigurator.java  |  8 ++---

[tomcat] 18/18: Update more version references

2020-01-13 Thread markt

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

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

commit 782a2ba96778ce671937dc8704559e0895a52025
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:52:45 2020 +

Update more version references
---
 webapps/docs/class-loader-howto.xml | 12 ++--
 webapps/docs/index.xml  |  6 +++---
 webapps/docs/project.xml| 12 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/webapps/docs/class-loader-howto.xml 
b/webapps/docs/class-loader-howto.xml
index eecbc01..b057de1 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -130,7 +130,7 @@ loaders as it is initialized:
 
 By default, this includes the following:
 
-annotations-api.jar  JavaEE annotations classes.
+annotations-api.jar  Jakarta Annotations 2.0 
classes.
 catalina.jar  Implementation of the Catalina servlet
 container portion of Tomcat.
 catalina-ant.jar  Tomcat Catalina Ant tasks.
@@ -140,11 +140,11 @@ loaders as it is initialized:
 configuration files from current state
 catalina-tribes.jar  Group communication package.
 ecj-*.jar  Eclipse JDT Java compiler.
-el-api.jar  EL 3.0 API.
+el-api.jar  EL 4.0 API.
 jasper.jar  Tomcat Jasper JSP Compiler and 
Runtime.
 jasper-el.jar  Tomcat Jasper EL implementation.
-jsp-api.jar  JSP 2.3 API.
-servlet-api.jar  Servlet 4.0 API.
+jsp-api.jar  JSP 3.0 API.
+servlet-api.jar  Servlet 5.0 API.
 tomcat-api.jar  Several interfaces defined by 
Tomcat.
 tomcat-coyote.jar  Tomcat connectors and utility 
classes.
 tomcat-dbcp.jar  Database connection pool
@@ -159,8 +159,8 @@ loaders as it is initialized:
 documentation for more details.
 tomcat-util.jar  Common classes used by various 
components of
 Apache Tomcat.
-tomcat-websocket.jar  WebSocket 1.1 implementation
-websocket-api.jar  WebSocket 1.1 API
+tomcat-websocket.jar  WebSocket 2.0 implementation
+websocket-api.jar  WebSocket 2.0 API
 
 WebappX  A class loader is created for each web
 application that is deployed in a single Tomcat instance.  All unpacked
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index e72c8e8..e23bbf1 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -35,9 +35,9 @@
 
 This is the top-level entry point of the documentation bundle for the
 Apache Tomcat Servlet/JSP container.  Apache Tomcat version
- implements the Servlet 4.0 and JavaServer Pages 2.3
-https://wiki.apache.org/tomcat/Specifications;>specifications 
from the
-https://www.jcp.org;>Java Community Process, and includes many
+ implements the Servlet 5.0 and JavaServer Pages 3.0
+https://wiki.apache.org/tomcat/Specifications;>specifications from
+https://jakarta.ee/;>Jakarta EE, and includes many
 additional features that make it a useful platform for developing and deploying
 web applications and web services.
 
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 2884849..9c6fde9 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -82,13 +82,13 @@
 
 
 
-
-
-
-
+
+
+
-
-
+
 https://tomcat.apache.org/connectors-doc/"/>


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

[tomcat] 08/18: Rename "javax.security.auth.message" to "jakarta.security.auth.message"

2020-01-13 Thread markt

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

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

commit 35dc7b9288aad4a7d70750c157543d4ff1593c98
Author: Mark Thomas 
AuthorDate: Thu Nov 28 14:03:48 2019 +

Rename "javax.security.auth.message" to "jakarta.security.auth.message"
---
 build.xml   |  4 ++--
 .../security/auth/message/AuthException.java|  2 +-
 .../security/auth/message/AuthStatus.java   |  2 +-
 .../security/auth/message/ClientAuth.java   |  2 +-
 .../security/auth/message/MessageInfo.java  |  2 +-
 .../security/auth/message/MessagePolicy.java|  2 +-
 .../security/auth/message/ServerAuth.java   |  2 +-
 .../message/callback/CallerPrincipalCallback.java   |  2 +-
 .../auth/message/callback/CertStoreCallback.java|  2 +-
 .../message/callback/GroupPrincipalCallback.java|  2 +-
 .../callback/PasswordValidationCallback.java|  2 +-
 .../auth/message/callback/PrivateKeyCallback.java   |  2 +-
 .../auth/message/callback/SecretKeyCallback.java|  2 +-
 .../auth/message/callback/TrustStoreCallback.java   |  2 +-
 .../security/auth/message/config/AuthConfig.java|  4 ++--
 .../auth/message/config/AuthConfigFactory.java  |  2 +-
 .../auth/message/config/AuthConfigProvider.java |  5 +++--
 .../auth/message/config/ClientAuthConfig.java   |  5 +++--
 .../auth/message/config/ClientAuthContext.java  |  4 ++--
 .../auth/message/config/RegistrationListener.java   |  2 +-
 .../auth/message/config/ServerAuthConfig.java   |  5 +++--
 .../auth/message/config/ServerAuthContext.java  |  4 ++--
 .../auth/message/module/ClientAuthModule.java   |  9 +
 .../auth/message/module/ServerAuthModule.java   |  9 +
 .../catalina/authenticator/AuthenticatorBase.java   | 17 +
 .../authenticator/jaspic/AuthConfigFactoryImpl.java |  6 +++---
 .../authenticator/jaspic/CallbackHandlerImpl.java   |  5 +++--
 .../authenticator/jaspic/MessageInfoImpl.java   |  5 +++--
 .../jaspic/SimpleAuthConfigProvider.java| 13 +++--
 .../jaspic/SimpleServerAuthConfig.java  | 11 ++-
 .../jaspic/SimpleServerAuthContext.java | 11 ++-
 res/META-INF/jaspic-api.jar.manifest|  6 +++---
 res/bnd/jaspic-api.jar.tmp.bnd  |  8 
 res/bnd/tomcat-embed-core.jar.tmp.bnd   |  8 
 res/checkstyle/jakarta-import-control.xml   | 21 +
 res/checkstyle/javax-import-control.xml | 21 -
 res/checkstyle/org-import-control.xml   |  2 ++
 res/maven/tomcat-jaspic-api.pom |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java   |  6 +++---
 .../jaspic/TestSimpleServerAuthConfig.java  |  8 
 .../authenticator/jaspic/TesterMessageInfo.java |  2 +-
 .../jaspic/TesterServerAuthModuleA.java | 11 ++-
 .../catalina/loader/TestWebappClassLoader.java  |  2 +-
 43 files changed, 129 insertions(+), 115 deletions(-)

diff --git a/build.xml b/build.xml
index 821ba8c..a553b56 100644
--- a/build.xml
+++ b/build.xml
@@ -352,7 +352,7 @@
   
 
   
-
+
   
 
   
@@ -1992,7 +1992,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 
   
 
- map = new HashMap<>();
 private HttpServletRequest request;
diff --git 
a/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java 
b/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java
index 476e978..5e39d6f 100644
--- 
a/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java
+++ 
b/java/org/apache/catalina/authenticator/jaspic/SimpleAuthConfigProvider.java
@@ -19,15 +19,16 @@ package org.apache.catalina.authenticator.jaspic;
 import java.util.Map;
 
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.message.AuthException;
-import javax.security.auth.message.config.AuthConfigFactory;
-import javax.security.auth.message.config.AuthConfigProvider;
-import javax.security.auth.message.config.ClientAuthConfig;
-import javax.security.auth.message.config.ServerAuthConfig;
+
+import jakarta.security.auth.message.AuthException;
+import jakarta.security.auth.message.config.AuthConfigFactory;
+import jakarta.security.auth.message.config.AuthConfigProvider;
+import jakarta.security.auth.message.config.ClientAuthConfig;
+import jakarta.security.auth.message.config.ServerAuthConfig;
 
 /**
  * Basic implementation primarily intended for use when using third-party
- * {@link javax.security.auth.message.module.ServerAuthModule} implementations
+ * {@link jakarta.security.auth.message.module.ServerAuthModule} 
implementations
  * that only provide the module.
  */
 public class SimpleAuthConfigProvider implements

[tomcat] 14/18: Update Servlet version returned by API

2020-01-13 Thread markt

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

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

commit 05da26a0cf2cc8ade3cfc7a2be16aeb42f5b929f
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:33:43 2020 +

Update Servlet version returned by API
---
 java/jakarta/servlet/ServletContext.java | 6 +++---
 java/org/apache/catalina/core/Constants.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 95191f9..82427ca 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -92,8 +92,8 @@ public interface ServletContext {
 
 /**
  * Returns the major version of the Java Servlet API that this servlet
- * container supports. All implementations that comply with Version 4.0 
must
- * have this method return the integer 4.
+ * container supports. All implementations that comply with Version 5.0 
must
+ * have this method return the integer 5.
  *
  * @return 4
  */
@@ -101,7 +101,7 @@ public interface ServletContext {
 
 /**
  * Returns the minor version of the Servlet API that this servlet container
- * supports. All implementations that comply with Version 4.0 must have 
this
+ * supports. All implementations that comply with Version 5.0 must have 
this
  * method return the integer 0.
  *
  * @return 0
diff --git a/java/org/apache/catalina/core/Constants.java 
b/java/org/apache/catalina/core/Constants.java
index 197e0c6..6d6f80e 100644
--- a/java/org/apache/catalina/core/Constants.java
+++ b/java/org/apache/catalina/core/Constants.java
@@ -19,7 +19,7 @@ package org.apache.catalina.core;
 public class Constants {
 
 public static final String Package = "org.apache.catalina.core";
-public static final int MAJOR_VERSION = 4;
+public static final int MAJOR_VERSION = 5;
 public static final int MINOR_VERSION = 0;
 
 public static final String JSP_SERVLET_CLASS = 
"org.apache.jasper.servlet.JspServlet";


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

[tomcat] 16/18: Update JSP version in code to 3.0

2020-01-13 Thread markt

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

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

commit 7d4b08ccc3c0972646dfe9d692e036ed7ec0e331
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:39:11 2020 +

Update JSP version in code to 3.0
---
 java/org/apache/jasper/compiler/Generator.java  | 2 +-
 java/org/apache/jasper/resources/LocalStrings.properties| 2 +-
 java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 2 +-
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 2 +-
 java/org/apache/jasper/runtime/JspFactoryImpl.java  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index b0b03f2..50f8767 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -831,7 +831,7 @@ class Generator {
 out.println(");");
 
 if (ctxt.getOptions().isXpoweredBy()) {
-out.printil("response.addHeader(\"X-Powered-By\", \"JSP/2.3\");");
+out.printil("response.addHeader(\"X-Powered-By\", \"JSP/3.0\");");
 }
 
 out.printil("pageContext = _jspxFactory.getPageContext(this, request, 
response,");
diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index e51ba3d..e7a4e4d 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=According to TLD, tag [{0}] must be 
empty, but is not
 
-jsp.engine.info=Jasper JSP 2.3 Engine
+jsp.engine.info=Jasper JSP 3.0 Engine
 jsp.error.URLMustStartWithSlash=Path [{0}] must start with a slash character
 jsp.error.action.isnottagfile=[{0}] action can be used in tag files only
 jsp.error.action.istagfile=[{0}] action cannot be used in a tag file
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties 
b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 5f2f900..b71e975 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=Según el TLD, el tag [{0}] debe de 
estar vacío, pero no lo está
 
-jsp.engine.info=Motor Jasper JSP 2.3
+jsp.engine.info=Motor Jasper JSP 3.0
 jsp.error.action.isnottagfile=La acción [{0}] sólo se puede usar en archivos 
tag
 jsp.error.action.istagfile=La acción [{0}] no se puede usar en un archivo tag
 jsp.error.attempt_to_clear_flushed_buffer=Error: Se ha intentado limpiar un 
buffer que ya había sido escrito
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 6373ae8..e3e0812 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=D''après la TLD, le tag [{0}] doit être 
vide, mais ne l''est pas
 
-jsp.engine.info=Moteur Jasper JSP 2.3
+jsp.engine.info=Moteur Jasper JSP 3.0
 jsp.error.URLMustStartWithSlash=Le chemin [{0}] doit commencer par un 
caractère slash
 jsp.error.action.isnottagfile=L''action [{0}] ne peut être utilisée que dans 
un fichier tag
 jsp.error.action.istagfile=L''action [{0}] ne peut être utilisée dans un 
fichier tag
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 58aab4f..f47a2de 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLDに従ってタグ [{0}] は空でなければいけませんが、そうではありません
 
-jsp.engine.info=Jasper JSP 2.3エンジン
+jsp.engine.info=Jasper JSP 3.0エンジン
 jsp.error.URLMustStartWithSlash=パス[{0}]はスラッシュ文字で始まる必要があります。
 jsp.error.action.isnottagfile=[{0}] アクションはタグファイル中でのみ使用できません
 jsp.error.action.istagfile=[{0}] アクションはタグファイル中で使用できません
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index ed63764..5cf8e16 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -15,7 +15,7 @@
 
 jasper.error.emptybodycontent.nonempty=TLD 파일에 따르면, [{0}] 태그는 반드시 비어 있어야 하는데, 
그렇지 않습니다,
 
-jsp.engine.info=Jasper JSP 2.3 엔진
+jsp.engine.info=Jasper JSP 3.0 엔진
 jsp.error.URLMustStartWithSlash=경로 [{0}]은(는) 반드시 슬래시 문자로 시작해야 합니다.
 jsp.error.action.isnottagfile=[{0}] 액션은 오직 태그 파일들 내에서만 사용될 수 있습니다.

[tomcat] 15/18: Update referenced version in comments

2020-01-13 Thread markt

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

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

commit 4f865300158761c0b9a5fb2a83119015c56f289d
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:34:15 2020 +

Update referenced version in comments
---
 java/jakarta/el/ImportHandler.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/jakarta/el/ImportHandler.java 
b/java/jakarta/el/ImportHandler.java
index bfda5b4..1e7e9b9 100644
--- a/java/jakarta/el/ImportHandler.java
+++ b/java/jakarta/el/ImportHandler.java
@@ -34,7 +34,7 @@ public class ImportHandler {
 private static final Map> standardPackages = new 
HashMap<>();
 
 static {
-// Servlet 4.0
+// Servlet 5.0
 Set servletClassNames = new HashSet<>();
 // Interfaces
 servletClassNames.add("AsyncContext");
@@ -87,7 +87,7 @@ public class ImportHandler {
 servletClassNames.add("UnavailableException");
 standardPackages.put("jakarta.servlet", servletClassNames);
 
-// Servlet 4.0
+// Servlet 5.0
 Set servletHttpClassNames = new HashSet<>();
 // Interfaces
 servletHttpClassNames.add("HttpServletMapping");
@@ -117,7 +117,7 @@ public class ImportHandler {
 servletHttpClassNames.add("MappingMatch");
 standardPackages.put("jakarta.servlet.http", servletHttpClassNames);
 
-// JSP 2.3
+// JSP 3.0
 Set servletJspClassNames = new HashSet<>();
 //Interfaces
 servletJspClassNames.add("HttpJspPage");


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

[tomcat] 12/18: Update spec versions in MANIFESTs and parameterise from build script

2020-01-13 Thread markt

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

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

commit aade5ed3fcf16e7dd630a1ba725d089c7fceb747
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:26:11 2020 +

Update spec versions in MANIFESTs and parameterise from build script
---
 build.xml | 18 --
 res/META-INF/annotations-api.jar.manifest |  8 
 res/META-INF/el-api.jar.manifest  | 10 +-
 res/META-INF/jaspic-api.jar.manifest  |  8 
 res/META-INF/jsp-api.jar.manifest |  8 
 res/META-INF/servlet-api.jar.manifest |  8 
 res/META-INF/websocket-api.jar.manifest   |  8 
 7 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/build.xml b/build.xml
index 1e12c7c..969698e 100644
--- a/build.xml
+++ b/build.xml
@@ -53,17 +53,17 @@
 
   
   
-  
+  
   
-  
+  
   
-  
+  
   
-  
+  
   
-  
+  
   
-  
+  
 
   
   
@@ -747,11 +747,17 @@
 
 
 
+
 
+
 
+
 
+
 
+
 
+
 
 
 
diff --git a/res/META-INF/annotations-api.jar.manifest 
b/res/META-INF/annotations-api.jar.manifest
index 4b43993..dbb3410 100644
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/annotation/
+Specification-Title: Jakarta Annotations
+Specification-Version: @annotation.spec.version@
+Specification-Vendor: Eclipse Foundation
 Implementation-Title: jakarta.annotation
+Implementation-Version: @annotation.spec.version@.@annotation.revision@
 Implementation-Vendor: Apache Software Foundation
-Implementation-Version: 1.3.@annotation.revision@
-Specification-Title: Common Annotations
-Specification-Vendor: Oracle Corporation
-Specification-Version: 1.3
diff --git a/res/META-INF/el-api.jar.manifest b/res/META-INF/el-api.jar.manifest
index 63a6728..d253f13 100644
--- a/res/META-INF/el-api.jar.manifest
+++ b/res/META-INF/el-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/el/
-Specification-Title: Expression Language
-Specification-Version: 3.0
-Specification-Vendor: Sun Microsystems, Inc.
-Implementation-Title: jakarta.el
-Implementation-Version: 3.0.@el.revision@
+Specification-Title: Jakarta Expression Language
+Specification-Version: @el.spec.version@
+Specification-Vendor: Eclipse Foundation
+Implementation-Title: jakarta.annotation
+Implementation-Version: @el.spec.version@.@el.revision@
 Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/jaspic-api.jar.manifest 
b/res/META-INF/jaspic-api.jar.manifest
index a453d16..d315b99 100644
--- a/res/META-INF/jaspic-api.jar.manifest
+++ b/res/META-INF/jaspic-api.jar.manifest
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/security/auth/message
 Specification-Title: Jakarta Authentication SPI for Containers
-Specification-Version: 1.1
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Version: @jaspic.spec.version@
+Specification-Vendor: Eclipse Foundation
 Implementation-Title: jakarta.security.auth.message
-Implementation-Version: 1.1.@jaspic.revision@
-Implementation-Vendor: Apache Software Foundation
\ No newline at end of file
+Implementation-Version: @jaspic.spec.version@.@jaspic.revision@
+Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/jsp-api.jar.manifest 
b/res/META-INF/jsp-api.jar.manifest
index b21c7f1..8156ef2 100644
--- a/res/META-INF/jsp-api.jar.manifest
+++ b/res/META-INF/jsp-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/servlet/jsp/
-Specification-Title: Java API for JavaServer Pages
-Specification-Version: 2.3
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Title: Jakarta Server Pages
+Specification-Version: @jsp.spec.version@
+Specification-Vendor: Eclipse Foundation
 Implementation-Title: jakarta.servlet.jsp
-Implementation-Version: 2.3.@jsp.revision@
+Implementation-Version: @jsp.spec.version@.@jsp.revision@
 Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/servlet-api.jar.manifest 
b/res/META-INF/servlet-api.jar.manifest
index 0e2b172..3e7733e 100644
--- a/res/META-INF/servlet-api.jar.manifest
+++ b/res/META-INF/servlet-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/servlet/
-Specification-Title: Java API for Servlets
-Specification-Version: 4.0
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Title: Jakarta Servlet
+Specification-Version: @servlet.spec.version@
+Specification-Vendor: Eclipse Foundation
 Implementation-Title: jakarta.servlet
-Implementation-Version: 4.0.@servlet.revision@
+Implementation-Version:

[tomcat] 13/18: Update powered by header

2020-01-13 Thread markt

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

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

commit c9fa0300e899a61fc0f759e9797c5760360542f8
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:31:56 2020 +

Update powered by header
---
 java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java 
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 0db815b..1a1430b 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -67,7 +67,7 @@ public class CoyoteAdapter implements Adapter {
 
 // -- Constants
 
-private static final String POWERED_BY = "Servlet/4.0 JSP/2.3 " +
+private static final String POWERED_BY = "Servlet/5.0 JSP/3.0 " +
 "(" + ServerInfo.getServerInfo() + " Java/" +
 System.getProperty("java.vm.vendor") + "/" +
 System.getProperty("java.runtime.version") + ")";


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

[tomcat] 07/18: Rename "javax.persistence." to "jakarta.persistence."

2020-01-13 Thread markt

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

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

commit d6f305e87360be9a0c32cb9837132bef00edb92a
Author: Mark Thomas 
AuthorDate: Thu Nov 28 13:50:39 2019 +

Rename "javax.persistence.*" to "jakarta.persistence.*"
---
 java/{javax => jakarta}/persistence/PersistenceContext.java | 2 +-
 java/{javax => jakarta}/persistence/PersistenceContextType.java | 2 +-
 java/{javax => jakarta}/persistence/PersistenceContexts.java| 2 +-
 java/{javax => jakarta}/persistence/PersistenceProperty.java| 2 +-
 java/{javax => jakarta}/persistence/PersistenceUnit.java| 2 +-
 java/{javax => jakarta}/persistence/PersistenceUnits.java   | 2 +-
 java/{javax => jakarta}/persistence/SynchronizationType.java| 2 +-
 java/org/apache/catalina/core/DefaultInstanceManager.java   | 6 +++---
 res/checkstyle/jakarta-import-control.xml   | 3 +++
 res/checkstyle/javax-import-control.xml | 3 ---
 res/checkstyle/org-import-control.xml   | 8 
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/java/javax/persistence/PersistenceContext.java 
b/java/jakarta/persistence/PersistenceContext.java
similarity index 97%
rename from java/javax/persistence/PersistenceContext.java
rename to java/jakarta/persistence/PersistenceContext.java
index e273953..f53b6b2 100644
--- a/java/javax/persistence/PersistenceContext.java
+++ b/java/jakarta/persistence/PersistenceContext.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.persistence;
+package jakarta.persistence;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/javax/persistence/PersistenceContextType.java 
b/java/jakarta/persistence/PersistenceContextType.java
similarity index 96%
rename from java/javax/persistence/PersistenceContextType.java
rename to java/jakarta/persistence/PersistenceContextType.java
index 8b287fe..49e4120 100644
--- a/java/javax/persistence/PersistenceContextType.java
+++ b/java/jakarta/persistence/PersistenceContextType.java
@@ -16,7 +16,7 @@
  */
 
 
-package javax.persistence;
+package jakarta.persistence;
 
 public enum PersistenceContextType {
 TRANSACTION,
diff --git a/java/javax/persistence/PersistenceContexts.java 
b/java/jakarta/persistence/PersistenceContexts.java
similarity index 97%
rename from java/javax/persistence/PersistenceContexts.java
rename to java/jakarta/persistence/PersistenceContexts.java
index cd9abf2..7e3d01f 100644
--- a/java/javax/persistence/PersistenceContexts.java
+++ b/java/jakarta/persistence/PersistenceContexts.java
@@ -16,7 +16,7 @@
  */
 
 
-package javax.persistence;
+package jakarta.persistence;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/javax/persistence/PersistenceProperty.java 
b/java/jakarta/persistence/PersistenceProperty.java
similarity index 97%
rename from java/javax/persistence/PersistenceProperty.java
rename to java/jakarta/persistence/PersistenceProperty.java
index 20a42c5..46943a5 100644
--- a/java/javax/persistence/PersistenceProperty.java
+++ b/java/jakarta/persistence/PersistenceProperty.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.persistence;
+package jakarta.persistence;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/java/javax/persistence/PersistenceUnit.java 
b/java/jakarta/persistence/PersistenceUnit.java
similarity index 97%
rename from java/javax/persistence/PersistenceUnit.java
rename to java/jakarta/persistence/PersistenceUnit.java
index 9f34198..cdbee56 100644
--- a/java/javax/persistence/PersistenceUnit.java
+++ b/java/jakarta/persistence/PersistenceUnit.java
@@ -16,7 +16,7 @@
  */
 
 
-package javax.persistence;
+package jakarta.persistence;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/javax/persistence/PersistenceUnits.java 
b/java/jakarta/persistence/PersistenceUnits.java
similarity index 97%
rename from java/javax/persistence/PersistenceUnits.java
rename to java/jakarta/persistence/PersistenceUnits.java
index 34084ac..991d83f 100644
--- a/java/javax/persistence/PersistenceUnits.java
+++ b/java/jakarta/persistence/PersistenceUnits.java
@@ -16,7 +16,7 @@
  */
 
 
-package javax.persistence;
+package jakarta.persistence;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/javax/persistence/SynchronizationType.java 
b/java/jakarta/persistence/SynchronizationType.java
similarity index 96%
rename from java/javax/persistence/SynchronizationType.java
rename to java/jakarta/persistence/SynchronizationType.java
index ea55b05..b1d5c1a 100644
---

[tomcat] 05/18: Disable tests that depend on JSTL since it is not Jakarta EE compatible

2020-01-13 Thread markt

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

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

commit d96186c80860b542e064645c4dbaa37d3cfcdf8e
Author: Mark Thomas 
AuthorDate: Thu Nov 28 09:57:24 2019 +

Disable tests that depend on JSTL since it is not Jakarta EE compatible
---
 test/jakarta/el/TestCompositeELResolver.java | 2 ++
 test/org/apache/el/TestELInJsp.java  | 3 +++
 test/org/apache/jasper/compiler/TestParser.java  | 3 +++
 test/org/apache/jasper/tagplugins/jstl/core/TestSet.java | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/test/jakarta/el/TestCompositeELResolver.java 
b/test/jakarta/el/TestCompositeELResolver.java
index d2bbc37..7be20eb 100644
--- a/test/jakarta/el/TestCompositeELResolver.java
+++ b/test/jakarta/el/TestCompositeELResolver.java
@@ -19,6 +19,7 @@ package jakarta.el;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -26,6 +27,7 @@ import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestCompositeELResolver extends TomcatBaseTest {
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug50408() throws Exception {
 getTomcatInstanceTestWebapp(true, true);
diff --git a/test/org/apache/el/TestELInJsp.java 
b/test/org/apache/el/TestELInJsp.java
index 66c0f3d..9a5e6fa 100644
--- a/test/org/apache/el/TestELInJsp.java
+++ b/test/org/apache/el/TestELInJsp.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 import javax.servlet.DispatcherType;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.Wrapper;
@@ -394,6 +395,7 @@ public class TestELInJsp extends TomcatBaseTest {
 assertEcho(result, "05-Hello JUnit from Tomcat");
 }
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug56029() throws Exception {
 getTomcatInstanceTestWebapp(true, true);
@@ -407,6 +409,7 @@ public class TestELInJsp extends TomcatBaseTest {
 }
 
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug56147() throws Exception {
 getTomcatInstanceTestWebapp(true, true);
diff --git a/test/org/apache/jasper/compiler/TestParser.java 
b/test/org/apache/jasper/compiler/TestParser.java
index c9035be..010841d 100644
--- a/test/org/apache/jasper/compiler/TestParser.java
+++ b/test/org/apache/jasper/compiler/TestParser.java
@@ -17,6 +17,7 @@
 package org.apache.jasper.compiler;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -233,6 +234,7 @@ public class TestParser extends TomcatBaseTest {
  || result.contains("55"));
 }
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug56265() throws Exception {
 getTomcatInstanceTestWebapp(true, true);
@@ -252,6 +254,7 @@ public class TestParser extends TomcatBaseTest {
 result.contains("[4: [data-test]: [window.alert('Hello 'World 
<&>'!')]]"));
 }
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug56334And56561() throws Exception {
 getTomcatInstanceTestWebapp(true, true);
diff --git a/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java 
b/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
index 1a66978..7f6278f 100644
--- a/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
+++ b/test/org/apache/jasper/tagplugins/jstl/core/TestSet.java
@@ -19,12 +19,14 @@ package org.apache.jasper.tagplugins.jstl.core;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.apache.tomcat.util.buf.ByteChunk;
 
 public class TestSet extends AbstractTestTag {
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug54011() throws Exception {
 ByteChunk res = new ByteChunk();
@@ -39,6 +41,7 @@ public class TestSet extends AbstractTestTag {
 }
 
 
+@Ignore // Jakarta EE / JSTL
 @Test
 public void testBug54338() throws Exception {
 ByteChunk res = new ByteChunk();


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

[tomcat] 06/18: Rename "javax.mail." to "jakarta.mail."

2020-01-13 Thread markt

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

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

commit 8cd528df42c420f1859c5075664218d6a2618166
Author: Mark Thomas 
AuthorDate: Thu Nov 28 13:44:50 2019 +

Rename "javax.mail.*" to "jakarta.mail.*"
---
 java/{javax => jakarta}/mail/Authenticator.java |  2 +-
 java/{javax => jakarta}/mail/PasswordAuthentication.java|  2 +-
 java/{javax => jakarta}/mail/Session.java   |  2 +-
 java/{javax => jakarta}/mail/internet/InternetAddress.java  |  2 +-
 java/{javax => jakarta}/mail/internet/MimeMessage.java  |  4 ++--
 java/{javax => jakarta}/mail/internet/MimePart.java |  2 +-
 .../mail/internet/MimePartDataSource.java   |  2 +-
 java/org/apache/catalina/startup/WebAnnotationSet.java  |  2 +-
 java/org/apache/naming/factory/MailSessionFactory.java  | 11 ++-
 java/org/apache/naming/factory/ResourceFactory.java |  4 ++--
 java/org/apache/naming/factory/SendMailFactory.java | 13 +++--
 res/checkstyle/jakarta-import-control.xml   |  3 +++
 res/checkstyle/javax-import-control.xml |  3 ---
 res/checkstyle/org-import-control.xml   |  2 +-
 webapps/docs/config/systemprops.xml |  4 ++--
 webapps/docs/jndi-resources-howto.xml   | 12 ++--
 16 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/java/javax/mail/Authenticator.java 
b/java/jakarta/mail/Authenticator.java
similarity index 97%
rename from java/javax/mail/Authenticator.java
rename to java/jakarta/mail/Authenticator.java
index 78df841..6586675 100644
--- a/java/javax/mail/Authenticator.java
+++ b/java/jakarta/mail/Authenticator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.mail;
+package jakarta.mail;
 
 public class Authenticator {
 protected PasswordAuthentication getPasswordAuthentication() {
diff --git a/java/javax/mail/PasswordAuthentication.java 
b/java/jakarta/mail/PasswordAuthentication.java
similarity index 97%
rename from java/javax/mail/PasswordAuthentication.java
rename to java/jakarta/mail/PasswordAuthentication.java
index d5d9411..7be7b29 100644
--- a/java/javax/mail/PasswordAuthentication.java
+++ b/java/jakarta/mail/PasswordAuthentication.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.mail;
+package jakarta.mail;
 
 @SuppressWarnings("unused") // Dummy implementation
 public class PasswordAuthentication {
diff --git a/java/javax/mail/Session.java b/java/jakarta/mail/Session.java
similarity index 98%
rename from java/javax/mail/Session.java
rename to java/jakarta/mail/Session.java
index a95a11b..d638f81 100644
--- a/java/javax/mail/Session.java
+++ b/java/jakarta/mail/Session.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.mail;
+package jakarta.mail;
 
 import java.util.Properties;
 
diff --git a/java/javax/mail/internet/InternetAddress.java 
b/java/jakarta/mail/internet/InternetAddress.java
similarity index 96%
rename from java/javax/mail/internet/InternetAddress.java
rename to java/jakarta/mail/internet/InternetAddress.java
index 4daa35d..aa1ce38 100644
--- a/java/javax/mail/internet/InternetAddress.java
+++ b/java/jakarta/mail/internet/InternetAddress.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.mail.internet;
+package jakarta.mail.internet;
 
 @SuppressWarnings("unused") // Dummy implementation
 public class InternetAddress {
diff --git a/java/javax/mail/internet/MimeMessage.java 
b/java/jakarta/mail/internet/MimeMessage.java
similarity index 95%
rename from java/javax/mail/internet/MimeMessage.java
rename to java/jakarta/mail/internet/MimeMessage.java
index 2587730..08cdb80 100644
--- a/java/javax/mail/internet/MimeMessage.java
+++ b/java/jakarta/mail/internet/MimeMessage.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.mail.internet;
+package jakarta.mail.internet;
 
-import javax.mail.Session;
+import jakarta.mail.Session;
 
 @SuppressWarnings("unused") // Dummy implementation
 public class MimeMessage implements MimePart {
diff --git a/java/javax/mail/internet/MimePart.java 
b/java/jakarta/mail/internet/MimePart.java
similarity index 96%
rename from java/javax/mail/internet/MimePart.java
rename to java/jakarta/mail/internet/MimePart.java
index 4b57b20..7591634 100644
--- a/java/javax/mail/internet/MimePart.java
+++ b/java/jakarta/mail/internet/MimePart.java
@@ -14,7 +14,7 @@
  * See the

[tomcat] 10/18: Rename "javax.transaction" to "jakarta.transation"

2020-01-13 Thread markt

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

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

commit 6c3e9285db2ca16e1a2f1e99a653916b91bd2c5a
Author: Mark Thomas 
AuthorDate: Thu Nov 28 19:16:36 2019 +

Rename "javax.transaction" to "jakarta.transation"
---
 .../transaction/HeuristicCommitException.java   |  2 +-
 .../transaction/HeuristicMixedException.java|  2 +-
 .../transaction/HeuristicRollbackException.java |  2 +-
 .../transaction/InvalidTransactionException.java|  2 +-
 .../transaction/NotSupportedException.java  |  2 +-
 java/{javax => jakarta}/transaction/RollbackException.java  |  2 +-
 java/{javax => jakarta}/transaction/Status.java |  2 +-
 java/{javax => jakarta}/transaction/Synchronization.java|  2 +-
 java/{javax => jakarta}/transaction/SystemException.java|  2 +-
 java/{javax => jakarta}/transaction/Transaction.java|  2 +-
 java/{javax => jakarta}/transaction/TransactionManager.java |  2 +-
 .../transaction/TransactionRequiredException.java   |  2 +-
 .../transaction/TransactionRolledbackException.java |  2 +-
 .../transaction/TransactionSynchronizationRegistry.java |  2 +-
 java/{javax => jakarta}/transaction/UserTransaction.java|  2 +-
 java/org/apache/catalina/startup/WebAnnotationSet.java  |  2 +-
 java/org/apache/naming/TransactionRef.java  |  2 +-
 .../tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java   |  5 +++--
 .../dbcp/dbcp2/managed/DataSourceXAConnectionFactory.java   |  5 +++--
 .../tomcat/dbcp/dbcp2/managed/LocalXAConnectionFactory.java |  3 ++-
 .../tomcat/dbcp/dbcp2/managed/TransactionContext.java   | 13 +++--
 .../tomcat/dbcp/dbcp2/managed/TransactionRegistry.java  |  9 +
 res/checkstyle/jakarta-import-control.xml   |  4 
 res/checkstyle/javax-import-control.xml |  3 ---
 res/checkstyle/org-import-control.xml   |  3 ++-
 25 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/java/javax/transaction/HeuristicCommitException.java 
b/java/jakarta/transaction/HeuristicCommitException.java
similarity index 97%
rename from java/javax/transaction/HeuristicCommitException.java
rename to java/jakarta/transaction/HeuristicCommitException.java
index e0c1294..049993a 100644
--- a/java/javax/transaction/HeuristicCommitException.java
+++ b/java/jakarta/transaction/HeuristicCommitException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.transaction;
+package jakarta.transaction;
 
 public class HeuristicCommitException extends java.lang.Exception {
 
diff --git a/java/javax/transaction/HeuristicMixedException.java 
b/java/jakarta/transaction/HeuristicMixedException.java
similarity index 97%
rename from java/javax/transaction/HeuristicMixedException.java
rename to java/jakarta/transaction/HeuristicMixedException.java
index 0910bb7..ba2523a 100644
--- a/java/javax/transaction/HeuristicMixedException.java
+++ b/java/jakarta/transaction/HeuristicMixedException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.transaction;
+package jakarta.transaction;
 
 public class HeuristicMixedException extends java.lang.Exception {
 
diff --git a/java/javax/transaction/HeuristicRollbackException.java 
b/java/jakarta/transaction/HeuristicRollbackException.java
similarity index 97%
rename from java/javax/transaction/HeuristicRollbackException.java
rename to java/jakarta/transaction/HeuristicRollbackException.java
index f09a700..6e059f0 100644
--- a/java/javax/transaction/HeuristicRollbackException.java
+++ b/java/jakarta/transaction/HeuristicRollbackException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.transaction;
+package jakarta.transaction;
 
 public class HeuristicRollbackException extends java.lang.Exception {
 
diff --git a/java/javax/transaction/InvalidTransactionException.java 
b/java/jakarta/transaction/InvalidTransactionException.java
similarity index 97%
rename from java/javax/transaction/InvalidTransactionException.java
rename to java/jakarta/transaction/InvalidTransactionException.java
index d29d5aa..f75b185 100644
--- a/java/javax/transaction/InvalidTransactionException.java
+++ b/java/jakarta/transaction/InvalidTransactionException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.transaction;
+package jakarta.transaction;
 
 public class InvalidTransactionException extends java.rmi.RemoteException {
 
diff --git a/java/javax/transaction/NotSupportedException.java

[tomcat] 02/18: Rename "javax.annotation." to "jakarta.annotation."

2020-01-13 Thread markt

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

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

commit 4ed2dc843a59ef204f93082d610f8d6f547051ab
Author: Mark Thomas 
AuthorDate: Wed Nov 27 23:25:20 2019 +

Rename "javax.annotation.*" to "jakarta.annotation.*"
---
 build.xml  | 10 --
 java/{javax => jakarta}/annotation/Generated.java  |  2 +-
 .../{javax => jakarta}/annotation/ManagedBean.java |  2 +-
 .../annotation/PostConstruct.java  |  2 +-
 java/{javax => jakarta}/annotation/PreDestroy.java |  2 +-
 java/{javax => jakarta}/annotation/Priority.java   |  2 +-
 java/{javax => jakarta}/annotation/Resource.java   |  2 +-
 java/{javax => jakarta}/annotation/Resources.java  |  2 +-
 .../annotation/security/DeclareRoles.java  |  2 +-
 .../annotation/security/DenyAll.java   |  2 +-
 .../annotation/security/PermitAll.java |  2 +-
 .../annotation/security/RolesAllowed.java  |  2 +-
 .../annotation/security/RunAs.java |  2 +-
 .../annotation/sql/DataSourceDefinition.java   |  2 +-
 .../annotation/sql/DataSourceDefinitions.java  |  2 +-
 .../catalina/core/DefaultInstanceManager.java  |  7 ++--
 .../apache/catalina/startup/WebAnnotationSet.java  |  9 +++---
 modules/cxf/pom.xml|  2 +-
 res/META-INF/annotations-api.jar.manifest  |  4 +--
 res/bnd/annotations-api.jar.tmp.bnd|  6 ++--
 res/checkstyle/checkstyle.xml  |  2 +-
 res/checkstyle/jakarta-checkstyle.xml  | 37 ++
 ...port-control.xml => jakarta-import-control.xml} |  4 +--
 res/checkstyle/javax-import-control.xml|  2 +-
 res/checkstyle/org-import-control.xml  |  8 ++---
 .../startup/TesterServletWithAnnotations.java  |  3 +-
 .../startup/TesterServletWithLifeCycleMethods.java |  5 +--
 test/webapp/annotations.jsp|  2 +-
 28 files changed, 88 insertions(+), 41 deletions(-)

diff --git a/build.xml b/build.xml
index 4141d0a..133fb74 100644
--- a/build.xml
+++ b/build.xml
@@ -327,7 +327,7 @@
   
   
   
-
+
   
 
   
@@ -627,6 +627,12 @@
 
   
 
+
+
+  
+
+  
+
 
 
   
@@ -1879,7 +1885,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 
   
-
 
 
-
javax.annotation:javax.annotation-api
+
jakarta.annotation:jakarta.annotation-api

javax.el:*

javax.enterprise:cdi-api

javax.inject:*
diff --git a/res/META-INF/annotations-api.jar.manifest 
b/res/META-INF/annotations-api.jar.manifest
index d813b80..4b43993 100644
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -2,8 +2,8 @@ Manifest-version: 1.0
 X-Compile-Source-JDK: @source.jdk@
 X-Compile-Target-JDK: @target.jdk@
 
-Name: javax/annotation/
-Implementation-Title: javax.annotation
+Name: jakarta/annotation/
+Implementation-Title: jakarta.annotation
 Implementation-Vendor: Apache Software Foundation
 Implementation-Version: 1.3.@annotation.revision@
 Specification-Title: Common Annotations
diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index 0a53313..032eb3f 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -16,6 +16,6 @@ Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
 Bundle-Version: @VERSION@
 Export-Package: \
-javax.annotation,\
-javax.annotation.security,\
-javax.annotation.sql
+jakarta.annotation,\
+jakarta.annotation.security,\
+jakarta.annotation.sql
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 711212e..c0d687c 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -70,7 +70,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/checkstyle/jakarta-checkstyle.xml 
b/res/checkstyle/jakarta-checkstyle.xml
new file mode 100644
index 000..e9115ad
--- /dev/null
+++ b/res/checkstyle/jakarta-checkstyle.xml
@@ -0,0 +1,37 @@
+
+
+http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+
+  
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+  
+
diff --git a/res/checkstyle/javax-import-control.xml 
b/res/checkstyle/jakarta-import-control.xml
similarity index 96%
copy from res/checkstyle/javax-import-control.xml
copy to res/checkstyle/jakarta-import-control.xml
index 010f511..26ec8b0 100644
---

[tomcat] 03/18: Rename javax.ejb.* to jakarta.ejb.*

2020-01-13 Thread markt

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

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

commit c91bf7fcaf3d2b94d6940687335576de33f05134
Author: Mark Thomas 
AuthorDate: Wed Nov 27 23:31:41 2019 +

Rename javax.ejb.* to jakarta.ejb.*
---
 java/{javax => jakarta}/ejb/EJB.java   |  2 +-
 java/{javax => jakarta}/ejb/EJBs.java  |  2 +-
 .../catalina/core/DefaultInstanceManager.java  |  4 +-
 java/org/apache/naming/factory/EjbFactory.java |  2 +-
 res/checkstyle/jakarta-import-control.xml  | 50 +-
 res/checkstyle/javax-import-control.xml|  6 ---
 res/checkstyle/org-import-control.xml  |  8 ++--
 7 files changed, 11 insertions(+), 63 deletions(-)

diff --git a/java/javax/ejb/EJB.java b/java/jakarta/ejb/EJB.java
similarity index 98%
rename from java/javax/ejb/EJB.java
rename to java/jakarta/ejb/EJB.java
index 2b16782..65f9e8f 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/jakarta/ejb/EJB.java
@@ -16,7 +16,7 @@
  */
 
 
-package javax.ejb;
+package jakarta.ejb;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/javax/ejb/EJBs.java b/java/jakarta/ejb/EJBs.java
similarity index 98%
rename from java/javax/ejb/EJBs.java
rename to java/jakarta/ejb/EJBs.java
index b716915..4a9321c 100644
--- a/java/javax/ejb/EJBs.java
+++ b/java/jakarta/ejb/EJBs.java
@@ -16,7 +16,7 @@
  */
 
 
-package javax.ejb;
+package jakarta.ejb;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java 
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 18c98d4..3f46ee1 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -35,7 +35,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.ejb.EJB;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.persistence.PersistenceContext;
@@ -45,6 +44,7 @@ import javax.xml.ws.WebServiceRef;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
 
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Globals;
@@ -75,7 +75,7 @@ public class DefaultInstanceManager implements 
InstanceManager {
 static {
 Class clazz = null;
 try {
-clazz = Class.forName("javax.ejb.EJB");
+clazz = Class.forName("jakarta.ejb.EJB");
 } catch (ClassNotFoundException cnfe) {
 // Expected
 }
diff --git a/java/org/apache/naming/factory/EjbFactory.java 
b/java/org/apache/naming/factory/EjbFactory.java
index 4f593a5..0820e16 100644
--- a/java/org/apache/naming/factory/EjbFactory.java
+++ b/java/org/apache/naming/factory/EjbFactory.java
@@ -41,7 +41,7 @@ public class EjbFactory extends FactoryBase {
 
 ObjectFactory factory;
 String javaxEjbFactoryClassName = System.getProperty(
-"javax.ejb.Factory", Constants.OPENEJB_EJB_FACTORY);
+"jakarta.ejb.Factory", Constants.OPENEJB_EJB_FACTORY);
 try {
 factory = (ObjectFactory)
 
Class.forName(javaxEjbFactoryClassName).getConstructor().newInstance();
diff --git a/res/checkstyle/jakarta-import-control.xml 
b/res/checkstyle/jakarta-import-control.xml
index 26ec8b0..580ce0e 100644
--- a/res/checkstyle/jakarta-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -25,53 +25,7 @@
 
   
   
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-
-
-
-
-
-
-
-
-
-
-  
-
-
-  
-
-  
-
-  
-  
-
-
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
+
   
+
 
\ No newline at end of file
diff --git a/res/checkstyle/javax-import-control.xml 
b/res/checkstyle/javax-import-control.xml
index 3ba050d..b6faa80 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -21,12 +21,6 @@
 
 
   
-  
-
-  
-  
-
-  
   
 
   
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index 269e160..83605cd 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -37,7 +37,7 @@
   
   
 
-
+
 
 
 
@@ -51,7 +51,7 @@
   
   
   
-  
+  
   
   
   
@@ -60,7 +60,7 @@
 
 
   
-  
+  
   
   
   
@@ -73,7 +73,7 @@
 
 
   
-  
+  
   
   
   


-
To unsubscribe, e-mail:

[tomcat] 01/18: First pass at version updates for Tomcat 10.0.0.x

2020-01-13 Thread markt

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

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

commit fabe5e7aedb8c5b90ae0e924a060384d138e3976
Author: Mark Thomas 
AuthorDate: Mon Jan 13 11:00:04 2020 +

First pass at version updates for Tomcat 10.0.0.x
---
 build.properties.default |  4 +--
 build.xml| 90 +---
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ffe38de..8986247 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -23,9 +23,9 @@
 # -
 
 # - Version Control Flags -
-version.major=9
+version.major=10
 version.minor=0
-version.build=31
+version.build=0
 version.patch=0
 version.suffix=-dev
 
diff --git a/build.xml b/build.xml
index fbe0311..4141d0a 100644
--- a/build.xml
+++ b/build.xml
@@ -44,22 +44,26 @@
   
 
   
-  
+  
   
   
 
   
   
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -90,7 +94,7 @@
   
   
 
-  
+  
   
   
   
@@ -766,14 +770,14 @@
   
 
   
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
 
 
-
+
 
 
-
+
 
   notice="${tomcat.manifests}/servlet-api.jar.notice"
   license="${tomcat.manifests}/servlet-api.jar.license" />
 
-
+
 
   notice="${tomcat.manifests}/jsp-api.jar.notice"
   license="${tomcat.manifests}/jsp-api.jar.license" />
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+

[tomcat] branch master updated (93ca69c -> 782a2ba)

2020-01-13 Thread 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 93ca69c  Tab police
 new fabe5e7  First pass at version updates for Tomcat 10.0.0.x
 new 4ed2dc8  Rename "javax.annotation.*" to "jakarta.annotation.*"
 new c91bf7f  Rename javax.ejb.* to jakarta.ejb.*
 new fddd4fd  Rename javax.el.* to jakarta.el.*
 new d96186c  Disable tests that depend on JSTL since it is not Jakarta EE 
compatible
 new 8cd528d  Rename "javax.mail.*" to "jakarta.mail.*"
 new d6f305e  Rename "javax.persistence.*" to "jakarta.persistence.*"
 new 35dc7b9  Rename "javax.security.auth.message" to 
"jakarta.security.auth.message"
 new ab35110  Rename "javax.servlet.*" to "jakartax.servlet.*" and fix tests
 new 6c3e928  Rename "javax.transaction" to "jakarta.transation"
 new 8f9e7bc  Rename "javax.websocket.*" to "jakarta.websocket.*"
 new aade5ed  Update spec versions in MANIFESTs and parameterise from build 
script
 new c9fa030  Update powered by header
 new 05da26a  Update Servlet version returned by API
 new 4f86530  Update referenced version in comments
 new 7d4b08c  Update JSP version in code to 3.0
 new 9cd22e9  Clear out the changelog for 10.0.0.x
 new 782a2ba  Update more version references

The 18 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   |4 +-
 build.xml  |  145 +-
 java/jakarta/annotation/Generated.java |   37 +
 java/jakarta/annotation/ManagedBean.java   |   31 +
 java/jakarta/annotation/PostConstruct.java |   33 +
 java/jakarta/annotation/PreDestroy.java|   33 +
 java/jakarta/annotation/Priority.java  |   33 +
 java/jakarta/annotation/Resource.java  |   51 +
 java/jakarta/annotation/Resources.java |   33 +
 java/jakarta/annotation/security/DeclareRoles.java |   33 +
 java/jakarta/annotation/security/DenyAll.java  |   33 +
 java/jakarta/annotation/security/PermitAll.java|   33 +
 java/jakarta/annotation/security/RolesAllowed.java |   33 +
 java/jakarta/annotation/security/RunAs.java|   33 +
 .../annotation/sql/DataSourceDefinition.java   |   48 +
 .../annotation/sql/DataSourceDefinitions.java  |   31 +
 java/jakarta/ejb/EJB.java  |   37 +
 java/jakarta/ejb/EJBs.java |   31 +
 java/jakarta/el/ArrayELResolver.java   |  150 +
 java/jakarta/el/BeanELResolver.java|  372 +
 java/jakarta/el/BeanNameELResolver.java|  155 +
 java/jakarta/el/BeanNameResolver.java  |   91 +
 java/jakarta/el/CompositeELResolver.java   |  233 +
 java/jakarta/el/ELClass.java   |   33 +
 java/jakarta/el/ELContext.java |  306 +
 java/jakarta/el/ELContextEvent.java|   37 +
 java/jakarta/el/ELContextListener.java |   28 +
 java/jakarta/el/ELException.java   |   68 +
 java/jakarta/el/ELManager.java |   90 +
 java/jakarta/el/ELProcessor.java   |  362 +
 java/jakarta/el/ELResolver.java|  142 +
 java/jakarta/el/EvaluationListener.java|   55 +
 java/jakarta/el/Expression.java|   39 +
 java/jakarta/el/ExpressionFactory.java |  432 +
 java/jakarta/el/FunctionMapper.java|   37 +
 java/jakarta/el/ImportHandler.java |  492 ++
 java/jakarta/el/Jre9Compat.java|   83 +
 java/jakarta/el/JreCompat.java |   73 +
 java/jakarta/el/LambdaExpression.java  |   93 +
 java/jakarta/el/ListELResolver.java|  155 +
 java/{javax => jakarta}/el/LocalStrings.properties |0
 .../el/LocalStrings_cs.properties  |0
 .../el/LocalStrings_de.properties  |0
 .../el/LocalStrings_es.properties  |0
 .../el/LocalStrings_fr.properties  |0
 .../el/LocalStrings_ja.properties  |0
 .../el/LocalStrings_ko.properties  |0
 .../el/LocalStrings_pt_BR.properties   |0
 .../el/LocalStrings_zh_CN.properties   |0
 java/jakarta/el/MapELResolver.java |  136 +
 java/jakarta/el/MethodExpression.java  |   84 +
 java/jakarta/el/MethodInfo.java|   44 +
 java/jakarta/el/MethodNotFoundException.java   |   38 +
 java/jakarta/el/PropertyNotFoundException.java |   38 +
 java/jakarta/el/PropertyNotWritableException.java  |   38 +

Re: Creating 9.0.x branch

2020-01-13 Thread Mark Thomas

On 13/01/2020 10:53, Rémy Maucherat wrote:
> On Mon, Jan 13, 2020 at 11:28 AM Mark Thomas  > wrote:
> 
> Hi,
> 
> I plan to do this shortly.
> 
> Once this is done, there will be a bunch of stuff to do. I plan to start
> with the version number and then the javax -> jakarta package migration.
> Other tasks include:
> - Updating BuildBot and Gump
> - Creating a Bugzilla project
> - Removing deprecated code scheduled for removal in Tomcat 10
> - Most things on the TODO list
> - Update the website
> - and a bunch of things I have probably forgotten.
> 
> Note: The minimum Java version for Jakarta EE 9 remains Java 8 so
>       anything planned for Tomcat 10 that needs Java 9+ will have to
>       be pushed back
> 
> 
> +1
> I agree the jakarta rename should go first so I'll wait for it to be
> done before I do any of the items on the todo.

Thanks.

I still have a few things to update (e.g. docs). I should be good to
commit shortly.

One thing I noticed is that we don't have any updated XML schemas. I
don't recall seeing them being discussed anywhere. I'll chase that up
over at Eclipse.

Mark

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

[tomcat] branch 9.0.x updated: Tab police

2020-01-13 Thread 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 3bc7fe8  Tab police
3bc7fe8 is described below

commit 3bc7fe846303a08099a659fa7def619879e4f015
Author: Mark Thomas 
AuthorDate: Mon Jan 13 10:38:45 2020 +

Tab police
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index b077bae..09584fc 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -485,7 +485,7 @@ public class DeltaManager extends ClusterManagerBase{
 
 @Override
 public void changeSessionId(Session session) {
-   rotateSessionId(session);
+rotateSessionId(session);
 }
 
 @Override


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

[tomcat] branch master updated: Tab police

2020-01-13 Thread markt

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 93ca69c  Tab police
93ca69c is described below

commit 93ca69c06280ec2f4edc2220d97dff0a2de2f1c4
Author: Mark Thomas 
AuthorDate: Mon Jan 13 10:38:45 2020 +

Tab police
---
 java/org/apache/catalina/ha/session/DeltaManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java 
b/java/org/apache/catalina/ha/session/DeltaManager.java
index b077bae..09584fc 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -485,7 +485,7 @@ public class DeltaManager extends ClusterManagerBase{
 
 @Override
 public void changeSessionId(Session session) {
-   rotateSessionId(session);
+rotateSessionId(session);
 }
 
 @Override


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

[tomcat] branch 9.0.x created (now 52e01e4)

2020-01-13 Thread markt

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

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


  at 52e01e4  Boilerplate javadoc

No new revisions were added by this update.


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

Re: Creating 9.0.x branch

2020-01-13 Thread Rémy Maucherat

On Mon, Jan 13, 2020 at 11:28 AM Mark Thomas  wrote:

> Hi,
>
> I plan to do this shortly.
>
> Once this is done, there will be a bunch of stuff to do. I plan to start
> with the version number and then the javax -> jakarta package migration.
> Other tasks include:
> - Updating BuildBot and Gump
> - Creating a Bugzilla project
> - Removing deprecated code scheduled for removal in Tomcat 10
> - Most things on the TODO list
> - Update the website
> - and a bunch of things I have probably forgotten.
>
> Note: The minimum Java version for Jakarta EE 9 remains Java 8 so
>   anything planned for Tomcat 10 that needs Java 9+ will have to
>   be pushed back
>

+1
I agree the jakarta rename should go first so I'll wait for it to be done
before I do any of the items on the todo.

Rémy

[tomcat] branch 9.0.x created (now 52e01e4)

2020-01-13 Thread markt

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

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


  at 52e01e4  Boilerplate javadoc

No new revisions were added by this update.


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

Creating 9.0.x branch

2020-01-13 Thread Mark Thomas

Hi,

I plan to do this shortly.

Once this is done, there will be a bunch of stuff to do. I plan to start
with the version number and then the javax -> jakarta package migration.
Other tasks include:
- Updating BuildBot and Gump
- Creating a Bugzilla project
- Removing deprecated code scheduled for removal in Tomcat 10
- Most things on the TODO list
- Update the website
- and a bunch of things I have probably forgotten.

Note: The minimum Java version for Jakarta EE 9 remains Java 8 so
  anything planned for Tomcat 10 that needs Java 9+ will have to
  be pushed back

Mark

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

65 matches

Mail list logo