Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

r1809434 | rjung | 2017-09-23 16:45:48 +0200 (Sat, 23 Sep 2017) | 3 lines
Use the correct path when loading the JVMlogging.properties file for Java 9.
------------------------------------------------------------------------
r1806973 r1720196 | markt | 20172015-0912-01 1715 18:0405:45 +0200 0100 (Fri, 01 Sep 2017Tue, 15 Dec 2015) | 1 line
Java 9 allows us to be more selective with the JRE memory leak protectionMinor hack to get the unit tests passing on Java 9.

JarScanner requires more careful review in light of Java 9 modules.
------------------------------------------------------------------------
r1806932 r1692896 | markt | 20172015-0907-01 1327 17:1018:37 49 +0200 (Fri, 01 Sep 2017Mon, 27 Jul 2015) | 1 line
Add Java 9 support for JSPs

Back-ported for 8.5.x and 8.0.x. Can't back-port for 7.0.x as ECJ that supports Java 9 doesn't run on Java 6. Need to decide how to handle this.


Resolved

r1809434 | rjung | 2017-09-23 16:45:48 +0200 (Sat, 23 Sep 2017) | 3 lines 
Use the correct path when loading the JVMlogging.properties file for Java 9. 

Already back-ported.

-Update comment. We now have features that depend on Java 9.
------------------------------------------------------------------------ 
r1800617 r1806973 | markt | 2017-0709-03 1201 17:1904:46 45 +0200 (MonFri, 03 Jul 01 Sep 2017) | 1 line line 
Add necessary Java 9 configuration options to the startup scripts to prevent
warnings being generated on web application stop. allows us to be more selective with the JRE memory leak protection. 

Back-ports complete

------------------------------------------------------------------------ 
r1800614 r1806932 | markt | 2017-0709-03 1101 13:4810:01 37 +0200 (MonFri, 03 Jul 01 Sep 2017) | 1 line
Restore the local definition of the web service annotations since the JRE
provided versions are deprecated and Java 9 does not provide them by defaultline 
Update comment. We now have features that depend on Java 9.

Only applied to trunk.

------------------------------------------------------------------------ 
*r1791050 r1800617 | markt | 2017-0407-03 12 00:3619:01 46 +0200 (WedMon, 12 Apr 03 Jul 2017) | 1 line
Refactoring in preparation for Java 9. Refactor to avoid using some methods
that will be deprecated in Java 9 onwards. line 
Add necessary Java 9 configuration options to the startup scripts to prevent 
warnings being generated on web application stop. 

Back-ports complete

------------------------------------------------------------------------ 
r1791036 r1800614 | markt | 2017-0407-03 11 23:4048:13 01 +0200 (TueMon, 11 Apr 03 Jul 2017) | 1 line
Java 8 and Java 9 friendly alternative line 
Restore the local definition of the web service annotations since the JRE 
provided versions are deprecated and Java 9 does not provide them by default. 

Not back-ported as this change reverted a previous change.

------------------------------------------------------------------------ 
r1791032 *r1791050 | markt | 2017-04-11 2312 00:3436:50 01 +0200 (TueWed, 11 12 Apr 2017) | 1 line
Revert the Java 9 change that breaks in Java 8 line 
Refactoring in preparation for Java 9. Refactor to avoid using some methods 
that will be deprecated in Java 9 onwards. 

Back-ports complete

------------------------------------------------------------------------ 
r1791028 | markt | 2017-04-11 23:16:04 +0200 (Tue, 11 Apr 2017) | 1 line line 
Refactoring in preparation for Java 9. Refactor to avoid using some methods methods 
that will be deprecated in Java 9 onwards. 

Back-ports complete

------------------------------------------------------------------------ 
r1791027 | markt | 2017-04-11 22:40:36 +0200 (Tue, 11 Apr 2017) | 1 line line 
Refactoring in preparation for Java 9. Refactor to avoid using some methods methods 
that will be deprecated in Java 9 onwards. 

Back-ports complete

------------------------------------------------------------------------ 
*r1782857 r1791036 | markt | 2017-0204-13 2111 23:3940:14 13 +0100 0200 (MonTue, 13 Feb 11 Apr 2017) | 3 lines
Java 9 support for annotation scanningBased
on:http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html#jigsaw-2.6 1 line 
Java 8 and Java 9 friendly alternative

Back-ported to 8.5.x but no further as encoding detector has not been back-ported further.
------------------------------------------------------------------------ 
r1779932 r1791032 | markt | 2017-0104-11 23 15:1634:32 50 +0100 0200 (MonTue, 23 Jan 11 Apr 2017) | 2 lines
Remove unused code, effectively reverting 1779370 and 1779612.
Java 9 is now 1 line 
Revert the Java 9 change that breaks in Java 8 

