Commit Graph

19468 Commits

Author SHA1 Message Date
Simone Bordet f10325ea50
Merge pull request #3959 from eclipse/jetty-10.0.x-3952-server_direct_heap_bytebuffers
Fixes #3952 - Server configuration for direct/heap ByteBuffers.
2019-09-23 15:24:47 +02:00
Joakim Erdfelt 43449021d0 Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
2019-09-20 17:56:21 -05:00
Joakim Erdfelt c7a3dd4a27
Merge pull request #4107 from eclipse/jetty-9.4.x-4084-silence-blockingtimeout-warning
Issue #4084 - squelch deprecated warning on <Set> call.
2019-09-20 17:54:46 -05:00
Joakim Erdfelt a7856dd6d0 Issue #4084 - Removing System.err|out usage in tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-20 17:13:10 -05:00
Joakim Erdfelt 8e20f23b52 Removing aggregate javadoc, as it's incompatible with release on JDK 9+ 2019-09-19 15:08:22 -05:00
Joakim Erdfelt bb659e0e58 Issue #4084 - squelch deprecated warning on <Set> call.
+ The XML warning on Deprecated will be squelched (set to DEBUG)
  if the <Set> call has a <Property> (or <SystemProperty>)
  that is using its default value.
  All other uses will still result in WARN level logging event.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-19 13:25:53 -05:00
Joakim Erdfelt 2268983a39 Revert "Issue #4084 make deprecated warnings only with debug in jetty-9"
This reverts commit 157910d79a.
2019-09-18 16:18:41 -05:00
olivier lamy 5288dfcb40 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-18 10:41:31 -04:00
olivier lamy 69d52b2263 fix unit test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-18 09:54:52 -04:00
Greg Wilkins e690b45f87
Merge pull request #4097 from eclipse/jetty-10.0.x-ConfigurationCleanup
Configuration cleanup
2019-09-18 18:30:23 +10:00
Greg Wilkins 6a32fb0ca5 Issue #4003 Cleanup quickstart
* cleanup from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 16:29:19 +10:00
Greg Wilkins cf5bd795d2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 16:03:50 +10:00
Greg Wilkins 157910d79a Issue #4084 make deprecated warnings only with debug in jetty-9
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 15:58:46 +10:00
Greg Wilkins 289c70ec9b Issue #4003 Cleanup quickstart
* cleanup from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 14:45:06 +10:00
Greg Wilkins 1b3ee6ee17 Configuration cleanup
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-18 10:50:53 +10:00
Lachlan f10ff81d1c
Fix Secure javax.websocket Client examples (#4035)
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-18 10:42:32 +10:00
Simone Bordet 0eec727a09 After review, renamed *directBuffers to *directByteBuffers.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-17 12:16:10 +02:00
Simone Bordet 44e4633af0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-17 11:37:47 +02:00
Simone Bordet f85382aa9d
Merge pull request #4086 from eclipse/jetty-9.4.x-1036-SchedulerThreads
Issue #1036 Configure Scheduler
2019-09-17 11:37:23 +02:00
Simone Bordet 92b477e49f Fixed test after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-17 11:29:06 +02:00
Simone Bordet bee079c021 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-17 11:18:51 +02:00
Simone Bordet bb27fa6cc0 Issue #3747 - Make Jetty Demo work with JPMS.
Added distribution test for running with JPMS.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-17 11:18:14 +02:00
Simone Bordet 2124deca18
Merge pull request #4093 from eclipse/jetty-9.4.x-3747-make_demo_work_with_jpms
Fixes #3747 - Make Jetty Demo work with JPMS.
2019-09-17 10:56:54 +02:00
Greg Wilkins c37c62323c updates from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-17 12:41:06 +10:00
Greg Wilkins bcf6b4c581 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-1036-SchedulerThreads 2019-09-17 12:36:23 +10:00
Lachlan Roberts eef6e21366 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-09-17 11:01:23 +10:00
Lachlan Roberts 42f1214796 fix OpenID module after rename of authenticateNewUsers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-17 10:54:22 +10:00
Simone Bordet 422b9bded5 Fixes #3747 - Make Jetty Demo work with JPMS.
Introduced module `jdbc` and made other modules that require JDBC depend on it.
Modified demo.ini to enable the `jdbc` module because some webapp descriptor
of the demo requires JDBC classes.

Now the demo can be run fine on the module-path just by adding --jpms.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-16 22:57:55 +02:00
Simone Bordet 1ef4a416b5 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3952-server_direct_heap_bytebuffers'. 2019-09-16 12:26:26 +02:00
Lachlan b027aa5afa
Fixes #3705 - revert ClientUpgradeRequest error handling logic (#4090)
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-16 17:21:33 +10:00
olivier lamy 85705ca8eb fix build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-14 09:11:16 +10:00
Joakim Erdfelt ed30f86313 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-13 16:42:34 -05:00
Joakim Erdfelt e013c24326
Merge pull request #4038 from eclipse/jetty-9.4.x-OpenId
OpenID Connect Authentication
2019-09-13 16:42:17 -05:00
Simone Bordet b3912d54fe Fixes #137 - Support OAuth.
Review and code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-13 22:01:57 +02:00
Joakim Erdfelt 0ef573b421 Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-13 12:21:49 -05:00
Joakim Erdfelt 8cd1759681
Merge pull request #4087 from eclipse/jetty-9.4.x-3982-WebSocketConnectionStatsTest
Issue #3982 - fix flaky test WebSocketStatsTest
2019-09-13 12:19:02 -05:00
Joakim Erdfelt 3861e9f9ca Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
2019-09-13 10:02:05 -05:00
Joakim Erdfelt 39c230f294
Merge pull request #4083 from eclipse/jetty-9.4.x-97-Unavailable
Issue #97 ServletHolder unavailable handling
2019-09-13 09:58:09 -05:00
Greg Wilkins ae0ab46066 Issue #97 Unavailable handling
Added test for servlet component lifecycle
Fixed bug where we were destroying listeners before calling them.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-13 11:40:11 +10:00
Lachlan Roberts 22fba9aa91 Issue #3106 - deprecate old WebSocket stats mechanism
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-13 11:28:05 +10:00
Lachlan Roberts 63c7a44969 Issue #3982 - fix to WebSocket bytesIn for flaky WebSocketStatsTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-13 11:18:57 +10:00
olivier lamy 460e42c701 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-13 11:18:11 +10:00
olivier lamy 2d6e9b0efc use maven invoker plugin 3.2.1 released version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-13 11:17:34 +10:00
Lachlan Roberts c2eff992b7 Issue #3982 - fix to WebSocket bytesIn for flaky WebSocketStatsTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-13 11:15:13 +10:00
Greg Wilkins 92e4d73dcb Issue #1036 Configure Scheduler
Allows scheduler configuration

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-13 09:52:28 +10:00
olivier lamy b5d67adde1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-13 07:03:23 +10:00
olivier lamy a117c4428a fix typo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-13 06:22:09 +10:00
Simone Bordet 6e8b610f30 Fixed compilation errors after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-12 16:44:19 +02:00
Simone Bordet 098f5029c8 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-12 15:51:23 +02:00
Simone Bordet 575a74d148
Merge pull request #4079 from eclipse/jetty-9.4.x-2815-hpackOpaqueBytes
Issue #2815 - HPack Opaque Bytes
2019-09-12 15:42:36 +02:00