Commit Graph

2295 Commits

Author SHA1 Message Date
Greg Wilkins 44a1f1e1a6 Issue #1797 use platform for MR jars 2017-10-18 12:19:33 +11:00
Simone Bordet 91c11f5a64 Fixes #1888 - Implement cookie matching on Path attribute.
Implemented path matching following RFC 6265.
2017-10-11 17:39:06 +02:00
Simone Bordet a8d08df84f Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
Improved code that defaults trustStore parameters from the keyStore parameters.
2017-10-10 21:23:46 +02:00
Joakim Erdfelt ef65f083b8 Issue #901 - defaulting trustStoreType to keyStoreType if unspecified 2017-10-10 09:34:57 -07:00
Joakim Erdfelt 2eca7492dd Issue #901 - updating exception testing in SslContextFactoryTest 2017-10-10 09:29:25 -07:00
Joakim Erdfelt a6a09d586a Issue #901 - adding safetycheck for null storeType in CertificateUtils 2017-10-10 09:19:23 -07:00
Simone Bordet c87b714a46 Fixes #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
The default value of _trustStoreType is now null rather than "JKS", so
that existing logic will use the _keyStoreType also for the trust store.
2017-10-10 16:52:25 +02:00
Simone Bordet 2b847405e0 Code reformatting. 2017-10-10 16:52:25 +02:00
Simone Bordet c93360ad9c Issue #1851 - Improve insufficient thread warnings/errors.
Added ExecutorSizedThreadPool, a wrapper around JDK's ThreadPoolExecutor
that implements SizedThreadPool (and therefore returns a ThreadPoolBudget).

Deprecated ExecutorThreadPool, an older version of ExecutorSizedThreadPool.
2017-10-06 16:36:46 +02:00
Simone Bordet da72bff86a Formatting cleanups and added Javadocs. 2017-10-06 16:36:35 +02:00
Simone Bordet 268799b8bc Fixes #1871 - JMXify SslContextFactory.
Fixed toString() formatting.
2017-10-06 00:12:03 +02:00
Simone Bordet cebe2a7c4e Fixes #1871 - JMXify SslContextFactory. 2017-10-05 23:02:02 +02:00
Simone Bordet 3b98a6c000 Issue #1851 - Improve insufficient thread warnings/errors.
ThreadBudget -> ThreadPoolBudget.
Added selectors to the leased threads.
2017-10-02 13:40:31 +02:00
Simone Bordet 17a1484143 Code cleanups.
Removed unnecessary imports and fixed typos.
2017-10-02 11:43:45 +02:00
Greg Wilkins d166881a5a Issue #1806 Concurrent ReservedThreadExcecutor
Squashed commit of the following:

commit ab7f711c30ad1408ecdceffdca51cf167dc11a9c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 10:20:08 2017 +1000

    Fixed format

commit 062b051b56efb9924b81cf755297f538e4691851
Merge: d1e27d4 7d98cbb
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 09:19:40 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit d1e27d42983487941c6dd7cb0ea1068f36ff92f0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 11:28:21 2017 +1000

    improvements after review

commit 477e3ac05610825cc834d3195e39e8e8620a44cb
Merge: 51a3ac3 35d0b59
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 10:10:30 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit 51a3ac37e63108ca93fe2fdd9e02e7f8161072ba
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 10:08:55 2017 +1000

    improvements after review

commit 23df855bf457fe609576a35327db3fbd4c82b491
Merge: b52c6de 5764afc
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 26 09:30:42 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1806-ConcurrentReservedThreadExecutor

commit b52c6de6573433a960fdb6f2692e7bbd9effb48c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Sep 22 15:36:53 2017 +1000

    Issue #1806

    Added a concurrent stack class
    Converted ReservedThreadExcecutor to use the concurrent stack
    Added support for idle
2017-09-28 12:44:23 +10:00
Greg Wilkins 7d98cbb870 Issue #1851 Improve insufficient thread warnings/errors
Squashed commit of the following:

commit 1d9e8e4b4d53898cb6435f67529347bd2ba82cf0
Merge: 7280594 55b0f10
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Sep 28 07:20:37 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1851-ThreadBudget

commit 7280594a0058538b603ad35625713a79830e9b93
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 22:48:58 2017 +1000

    fixed headers

commit f962f18e5b098ae40846ee3832736ee4650aed84
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:12:33 2017 +1000

    Issue #1851 added reset

