17503 Commits

Author SHA1 Message Date
olivier lamy
2f96792937 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-22 21:29:29 +10:00
olivier lamy
49c12ae0f0 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-22 21:19:31 +10:00
olivier lamy
5e8a7403d1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-22 20:11:03 +10:00
Simone Bordet
2673ae98c2 Issue #2727 - Revisit JMX MBean lookup behavior.
Optimized creation of MBeanInfo.
Rather than collecting attributes from the whole hierarchy,
just merge the local attributes with the ones from the parent,
using a Set to discard duplicates.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-21 17:56:43 +02:00
Simone Bordet
87f39449a9 Issue #2727 - Revisit JMX MBean lookup behavior.
Fixed NPE in case the class is an interface.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-21 10:56:13 +02:00
Simone Bordet
7a2ba10ed6 Issue #2727 - Revisit JMX MBean lookup behavior.
Improved lookup of MBean constructor, now done only once.
Cleaned up tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-21 10:38:23 +02:00
Olivier Lamy
71a1801433
Issue #2918 restore a TestTracker with junit5 (#2927)
* add TestTracker junit5 extension #2918

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
Simone Bordet
f72cb74b35 Issue #2727 - Revisit JMX MBean lookup behavior.
Removed unused code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-21 00:13:53 +02:00
Simone Bordet
75b2c1d001 Issue #2727 - Revisit JMX MBean lookup behavior.
Rewrote JMX implementation using caches to improve performance
of JMX lookups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-20 23:53:50 +02:00
Greg Wilkins
a9566d429c
Issue #2912 Remove Content-Length from inflated requests (#2915)
Issue #2912 Remove Content-Length from inflated requests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-21 07:44:53 +10:00
Joakim Erdfelt
b225ebe756
Merge pull request #2902 from eclipse/jetty-9.4.x-issue-2875-websocketclient-redirect
Issues #2875 and #2901 WebSocketClient Redirected Upgrade
2018-09-20 13:56:55 -05:00
Simone Bordet
f6474f9b8c
Merge pull request #2922 from eclipse/jetty-9.4.x-2913-CNFE_sun_reflect_Reflection
Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
2018-09-20 11:06:59 +02:00
Olivier Lamy
f340b404a8
get rid of maven warning due to duplicate plugin declaration (#2920)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-20 15:59:42 +10:00
olivier lamy
cf59a8aa65 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-20 07:36:11 +10:00
Simone Bordet
e1905e6961 Issue #2868 - Adding SPNEGO authentication support for Jetty Client.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 18:47:39 +02:00
Simone Bordet
3a8a20557d Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Another update after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 17:07:49 +02:00
Simone Bordet
bae502681c Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Another update after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:50:33 +02:00
Simone Bordet
9a9a52b960 Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Updated after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:44:12 +02:00
Simone Bordet
3384ff90ea Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Replaced usage of sun.reflect.Reflection with a
SecurityManager subclass, so that it works in all JDKs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 12:46:39 +02:00
Greg Wilkins
9fae0c2fa0
Move snapshot repositories to profile (#2917)
Issue #2917
* Move snapshot repositories to profile
* feedback from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-19 11:20:14 +10:00
WalkerWatch
defa9e42f2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-18 10:54:36 -04:00
WalkerWatch
be564ecd59 Updated example. Resolves #2916 2018-09-18 10:53:07 -04:00
Olivier Lamy
cfe7fa1cb2
Issue #2906 excluded reactor projects with provided scope (#2914)
* Issue #2906 excluded reactor projects with provided scope

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* avoid test project within reactors to be in the classpath

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-18 21:17:25 +10:00
Simone Bordet
a6abd0b741 Issue #2191 - JPMS Support
Fixed apache-jsp JPMS module name.
Fixed jetty-ant JPMS module name.

ASM 6.2 contains a proper module-info.class that requires also
asm-tree and asm-analysis, so added them to the jetty-home module
so that they are present in the distribution.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-18 00:35:29 +02:00
Simone Bordet
60e3562f99 Issue #2191 - JPMS Support
Turns out that Package.getImplementationVersion() and similar return
null when running from the module path, so the logic in StartArgs
broke and prevented Jetty to start.

Introduced ManifestUtils to retrieve the manifest file from JarFile,
so that attribute entries can be retrieved independently from the JDK
version or module-path vs class-path.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-17 19:32:00 +02:00
Simone Bordet
f1391be559 Issue #2868 - Adding SPNEGO authentication support for Jetty Client.
Added missing copyright header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-16 16:33:25 +02:00
Simone Bordet
2e65186c95 Issue #2868 - Adding SPNEGO authentication support for Jetty Client.
Implemented client-side SPNEGO authentication.
Reimplemented server-side SPNEGO authentication.
Added tests to verify behavior.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-14 19:48:39 +02:00
Joakim Erdfelt
7db1abafbf Fixing WebSocketUpgradeFilter Tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-14 10:46:06 -05:00
Joakim Erdfelt
c5755f6686 Fixing PerMessageDeflateExtensionTest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-14 06:17:36 -05:00
Joakim Erdfelt
49bd9b3280 Fixing SessionTest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-14 06:10:39 -05:00
Simone Bordet
b0f34fec3f Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-14 10:01:58 +02:00
Olivier Lamy
27179786a0
fix groovy variable scope (#2905) 2018-09-14 15:17:50 +10:00
Olivier Lamy
3793fe5ae9
upgrade junit 5.3.1 (#2904) 2018-09-14 12:00:08 +10:00
Joakim Erdfelt
6f50afde38 Fixing groovy error on isMainBuild
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-13 20:57:55 -05:00
Joakim Erdfelt
2d44cc3189 Migrating websocket tests to junit5
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-13 20:55:49 -05:00
Joakim Erdfelt
62da301e19 Re-enabling maven threaded testing
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 19:10:46 -05:00
Joakim Erdfelt
a9d394f0af Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2018-09-12 16:55:36 -05:00
Joakim Erdfelt
59a9a0114a More junit5 test fixes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 16:55:01 -05:00
Olivier Lamy
98cc338d2e
get rid of remaining legacy junit (#2900)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-13 07:11:09 +10:00
Joakim Erdfelt
ae169aa624 Fixing #2875 - WebSocketClient upgrade with redirect support
+ Using HttpClient fixes from #2901 to allow upgrader to be
  held for entire conversation regardless of authentication
  or redirect behaviors.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 15:57:31 -05:00
Joakim Erdfelt
00843c8ed9 Issue #2901 - Moving Http Upgrader to Http Conversation
+ Solves for Authentication and Redirect

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 14:35:01 -05:00
Greg Wilkins
4b461b7556 DelegatingThreadPool as TryExecutor
Noticed while looking at #2718, it is more efficient if tryExecute semantics are available.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-12 16:42:05 +10:00
Yanming Zhou
cd7138131e Fix outdated bundle vendor
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2018-09-12 10:56:05 +08:00
Joakim Erdfelt
aebe436e00 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-09-11 13:22:12 -05:00
Joakim Erdfelt
a69ad3912d Fixing #2481 - PathWatcherDemo NPE
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-11 13:21:37 -05:00
olivier lamy
5aaae07b94 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 21:09:14 +10:00
Olivier Lamy
1b330f2efc
inherit plugin versions from main pom (#2897)
* inherit plugin versions from main pom

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-11 21:05:37 +10:00
Алексей Пастухов
04941fd44c Issue #2691 replace static dn by subtee based ldap lookup for an entry inside _userBaseDn (#2842)
* replace static dn by subtee based ldap lookup for an entry inside _userBaseDn
* additional ldap tests to cover enhancement of #2842

Signed-off-by: Alexei Pastuchov <alexei.pastuchov@telecolumbus.de>
2018-09-11 15:57:48 +10:00
olivier lamy
a8e9a8a78b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 14:21:49 +10:00
Jan Bartel
2dd5fec4f4
Issue #2740 Ensure OSGiWebappClassLoader uses bundleloader for all loadClass methods. (#2804)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-11 12:04:31 +10:00