Back-ported to 8.5.x but no further as encoding detector has not been back-ported further.

handled in other branch of if/else.
------------------------------------------------------------------------
r1779622 | remm ------- 
*r1782857 | markt | 2017-0102-20 1413 21:0939:56 14 +0100 (FriMon, 20 Jan 13 Feb 2017) | 1 line 3 lines 
Restore Java 9 direct byte buffer cleanup code, for now. The last way to
access it is through the private Unsafe singleton, which will likely stop
working at some point support for annotation scanningBased 
on:http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html#jigsaw-2.6 

------------------------------------------------------------------------ r1779612

r1779545 | markt | 2017-01-20 01:12:58:51 16 +0100 (Fri, 20 Jan 2017) | 1 line
Log message that includes command line option required 2 lines 
Adding ALPN support for JSSE with Java 9Enable ALPN and also, therefore, 
HTTP/2 for the NIO and NIO2 HTTP connectors when using the JSSE implementation 
for TLS when running on Java 9--------

Back-ported to 8.5.x but not further since 8.0.x and earlier do not support/require ALPN.

------------------------------------------------------------------------ 

r1779545 r1779313 | markt | 2017-01-20 0118 12:1223:16 17 +0100 (FriWed, 20 18 Jan 2017) | 2 lines
Adding ALPN support for JSSE with Java 9Enable ALPN and also, therefore,
HTTP/2 for the NIO and NIO2 HTTP connectors when using the JSSE implementation
for TLS when running on Java 91 line 
ws police (I need to configure my Java 9 dev environment correctly) 

Related to ALPN and handled as part of those back-ports.

------------------------------------------------------------------------ 
r1779370 r1778603 | markt | 2017-01-18 1913 15:4642:27 01 +0100 (WedFri, 18 13 Jan 2017) | 1 line
Java 9 can throw a Java 9 2 lines 
Adding ALPN support for JSSE with Java 9Add some plumbing to exposed the client 
requested application protocols to the method that configures the SSLEngine 

Back-ported to 8.5.x but not further since 8.0.x and earlier do not support/require ALPN.

- specific exception here (InaccessibleObjectException)
so tweak the handling
------------------------------------------------------------------------
r1779313 ----------- 
r1778575 | markt | 2017-01-18 1213 13:2350:17 01 +0100 (WedFri, 18 13 Jan 2017) | 1 line
ws police (I need to configure my Java 9 dev environment correctly) 2 lines 
Adding ALPN support for JSSE with Java 9Expand the data extracted from the TLS 
client hello to include the client requested ALPN names. 

Back-ported to 8.5.x but not further since 8.0.x and earlier do not support/require ALPN.

------------------------------------------------------------------------ 
r1778603 *r1766822 | markt | 20172016-0110-13 27 15:4259:01 41 +0100 0200 (Fri, 13 Jan 2017Thu, 27 Oct 2016) | 2 lines
Adding ALPN support for JSSE with lines 
ThreadLocal leak detection is now hitting Java 9 module issues. 
Catch the error and provide a useful error message if this happens. 

Back-ports complete.

-- Java 9Add some plumbing to exposed the client
requested application protocols to the method that configures the SSLEngine
------------------------------------------------------------------------ 
r1778575 r1779932 | markt | 2017-01-13 1323 15:5016:01 32 +0100 (FriMon, 13 23 Jan 2017) | 2 lines
Adding ALPN support for JSSE with Java 9Expand the data extracted from the TLS
client hello to include the client requested ALPN names.
-lines 
Remove unused code, effectively reverting 1779370 and 1779612. 
Java 9 is now handled in other branch of if/else. 

Back-ported to 8.5.x but no further as cleaner has not been back-ported further.

------------------------------------------------------------------------ 

*r1766822 r1779622 | markt remm | 20162017-1001-27 1520 14:5909:41 56 +0200 0100 (Thu, 27 Oct 2016Fri, 20 Jan 2017) | 2 lines
ThreadLocal leak detection is now hitting Java 9 module issues.
Catch the error and provide a useful error message if this happens.
----1 line 
Restore Java 9 direct byte buffer cleanup code, for now. The last way to 
access it is through the private Unsafe singleton, which will likely stop 
working at some point   

Back-ported to 8.5.x but no further as cleaner has not been back-ported further.

------------------------------------------------------------------------ 

*r1762753 r1779612 | remm markt | 20162017-0901-29 20 12:2058:27 51 +0200 0100 (Thu, 29 Sep 2016Fri, 20 Jan 2017) | 1 line 
Log message that includes command line
Java 9 compatibility for direct ByteBuffer cleaneroption required when running on Java 9 