commit a63894de284c8d8dc5ed031f1f6e0fccaf6c7715
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:08:53 2017 +1000

    Issue #1851 improved test

commit 8bcc460dc63273165305a7adcb88e991e30de4b7
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 18:03:47 2017 +1000

    Issue #1851 Improve insufficient thread warnings/errors

    Refactor approach to use Leases, to handle multiple executors

commit fe4be5f56594f342ab5c2e6c886397d9b4fe9c14
Merge: abc5eac a248d38
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 15:37:56 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1851-ThreadBudget

commit abc5eac2b73d306a91b28ef4db778455095a5bdb
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Sep 27 12:20:03 2017 +1000

    Issue #1851 Improve insufficient thread warnings/errors

    Created a ThreadBudget class that can be used to warn/error for
    registered and unregistered allocations of threads.

    The server on doStart does an unregistered check of all its components that
    implement the Allocation interface.

    The client will register itself as an Allocation if a shared Executor is used.
2017-09-28 07:35:05 +10:00
Jan Bartel 49b2823ee9 Merge pull request #1824 from jglick/WebAppClassLoader.addJars-ordering
Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order
2017-09-27 11:12:39 +10:00
Jesse Glick fe0a0ead37 Minimizing diff lines at @janbartel’s request. 2017-09-25 18:21:01 -04:00
Simone Bordet 7768a781be Fixes #1836 - Review Locker.
Made Locker a simpler wrapper around ReentrantLock.
Deprecated lockIfNotHeld() and replaced its usages.
2017-09-21 19:16:36 +02:00
Greg Wilkins effec06eb6 Issue #1797 Multi Release Jar javadoc 2017-09-20 15:40:17 +10:00
Greg Wilkins 50f861e8f2 Issue #1797 MR jar support in java8 code 2017-09-20 13:47:37 +10:00
Greg Wilkins 219b61f5b4 Issue #1797
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-09-19 13:40:59 +10:00
Jesse Glick ac61f0e968 Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order.
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
2017-09-18 16:20:53 -04:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Greg Wilkins 3399fd36dc Fix #1814 Java Version utility 2017-09-13 15:20:43 +10:00
Simone Bordet 172bf27922 Fixed test after #1805. 2017-09-08 15:40:34 +02:00
Simone Bordet c1a4153861 Fixes #1805 - ReservedThreadExecutor should start ReservedThreads lazily.
Removed doStart() that was eagerly starting ReservedThreads.
Other small code cleanups.
2017-09-08 10:52:40 +02:00
Simone Bordet 2ff3a80800 Fixes #1798 - JMXify EatWhatYouKill. 2017-09-08 10:52:40 +02:00
Simone Bordet ec9a4ecdc1 Fixed #1796 - ReservedThreadExecutor defaulting to capacity=1 only.
Using getMaxThreads() instead of getThreads().
2017-09-08 10:52:40 +02:00
Joakim Erdfelt aa85bca2a9 Minor test cleanup 2017-09-06 13:49:20 -07:00
Greg Wilkins ca750cf582 #1792 Accept ISO-8859-1 in Response reason 2017-09-05 17:29:49 +10:00
Greg Wilkins bc47942d17 Issue #1200 Improve PathWatcher
Squashed commit of the following:

commit 08b5acccf87c3b99152a8042d650aadf7e43c5ff
Merge: cea3366 daeb844
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:43:01 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit cea3366625e16debf66e07284ab7afa89e73a32d
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:42:21 2017 +1000

    Issue #1200 ignore OSX failure

commit fd2493f2b30ffb19f4b404636e1e38c8612cb502
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 12:11:05 2017 +1000

    Issue #1789 PropertyUserStoreTest failures on windows

commit 89aa59ca7b16a393edc77116b13050d2d8a2c3e2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 11:56:52 2017 +1000

    Issue #1200 fixes for windows

commit 1904b4566d9224a19729f83a7b49a5ab23aaa5d8
Merge: 74d770e eec6453
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Sep 5 11:45:19 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit 74d770e557e8ff613a5965cb430a7b83ee75bd45
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Sep 1 10:47:05 2017 +1000

    Issue #1200 fixes for windows

commit f4ee0e97dcd0a07257cea8da8b3106f71150957f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 10:24:07 2017 +1000

    Issue #1200 improved tests for long duration quiet time

