Greg Wilkins
dc67cb5241
Work in progres #1027
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 17:47:46 +11:00
Greg Wilkins
25b8933d34
Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-SearchPattern' into jetty-9.4.x-1027-Multipart
2018-03-08 15:05:35 +11:00
Simone Bordet
f6c1b76e71
Issue #2131 - Introduce a monitored thread pool. ( #2260 )
...
* Issue #2131 - Introduce a monitored thread pool.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Issue #2131 - Introduce a monitored thread pool.
Updated to use SampleStatistic and CounterStatistics.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Issue #2131 - Introduce a monitored thread pool.
Adding statistics fields as beans.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-08 08:47:31 +11:00
Greg Wilkins
35be19b818
Also use system property #2298
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 08:46:24 +11:00
Greg Wilkins
cf0b6140fe
Merge pull request #2299 from olamy/feature/available_processors
...
#2298 Override the processor number with an environment variable
2018-03-08 08:36:52 +11:00
Simone Bordet
a3100e0211
Issue #2288 - Cleanup the statistics classes. ( #2290 )
...
* Issue #2288 - Cleanup the statistics classes.
Cleaned up code, added Javadocs.
Renamed SampleStatistics.set(long) to record(long).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* toString stddev
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-08 08:35:21 +11:00
Lachlan Roberts
946341bf85
added missing class name SearchPatternTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-08 08:28:12 +11:00
olivier lamy
8dffd7e476
fix javadoc
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-07 22:07:49 +10:00
Lachlan Roberts
bfbe52754b
completed some javadoc on compile and constructor methods
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-07 22:10:35 +11:00
olivier lamy
7004aaa538
#2298 Override the processor number with an environment variable
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-07 21:02:26 +10:00
Greg Wilkins
74055b9837
Jetty 9.4.x 2293 pending multiplexed ( #2294 )
...
Issue #2293 Pending Multiplexed Connections
Added a AtomicBiInteger to allow both total connections and pending connections to be encoded in the
same atomic int.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-07 19:31:22 +11:00
Lachlan Roberts
809aee129e
Completed SearchPattern class and tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-07 17:38:44 +11:00
Greg Wilkins
bcb9fa3b32
Merge pull request #2257 from lachlan-roberts/jetty-9.4.x-2206-ReferenceEquality
...
Resolved errorprone ReferenceEquality warnings #2206
2018-03-07 11:11:40 +11:00
Lachlan Roberts
f68cf85e94
fully implemented the complile and match methods, written some tests for this
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-07 10:10:50 +11:00
Joakim Erdfelt
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
Greg Wilkins
a272fb6e39
Improve executorSizedThreadPool ( #2253 )
...
Improve executorSizedThreadPool (#2253 )
* Improve executorSizedThreadPool
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Improved implementation.
Implemented name, thread priorities, thread group and daemon properties.
Implemented toString(), dump() and using a thread factory.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* added threadpool benchmark;
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Renamed ExecutorSizedThreadPool to ExecutorThreadPool
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-06 19:07:41 +11:00
Greg Wilkins
9f2e4fd1f4
extra debug on test failure
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-06 18:59:56 +11:00
Lachlan Roberts
1b3ad11ef9
work in progress
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 16:22:03 +11:00
Lachlan Roberts
020ebde77c
found additional ReferenceEquality warnings which have been resolved
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-06 14:28:11 +11:00
Greg Wilkins
4b62ab6006
Handle tilde in java version options #2284
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-06 14:17:30 +11:00
Lachlan Roberts
a639ee9275
Resolved errorprone MissingOverride warnings #2206
...
`@Override` was added to methods which were missing the annotation #2206
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
Lachlan Roberts
480c0e718a
Merge branch 'jetty-9.4.x' into jetty-9.4.x-2206-ReferenceEquality
2018-02-28 16:14:49 +11:00
Lachlan Roberts
016c8076e0
updates after review #2206
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-28 16:02:47 +11:00
Greg Wilkins
48eebacd6c
more robust test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-28 14:28:58 +11:00
Lachlan Roberts
0cfc25d4ed
Resolved errorprone ReferenceEquality warnings #2206
...
Objects which inherit or implement an `equals()` method should not be compared with == or !=
When the comparison of references is intentional `@SuppressWarnings("ReferenceEquality")` can be used
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-28 14:26:02 +11:00
Greg Wilkins
0cb4f5629d
Jetty 9.4.x 1803 proposal 0+2 ( #2199 )
...
Merging this PR for #2199 as we currently think it is not worse than previous and the code base is definitely simpler. While JMH has shown significant benefits for this approach, we have yet been able to demonstrate them in full scale integration tests - however that is likely due to GC and thread pool issues dominating.
A `org.eclipse.jetty.http2.PEC_MODE` System property has been added to allow the EWYK scheduling to be disabled for HTTP/2 if need be.
* Implementation of #1803 proposal 2 - EITHER dispatch type for EWYK
* made code more readable
* increase small threadpools in tests for extra reserved thread
* clean up
* minor code simplifications
* Work in progress to simplify reserved thread pool
* use a single ReservedThreadPool built into the QueuedThreadPool
* fixed javadoc
* removed more old reserved thread references
* disable EWYK for h2
* fixes from review
* use EWYK for HTTP2
* Fixed javadocs, imports and QueuedThreadPool constructors.
* fix javadoc
* EWYK avoid unnecessary pendings
* after review
* fixed merge with jetty-threadpool.xml
* alternate EWYK implementations
* added jetty copyright headers
* Simplified EWYK code after review
* fixed bad merge
* Code cleanups.
* Improved Javadocs for deprecated property "reservedThreads".
* Improved Javadocs for deprecated property "reservedThreads".
* added a system property to enable only PEC for HTTP/2
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-27 14:29:59 +11:00
Lachlan Roberts
67d12a0839
Updates from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-27 12:12:40 +11:00
Lachlan Roberts
cf5b501254
Resolved default charset warning in jetty-util for #2206
...
Ignored warning in B64Code
US-ASCII in UnixCrypt
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-27 11:09:47 +11:00
Joakim Erdfelt
8515f809ca
Fixes #2224 - windows rollover file tests
2018-02-23 14:39:34 -06:00
Greg Wilkins
e46459e8a8
improve fragile tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-22 17:29:29 +11:00
Greg Wilkins
1e76caf00d
removed fragile tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-22 13:58:05 +11:00
Greg Wilkins
adcb2762fe
Improved testShrink to be more robust to timing issues
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-22 09:53:49 +11:00
Greg Wilkins
693aa04e03
Merge pull request #2200 from olamy/feature/errorprone
...
[WIP] Feature errorprone compiler
2018-02-21 16:30:34 +11:00
olivier lamy
7cc1a376a3
formatting
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-21 11:05:49 +10:00
Greg Wilkins
af06fddef1
less fragile tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-20 17:36:29 +11:00
Jan Bartel
df012bb0a3
Issue #2164 correct manifest headers for ServiceLoader use in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
Greg Wilkins
3ae713f2d4
less fragile tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-20 13:49:41 +11:00
Greg Wilkins
386dfc0331
less fragile tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-20 11:32:49 +11:00
Greg Wilkins
ec51926622
reduce fragility of tests
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-02-19 19:22:32 +11:00
olivier lamy
bd0b440da9
fixing one errorprone error, ATM configure it to generate warning and not errors, let see if we can collect in jenkins
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-19 13:37:28 +10:00
David Ha
a01e4a0f49
qtp constructor min-max validation
...
When min and max threads are passed together, verify
max >= min to detect bad configuration.
Signed-off-by: David Ha <davidha@1493.net>
2018-02-08 10:32:58 -05:00
Simone Bordet
6bbd89e5db
Added NoTryExecutor.toString() for better dumps.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-08 11:11:01 +01:00
Greg Wilkins
ab5fc29cca
Jetty 9.4.x 1803 proposal 0 - single ReservedThreadExecutor ( #2119 )
...
Issue #1803 - Review usage of scheduling strategies
Use a single ReservedThreadExecutor built into the QueuedThreadPool
via new interface TryExecutor.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-08 11:08:48 +01:00
WalkerWatch
a836e03749
Merge 9.4.x to 10.0.x
2018-01-24 09:43:16 -05:00
Greg Wilkins
ad8f2abbb4
Issue #2075 cleanup MultiException to better use suppressed ( #2105 )
...
* Issue #2075 cleanup multiexceptio to better use suppressed
* Update MultiException.java fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-23 08:34:07 +01:00
Joakim Erdfelt
fe2be81783
Merge pull request #2149 from eclipse/jetty-9.4.x-2148-bufferutil-todetailstring
...
Issue #2148 - Limit BufferUtil.toDetailString() raw character display to USASCII 7-bit printable characters
2018-01-22 11:23:54 -06:00
Joakim Erdfelt
3e28e50693
Issue #2148 - Limit BufferUtil.toDetailString() raw character display to USASCII 7-bit printable characters
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-01-22 11:22:50 -06:00
Greg Wilkins
214298b71b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-16 17:59:28 +01:00
Greg Wilkins
e0eab58c24
Issue #1797 - JEP 238 - Multi-Release JAR files break bytecode scanning. Fixed for java 10
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-15 16:40:57 +01:00
Greg Wilkins
ec9827bb35
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-11 16:57:33 +01:00
Greg Wilkins
7138dc3828
Jetty 9.4.x #1918 scalable scheduler3 ( #2101 )
...
* Scalable scheduler changes for #1918
* Added HttpChannel.destroy to destroy CyclicTimer
* fixed rebase with HttpConnectionOverFCGI
* renamed to acquire
* Destroying the HttpChannel consistently in all transports.
* updated headers
* cleanup after final review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-01-10 16:56:41 +01:00
Greg Wilkins
356bf2e06f
Issue #2046 - Graceful stop of connections ( #2100 )
...
* Clean up of actions (now updates) prior to #2046 fix
* prevent exceptions from termincating lifecycle doStop or destroy
* Refactored ManagedSelector stop to always close endpoints
* Fixed NPE if SelectorManager is already stopped
* refactored after review
* further simplifications after review
* Wait only for oshut endpoints
* Cleanup from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-09 20:36:41 +01:00
Joakim Erdfelt
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
Joakim Erdfelt
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
Joakim Erdfelt
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
Joakim Erdfelt
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
Greg Wilkins
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
Greg Wilkins
88cf4603c5
Merge branch 'jetty-9.4.x' into bugfix/javadoc_fixes_2056
2018-01-08 21:31:48 +01:00
Greg Wilkins
b2ff7c5cb8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-08 21:30:12 +01:00
Greg Wilkins
26a4909c88
Use shaded utils in start for JavaVersion and TopologicalSort #2090 ( #2094 )
...
* shaded TopologicalSort. Use shaded start in jetty-home
* removed unused property
* jetty-start shaded dependency
* removed component dependencies from TopologicalSort
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-06 11:23:37 +01:00
Greg Wilkins
595c6ac1ee
Issue #2090 Java Version JEP223. Use shaded util in start.
2018-01-04 13:13:39 +01:00
Greg Wilkins
a107e543e6
Issue #2090 Java Version JEP223
2018-01-04 12:27:15 +01:00
Greg Wilkins
54c55b602f
ManagedSelector dump improvements from #1970 ( #2062 )
...
* ManagedSelector dump improvements from #1970
ManagedSelector dump improvements from #1970 :
+ DumpKeys is now prepended to actions list so it is less likely to be delayed by a stuck/busy selector
+ Timestamps are included for actions and keys which may be separated by time
+ Race removed race for updating dumpKey list while it is being added to.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* moved utility timestamp format method to Log
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* updates after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* changes after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #1970 - ManagedSelector dump improvements.
Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
* Revert "Issue #1970 - ManagedSelector dump improvements."
This reverts commit 4febaf10dc
.
* Fixed imports and other review feedback
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-01-02 11:13:24 +01:00
Greg Wilkins
12647f51e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-27 16:04:16 +01:00
olivier lamy
3a189ab254
#2056 javadoc warning fixes WIP
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-20 10:52:45 +11:00
Greg Wilkins
0c021f2599
EWYK cleanups from #1970
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-19 09:51:11 -08:00
Joakim Erdfelt
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
Joakim Erdfelt
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
Jan Bartel
7a8130eee0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-14 09:46:09 +01:00
Greg Wilkins
8660055574
Issue #2010 Support FIPs Key Managers ( #2044 )
...
Issue #2010 Support FIPs Key Managers, by only wrapping the default Key Manager if we have wildcard CN's or more than 1 non wild CN. FIPs users will need to install a
keystore than has no multiple certificates than can only be resolved by SNI. They will also need to have no certificate aliases.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-12-14 00:15:58 +01:00
WalkerWatch
76613c0999
Merge branch 'jetty-9.4.x'
2017-12-07 14:47:37 -05:00
Greg Wilkins
6ca975a1aa
ignore bad timestamp
2017-12-07 12:25:02 +01:00
Joakim Erdfelt
70fe268bde
Merge branch 'release-9.4.8' into jetty-9.4.x
2017-11-29 10:52:02 -07:00
Joakim Erdfelt
aeb1a1d6cd
Merge tag 'jetty-9.4.8.v20171121' into jetty-9.4.x
...
Tag for release: jetty-9.4.8-SNAPSHOT
+ 212 HttpClient should support pluggable AuthenticationStore
+ 215 Add Conscrypt for native ALPN/TLS/SSL
+ 272 WebSocket hangs in blockingWrite
+ 487 JDK 9 build compatibility
+ 901 Overriding SSL context KeyStoreType requires explicit override of
TrustStoreType
+ 922 Implements methods Connection.getBytes[In|Out]()
+ 1209 IllegalStateException when HTTP/2 push is disabled
+ 1213 Upgrade to ASM Version 6.0 for JDK9
+ 1509 Improve GZIPContentDecoder buffer pooling sizing
+ 1550 Resolve inconsistent Shutdown configuration with Jetty Runner
+ 1640 Introduce :run-distro goal for local jetty distribution deployment
+ 1692 Annotation scanning should ignore `module-info.class` files
+ 1696 Missing stacktraces on debug of WriteFlusher onFail
+ 1705 Rejected executions in QueuedThreadPool can lead to memory leaks
+ 1760 Update to apache jasper 8.5.20
+ 1768 Allow jetty properties to be set for the jetty:run-forked goal
+ 1782 Using assembly.tarLongFileMode=posix for jetty-home and
jetty-distribution assembly
+ 1797 JEP 238 - Multi-Release JAR files break bytecode scanning
+ 1806 Improved ReservedThreads idle timeout
+ 1807 Add new HttpChannel listener and events for metrics libraries
+ 1814 Move JavaVersion to jetty-util for future Java 9 support requirements
+ 1818 Improve Infinispan support on JDK 9
+ 1819 Race condition during annotation parsing
+ 1823 ResourceHandler with ranged requests does not return Content-Type
response header
+ 1829 OSGi webbundle classes scanned twice
+ 1833 Request.startAsync requires context path
+ 1835 Locker is not reentrant on ServerConnector#setConnectionFactories
+ 1836 Migrate Locker implementation to JVM ReentrantLock implementation
+ 1841 Reduce contention on ServletHolder
+ 1845 Allow null User-Agent in HttpClient
+ 1849 Refactoring of SelectorManager.defaultSchedulers()
+ 1851 Improve insufficient thread warnings/errors
+ 1854 Consistent IOException and timeout handling when extracting form
parameters
+ 1856 ResourceHandler without ServletContext throws NPE for welcome files if
used directly
+ 1857 GZIPContentTransformer fails to send entire message if used with
BufferedContentTransformer
+ 1865 Improve Exception on invalid redirect usage
+ 1867 Improve Exception thrown during Expect 100 Continue
+ 1868 Need a way to randomly select ports for tests
+ 1871 JMXify SslContextFactory
+ 1878 Handle 100 Continue response without Expect header
+ 1879 'Bad tld url' seen during :jetty-run when running integration tests
+ 1881 Improve support of WebSocket over Unix Domain Socket
+ 1885 SessionHandler get/set maxInactiveInterval is not symmetric with
negative values
+ 1888 Implement cookie matching on Path attribute per RFC 6265
+ 1891 Make HTTP/2 async error notifications configurable
+ 1892 NPE resulting from bad JEP 238 MultiReleaseJarFile structure
+ 1893 Add ability to set HttpClient Connection TTL
+ 1897 Introduce a round-robin connection pool for HttpClient
+ 1900 Update to CDI 2.0 for cdi module
+ 1901 Reimplement PathWatcher as scanner
+ 1909 Update to Apache Jasper 8.5.23
+ 1910 Remove unused jetty-jsp module
+ 1912 AbstractConnector EndPoint leak for failed SSL connections
+ 1914 HttpClient fails to parse Content-Type response header with RFC 2045
charset="utf-8" syntax
+ 1919 Review LowResourceMonitor
+ 1920 Connect Timeouts with NonBlocking CreateEndPoint
+ 1924 ManagedSelector can livelock under high load
+ 1931 Expose RolloverOutputStream for pluggable behaviour
+ 1933 Use CLASSPATH for scanning java9 system classes
+ 1956 Store and report build information of Jetty
+ 1958 Blocking Timeout has different behavior in HttpInput vs HttpOutput
+ 1970 ManagedSelector can lose selector thread under high concurrent load
+ 1980 PushCacheFilter does not push TLS offloaded HTTP/2 requests
+ 1981 Loading resource content failed
+ 1984 Remove jetty-client dependency in jetty-rewrite
2017-11-29 10:51:22 -07:00
WalkerWatch
29fd791213
Merge branch 'jetty-9.4.x'
2017-11-28 17:24:19 -05:00
Simone Bordet
31e5531966
Small optimization when starting reserved threads.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-28 22:09:45 +01:00
WalkerWatch
b6163bdeca
Merge branch 'jetty-9.4.x'
2017-11-28 14:09:22 -05:00
Greg Wilkins
54bf9b56bf
Issue #1770 NPE protection in SniX509EKM chooseServerAlias
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-24 08:18:24 +01:00
Simone Bordet
f5dbab622e
Merged branch 'jetty-9.4.x' into 'master'.
2017-11-22 18:58:50 +01:00
Simone Bordet
d285c718b9
Issue #1901 - Reimplement PathWatcher as scanner.
...
Ignored PathWatcherTest because it is unstable and often fails in Jenkins.
2017-11-22 18:58:22 +01:00
Jan Bartel
7f6e2e8dd0
Issue #1933
...
Cherry-pick of 29373c6
and 44d170e
2017-11-22 13:53:38 +01:00
Jan Bartel
24699b75e4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-21 23:21:15 +01:00
Joakim Erdfelt
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
Joakim Erdfelt
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
Jan Bartel
26b7058186
Issue #1981
2017-11-21 17:53:44 +01:00
Jan Bartel
406ebd9fe4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-16 15:32:41 +01:00
Jan Bartel
29373c6fb4
Merge pull request #1976 from eclipse/jetty-9.4.x-1933-jdk9-classpath
...
Jetty 9.4.x 1933 jdk9 classpath
2017-11-16 13:57:56 +01:00
Simone Bordet
f672b7e932
Merged branch 'jetty-9.4.x' into 'master'.
2017-11-16 11:36:05 +01:00
Simone Bordet
131f46df64
Improved dump of ManagedSelector.
...
Now also dumping the actions.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-16 11:35:18 +01:00
Jan Bartel
98d8c2400d
Issue #1933
...
Add some comments, changes from code review.
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-16 10:01:44 +01:00
Jan Bartel
10a6f57bd8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-1933-jdk9-classpath
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-15 10:42:08 +01:00
Jan Bartel
12327b8876
Issue #1933
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-15 10:33:51 +01:00
Greg Wilkins
bb0f06fecc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-14 18:15:55 +01:00
Simone Bordet
0f07c6518e
Issue #1970 - ManagedSelector loses selector thread ( #1971 )
...
* Issue #1970 - ManagedSelector loses selector thread.
Removed broken data structure ConcurrentStack (ABA problem).
Made ReservedThreadExecutor use a ConcurrentLinkedDeque
instead of ConcurrentStack.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-14 10:48:33 +01:00
Greg Wilkins
48df74224a
Jetty 9.4.x 1931 rollover ( #1932 )
...
* Issue #1931 Rollover log file
Added a protected method that is called whenever a log file is rolled over.
Support a date format of "" so that a rollover file may have the same name and a backup file is created.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* removed bad javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #1931 Rollover
Replaced FilteredOutputStream with a volatile field so that rollover events will be seen immediately
* Issue #1931 Rollover
use mutex to avoid write and close race
2017-11-14 09:16:47 +01:00
Joakim Erdfelt
a7283e8e2a
Merge pull request #1959 from olamy/feature/build_properties_master_1956
...
master merge add a build.properties file containing git hash, build timestamp scm …
2017-11-10 15:55:15 -07:00
Olivier Lamy
6499baa3a2
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:26:00 +11:00
Olivier Lamy
99e56f97a2
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-11 09:02:10 +11:00
Olivier Lamy
9fab69ea02
add a build.properties file containing git hash, build timestamp scm url ( #1957 )
...
* add a build.properties file containing git hash, build timestamp and scm url #1956
Signed-off-by: olivier lamy <olamy@webtide.com>
* move build infos to Jetty class so it's available for server and client
Signed-off-by: olivier lamy <olamy@webtide.com>
* apply changes by Greg review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-11-10 18:39:28 +01:00
Simone Bordet
4329df70b5
Merged branch 'jetty-9.4.x' into 'master'.
2017-11-09 10:31:07 +01:00
Simone Bordet
0bc8305535
Improved ReservedThreadExecutor by reporting waiting threads.
2017-11-09 10:26:11 +01:00
Simone Bordet
e244aad86e
Merged branch 'jetty-9.4.x' into 'master'.
2017-11-08 22:44:20 +01:00
Simone Bordet
d496cc85b6
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-11-08 22:43:48 +01:00
Simone Bordet
b1d5fea96c
Issue #1797 - JEP 238 - Multi-Release JAR files break bytecode scanning. ( #1951 )
...
Made MultiReleaseJarFile closeable and using try-with-resources in
AnnotationParser to avoid leaking file descriptors.
Made few code simplifications.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2017-11-08 21:38:26 +01:00
Jesse McConnell
0f34179b2b
Merge branch 'release-9.3.22' into jetty-9.3.x
2017-11-03 09:45:47 -05:00
Greg Wilkins
0ef51b67dc
Fix NPE when stopping with no resesrved threads ( #1939 )
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2017-11-03 23:58:00 +11:00
Greg Wilkins
070546148e
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-03 08:55:00 +11:00
Greg Wilkins
969c2d8e6a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-11-03 08:52:58 +11:00
Greg Wilkins
6e7560acd1
Issue #1797 MR Jar. Fixed NPE
2017-11-03 07:51:26 +11:00
Jesse McConnell
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
Jesse McConnell
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
Greg Wilkins
4fa2140d17
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-29 08:21:22 +11:00
Greg Wilkins
ab849e8cc5
Issue #1920 - Connect Timeouts with NonBlocking CreateEndPoint.
...
Added a LiveLock (BusyBlocking) test.
Modified ManagedSelector to fair share between actions and selecting
2017-10-28 14:55:40 +11:00
Greg Wilkins
a210add95a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-20 10:45:46 +11:00
Greg Wilkins
17867dc0a7
improved QueuedThreadPool dump
2017-10-20 09:44:08 +11:00
Joakim Erdfelt
7a3f9bfeb7
Fixing compilation issue surrounding deprecated Utf8PartialBuilder
2017-10-19 12:35:34 -07:00
Greg Wilkins
7a04b423cd
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 19:56:28 +11:00
Greg Wilkins
7399947d56
Added partial string support to Utf8Appendable
2017-10-19 19:55:55 +11:00
Greg Wilkins
7d9645cb11
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 12:26:40 +11:00
Greg Wilkins
c12ba01014
Issue #1797 use platform for MR jars
2017-10-18 12:24:26 +11:00
Greg Wilkins
44a1f1e1a6
Issue #1797 use platform for MR jars
2017-10-18 12:19:33 +11:00
Greg Wilkins
dd0eaa0f1f
Issue #1901 Backport some java9 support to 9.3
2017-10-17 17:14:18 +11:00
Greg Wilkins
a9e98a5a7e
Issue #1901 Backport some java9 support to 9.3
2017-10-17 17:08:50 +11:00
Greg Wilkins
8bcf10395d
Fix #1814 Java Version utility
2017-10-17 15:25:25 +11:00
Greg Wilkins
6b7bbbe66a
Issue #1797 Multi Release Jar javadoc
2017-10-17 15:09:19 +11:00
Greg Wilkins
5de895af88
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-10-17 15:06:09 +11:00
Simone Bordet
17df0bf930
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-11 17:39:45 +02: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
Joakim Erdfelt
c3c3881c9f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-10 13:44:22 -07: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
632365f2e2
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-10 16:53:07 +02: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
63beada72e
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-06 16:46:00 +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
5178f63a95
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-06 00:13:15 +02:00
Simone Bordet
268799b8bc
Fixes #1871 - JMXify SslContextFactory.
...
Fixed toString() formatting.
2017-10-06 00:12:03 +02:00
Simone Bordet
b1ba04ee0e
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-05 23:02:50 +02:00
Simone Bordet
cebe2a7c4e
Fixes #1871 - JMXify SslContextFactory.
2017-10-05 23:02:02 +02:00
Simone Bordet
bee383c894
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-03 01:22:35 +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
0564b47657
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-28 12:56:30 +10: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
1ce96be964
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-28 07:58:15 +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
d81b835ad0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-27 12:19:54 +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
f721e1d6c0
Issue #1836 - Review Locker.
...
Removed deprecated methods.
2017-09-22 16:48:35 +02:00
Greg Wilkins
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10: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
165ca36f6b
Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x
2017-08-30 16:38:09 +10:00
Joakim Erdfelt
02f0649840
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-28 11:33:12 -07:00
Greg Wilkins
8de580d77e
Revert "Issue #1200 Improve PathWatcher"
...
This reverts commit 3eadc5f1db
.
Will fix issues in 9.4 and merge forward
2017-08-28 16:32:29 +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
Greg Wilkins
3eadc5f1db
Issue #1200 Improve PathWatcher
2017-08-24 16:24:57 +10:00
Greg Wilkins
5a9e2ea25a
Issue #1498 RTResource
...
Added a test that indicates the existing URLResource is adequate for JRT
2017-08-24 13:01:03 +10:00
Greg Wilkins
a947122235
Issue #1200 Update deployment manager to use PathWatcher
...
Updated PathWatcher to use IncludeExcludeSet
2017-08-24 10:01:51 +10:00
Simone Bordet
d8efc177ec
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-22 19:34:14 +02: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
1f847f998a
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2017-08-19 12:03:26 +10:00
Greg Wilkins
201a11a899
Issue #1556 Timing attack
2017-08-19 12:02:43 +10:00
Joakim Erdfelt
651f422034
Merge branch 'jetty-9.4.x' to 'master'
2017-08-18 10:54:58 -07:00
Greg Wilkins
a7e8b4220a
Issue #1556 Timing attack
2017-08-18 11:38:55 +10:00
Greg Wilkins
60a7551785
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-15 11:55:58 +10:00
Simone Bordet
829fa4fe9b
Improved logging.
2017-08-11 16:48:06 +02:00
Greg Wilkins
39cb278577
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-10 13:22:54 +10: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
13e928dfd0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-10 11:30:09 +10:00
Greg Wilkins
7b5d3b2b5a
Issue #1706 Log class uses self Loader
2017-08-10 11:22:06 +10:00
Joakim Erdfelt
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07: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
Greg Wilkins
a105be95e4
Issue #1637 Thread per HTTP/2 Connection
...
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class. A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.
Squashed commit of the following:
commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Jun 21 10:48:22 2017 +0200
Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3
commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Jun 14 15:56:43 2017 +0200
Code cleanups.
commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Jun 14 07:34:58 2017 +0200
refixed Producing to Reproducing
commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Jun 14 07:26:29 2017 +0200
fixed Producing to Reproducing
commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 16:33:44 2017 +0200
fixed javadoc
commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 16:05:27 2017 +0200
Renamed Preallocated to ReservedThread
commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 12:28:52 2017 +0200
Added configuration in modules
commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 10:09:29 2017 +0200
Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3
commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 10:08:35 2017 +0200
javadoc
commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Jun 10 00:04:06 2017 +0200
Improved EatWhatYouKill implementation
Simplified by abstracting out PreallocatedExecutor
Removed invocation execution
HTTP2 now uses a shared PreallocationExcecutor between connection
2017-08-08 09:13:44 -07:00
Joakim Erdfelt
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
Greg Wilkins
d3e42cf064
Issue #1503 Optionally strip IPv6. Fixed inverted boolean
2017-08-08 09:12:53 -07:00
Greg Wilkins
8e3f950892
Issue #1503 Optionally strip IPv6
2017-08-08 09:12:52 -07:00
Joakim Erdfelt
8a674adddc
Updating to version 9.2.22.v20170606
2017-08-08 09:12:46 -07:00
olivier lamy
4ce42c19ec
unit test must not force a maven repository path #1574
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:10:23 -07:00
Joakim Erdfelt
806dff64f3
Issue #1590 - Revert Java 8 class usage back to Java 7 limits
2017-08-08 09:10:22 -07:00
Greg Wilkins
c8cd6629d9
Issues #1513 #1515
...
Fixed and tested backup file
2017-08-08 09:10:21 -07:00
Greg Wilkins
675889a993
Issues #1513 #1515
...
Fixed removed of old files.
Added test to check file handling
2017-08-08 09:10:21 -07:00
Greg Wilkins
4d8987459d
Fixed #1513 paranoid cleanup
2017-08-08 09:10:20 -07:00
Greg Wilkins
01be856663
Fixed #1513 back ported some 9.4 changes
2017-08-08 09:10:19 -07:00
Greg Wilkins
6f0cb033e7
Fixed #1513 sync shared timer
2017-08-08 09:10:18 -07:00
Greg Wilkins
15cad7379d
Issue #1507
2017-08-08 09:10:17 -07:00
Joakim Erdfelt
2d24922383
Issue #1469 - conforming to java.util.Timer quirks
2017-08-08 09:10:16 -07:00
Joakim Erdfelt
7b8e3bf47c
Eliminate time creep in RFOS
2017-08-08 09:10:16 -07:00
Joakim Erdfelt
b0bead2bc0
Fixes #1357 - Refactored date/time handling and added tests for RolloverFileOutputStream
2017-08-08 09:10:15 -07:00
Greg Wilkins
189cc4e369
Issue #1468 Configure PKIX Revocation Checker for SslContextFactory
2017-08-08 09:10:14 -07:00
Joakim Erdfelt
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
Joakim Erdfelt
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
Joakim Erdfelt
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
Greg Wilkins
7065196400
Issue #1676 remove deprecated properties from XML
2017-07-19 16:29:13 +02:00
Greg Wilkins
134dfd318d
Issue #1676 removed deprecated FileResource
2017-07-18 20:12:53 +02:00
Greg Wilkins
3a4da94e1a
Issue #1676 removed deprecated IPAddressMap and IPAccessHandler. Created module inetaccess.mod
2017-07-18 16:48:02 +02:00
Greg Wilkins
1956087277
update to latest servlet API behaviour
2017-07-18 13:11:53 +02:00
Greg Wilkins
b358c06974
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-18 12:46:44 +02:00
Greg Wilkins
8ca8735c95
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-07-13 15:41:54 +02:00
Greg Wilkins
7b1d4c7ccf
Fix #1664 CIDR IP
2017-07-13 15:41:21 +02:00
Joakim Erdfelt
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
Joakim Erdfelt
2e8f9fc748
Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
...
This reverts commit 38c112764d
.
2017-07-12 11:28:32 -07:00
Joakim Erdfelt
5b6b80ef81
Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11
2017-07-12 11:18:20 -07:00
Joakim Erdfelt
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -07:00
Joakim Erdfelt
15cbaf9f83
Improving test reliability (esp on Windows)
2017-06-29 06:43:27 -07:00
Joakim Erdfelt
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
Joakim Erdfelt
67cccd610a
Post cherry-pick cleanup of jetty-9.4.x...master jetty-websocket
2017-06-26 13:11:33 -07:00
Greg Wilkins
17f6c28c7d
Issue #1503 Optionally strip IPv6. Default true
2017-06-26 11:59:40 -07:00
Joakim Erdfelt
fa10576bc6
Issue #207 - initial pass through for Stream backpressure
2017-06-26 11:43:18 -07:00
Joakim Erdfelt
c8ffaec032
Issue #207 - Support javax.websocket version 1.1
2017-06-26 11:18:58 -07:00
Joakim Erdfelt
c5954fc5d6
Trailing merge fixes
2017-06-26 11:18:57 -07:00
Greg Wilkins
23c8e64fd8
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-21 14:40:13 +02:00
Greg Wilkins
11b5cf5a2b
Issue #1637 Thread per HTTP/2 Connection
...
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class. A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.
Squashed commit of the following:
commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Jun 21 10:48:22 2017 +0200
Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3
commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date: Wed Jun 14 15:56:43 2017 +0200
Code cleanups.
commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Jun 14 07:34:58 2017 +0200
refixed Producing to Reproducing
commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Jun 14 07:26:29 2017 +0200
fixed Producing to Reproducing
commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 16:33:44 2017 +0200
fixed javadoc
commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 16:05:27 2017 +0200
Renamed Preallocated to ReservedThread
commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 12:28:52 2017 +0200
Added configuration in modules
commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 10:09:29 2017 +0200
Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3
commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Jun 13 10:08:35 2017 +0200
javadoc
commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Jun 10 00:04:06 2017 +0200
Improved EatWhatYouKill implementation
Simplified by abstracting out PreallocatedExecutor
Removed invocation execution
HTTP2 now uses a shared PreallocationExcecutor between connection
2017-06-21 11:48:41 +02:00
Greg Wilkins
ea74d86f6f
Fixes #1368
2017-06-08 11:21:13 +02:00
Joakim Erdfelt
5ee1c7a533
Merge branch 'release-9.4.6' into jetty-9.4.x
2017-06-07 10:01:11 -07:00
Joakim Erdfelt
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
Greg Wilkins
ad76aa6c65
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 17:07:14 +02:00
Greg Wilkins
e55f528643
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-06 17:05:33 +02:00
Greg Wilkins
70d55252b9
Issue #1503 Optionally strip IPv6. Fixed inverted boolean
2017-06-06 17:05:07 +02:00
Greg Wilkins
380b7d21e9
Issue #1503 Optionally strip IPv6. Default true
2017-06-06 16:58:23 +02:00
Greg Wilkins
829815be5e
Merge branch 'jetty-9.4.x'
2017-06-06 16:57:44 +02:00