Back-ported to 8.5.x but no further as cleaner has not been back-ported further.

------------------------------------------------------------------------ 

*r1758556 r1779370 | markt | 20162017-0801-31 1118 19:0946:47 27 +0200 0100 (Wed, 31 Aug 201618 Jan 2017) | 1 line
The latest Java 9 early access builds have fixed some more memory leaksline 
Java 9 can throw a Java 9 specific exception here (InaccessibleObjectException) 
so tweak the handling 

Back-ported to 8.5.x but no further as cleaner has not been back-ported further.

------------------------------------------------------------------------ 

*r1744323 r1762753 | markt remm | 2016-0509-17 2229 12:3620:54 27 +0200 (TueThu, 17 May 29 Sep 2016) | 1 line
Make checking for RMI Target memory leaks optional and log a warning if running
on Java 9 without the necessary command line options line 
Java 9 compatibility for direct ByteBuffer cleaner. 

Back-ported to 8.5.x but no further as cleaner has not been back-ported further.

------------------------------------------------------------------------ 
r1744149 *r1758556 | markt | 2016-0508-16 2331 11:3609:39 47 +0200 (MonWed, 16 May 31 Aug 2016) | 1 line
Tomcat needs to know if it is running on Java 9 since the reflection used by
the RMI memory leak detection will break unless the right command line option
is specified. line 
The latest Java 9 early access builds have fixed some more memory leaks. 

Back-ports complete

------------------------------------------------------------------------ r1739492

*r1744323 | markt | 2016-0405-16 2117 22:0836:19 54 +0200 (SatTue, 16 Apr 17 May 2016) | 2 lines
Java 9 The JRE class loaders no longer 1 line 
Make checking for RMI Target memory leaks optional and log a warning if running 
on Java 9 without the necessary command line options 

Back-ports complete extend URLClassLoader

------------------------------------------------------------------------ 
r1720196 r1744149 | markt | 20152016-1205-15 1816 23:0536:45 39 +0100 0200 (Tue, 15 Dec 2015Mon, 16 May 2016) | 1 line line 
Tomcat needs to know if it is running on Java 9 since the reflection used by 
the RMI memory leak detection will break unless the right command line option 
is specified. 

Back-ports complete

Minor hack to get the unit tests passing on Java 9.
------------------------------------------------------------------------
r1705771 r1739492 | markt | 20152016-0904-28 2216 21:4508:08 19 +0200 (Mon, 28 Sep 2015Sat, 16 Apr 2016) | 1 line
No need for LogManager when using stop. Can't use the Tomcat config anyway since
that would resut in two processes trying to write to the same file. This was also
causing an ugly stack trace on stop with Java 9 as it tried to find a logging
configuration to use. 2 lines 
Java 9 The JRE class loaders no longer extend URLClassLoader

Back-ports complete

------------------------------------------------------------------------ 
r1692896 r1705771 | markt | 2015-0709-27 1728 22:1845:49 08 +0200 (Mon, 27 Jul 28 Sep 2015) | 1 line
Add Java 9 support for JSPs line 
No need for LogManager when using stop. Can't use the Tomcat config anyway since 
that would resut in two processes trying to write to the same file. This was also 
causing an ugly stack trace on stop with Java 9 as it tried to find a logging 
configuration to use. 

No longer an issue after r1809434 and back-ports

------------------------------------------------------------------------ 
r1653475 r1633595 | markt | 20152014-0110-21 1122 13:3904:59 31 +0100 0200 (Wed, 21 Jan 2015) | 1 line
Remove use of java.endorsed.dirs since causes errors when starting with Java 9.
Users that need to can still use this via setenv.sh 22 Oct 2014) | 1 line 
Java 9 Javadoc issues 

Building with Java 9 generates warnings for Tomcat 8.0.x. 7.0.x always uses Java 7 for Javadoc. Added to optional further work.

------------------------------------------------------------------------ 

...

r1653475 | markt |

...

2015-

...

01-

...

21 11:

...

39:

...

59 +

...

0100 (Wed,

...

21 Jan 2015) | 1 line 
Remove use of java.endorsed.dirs since causes errors when starting with Java 9. 
Users that need to can still use this via setenv.sh 

Not back-ported because Rainer has provided an improved fix for this (which has been back-ported)

Optional additional tasks

Fix Javadoc warnings when building with Java 9 for all versions.
Refactor Tomact 7 build so Java 7 or later is used fro all parts if available.
Backport direct byte buffer clean-up to 8.0.x and 7.0.x