commit 17381cbb0bbebe3ea27ed5f55caeb45c2856e1be
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 10:03:04 2017 +1000

    Issue #1200 fixed javadoc

commit b3a12c15167ce77a9781942680ca2d5c872374dd
Merge: ed0db46 ce4adb5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 09:41:50 2017 +1000

    Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200

commit ed0db46f495f27491ba58e6c4353cf1ef6f2061e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 09:39:46 2017 +1000

    Issue #1200 Improved PathWatcher

commit ce4adb54ed58d39789ea1ba4f5d58035e57980ce
Merge: f993a7c 48aaecb
Author: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date:   Wed Aug 30 16:38:07 2017 -0700

    Merge branch 'jetty-9.4.x-1200' of github.com:eclipse/jetty.project into jetty-9.4.x-1200

commit f993a7c83ee7294a34b00cea68242adb7993e565
Author: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date:   Wed Aug 30 16:37:45 2017 -0700

    Issue #1200 - adding some important OSX/HFS+ timing differences

    + We should really be testing the FileSystem (not the OS) to make the timing
       constants be more sane. (APFS for example should be much lower on newer
       OSX installations

commit 48aaecb4dd291d94d591c1545f671eecff1e3587
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:50:42 2017 +1000

    Issue #1200 Improved PathWatcher diff

commit 1917f8b177d163bd42c07d5a2715858e7cf9787a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:36:40 2017 +1000

    Issue #1200 Improved PathWatcher diff

commit ecf002395a426ee3c00a4b42a32222e61805234f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Aug 31 08:22:41 2017 +1000

    Issue #1200 Test improved PathWatcher

commit 0d76544093cbcddd9b29fc2c92a4d0bb0a6839a8
Merge: 0fd7187 eb1320f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Aug 30 16:43:15 2017 +1000

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-1200

commit 0fd7187f908ed2d1bed24d5d82e25cb7ec244b0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Aug 30 15:58:24 2017 +1000

    Issue #1200 Improve PathWatcher
2017-09-05 12:44:31 +10:00
Greg Wilkins d0d9b7f8d7 Revert "Issue #1520"
This reverts commit ecad4125a4.
2017-08-28 16:26:44 +10:00
Greg Wilkins ecad4125a4 Issue #1520 2017-08-28 16:17:31 +10:00
Greg Wilkins 6390b335fc Issue #1520
Removed a lot of cruft from this class that had accumulated over the years.
Deprecated methods like setConfigPath(File) and setConfigPath(String)
removed asymmetries like setConfigPath(String) and Path getConfigPath()
removed redundant configResource field
improved jarfile extraction to work for all string setters.
do not hot reload extracted config
fixed code style issues
2017-08-28 15:59:36 +10:00
Greg Wilkins b8e5a1f018 Issue #1498 RTResource
Added a test that indicates the existing URLResource is adequate for JRT
2017-08-26 09:50:48 +10:00
Simone Bordet 7e764bad3e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-08-22 19:33:46 +02:00
Simone Bordet 1711642309 Added guard to avoid the case where count == 0. 2017-08-22 15:47:17 +02:00
Simone Bordet 927fe9ec44 Callback.NOOP is obviously non-blocking. 2017-08-22 15:46:33 +02:00
Greg Wilkins a7e8b4220a Issue #1556 Timing attack 2017-08-18 11:38:55 +10:00
Simone Bordet 829fa4fe9b Improved logging. 2017-08-11 16:48:06 +02:00
Greg Wilkins bb39fe6009 improved test for running in IDE 2017-08-10 12:54:41 +10:00
Greg Wilkins cf418c639f Revert "added assume from running directly"
This reverts commit 39ea66368c.
2017-08-10 12:52:28 +10:00
Greg Wilkins 39ea66368c added assume from running directly 2017-08-10 11:34:13 +10:00
Greg Wilkins 7b5d3b2b5a Issue #1706 Log class uses self Loader 2017-08-10 11:22:06 +10:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Greg Wilkins 9f285d92e7 Issue #1637
Limit reserved threads if threadpool is of small size
2017-08-08 09:15:59 -07:00
Greg Wilkins e5f7fee279 Fix #1664 CIDR IP 2017-08-08 09:14:30 -07:00
Joakim Erdfelt e65d0ba0e7 Improving test reliability (esp on Windows) 2017-08-08 09:14:10 -07:00