Commit Graph

18187 Commits

Author SHA1 Message Date
olivier lamy 85fd1db963 add jpms test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy d9bfece0cc rename class, add more javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 6a42d3ba08 Issue #3343 add api/tools to test jetty distribution
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 972dc015bb sugar syntax changes
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
Simone Bordet b786a2c826 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:27:45 +01:00
Simone Bordet 875af5c692 Restored Automatic-Module-Name that was removed in 471dab752.
Cleaned up pom.xml files that required a correct JPMS module name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:16:07 +01:00
olivier lamy 0ef58dd42e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-02-11 17:47:50 +10:00
olivier lamy 9c655cbd29 do not record unit test failure twice with jdk11
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 17:46:00 +10:00
Simone Bordet b9f89af847 Fixes #3320 - Review Jetty 10 module-info.java.
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 17:30:27 +01:00
Simone Bordet d575091c08 Fixes #3178 - BufferingResponseListener does not clear buffer in onHeaders.
Updated javadocs to specify that the class is not reusable.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 13:35:40 +01:00
Simone Bordet 39d8795c6d
Merge pull request #3338 from eclipse/jetty-10.0.x-3333-standalone_jpms
Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
2019-02-08 11:02:58 +01:00
Simone Bordet 6f7e1e3c48 Fixes #3333 - Jetty 10 standalone cannot start on the module-path.
Added --add-modules=ALL-MODULE-PATH by default because now Jetty has
proper JPMS modules and when starting in standalone mode only the
org.eclipse.jetty.xml module will be in the module graph - while
before automatic modules where added to the module graph implicitly.

Added --add-reads=ALL-UNNAMED to the websocket module to allow the
websocket implementation to access method handles of application
classes (the websocket endpoints) that live in the web application
classloader (which forms an unnamed module).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 17:48:17 +01:00
Simone Bordet e2506d4811
Merge pull request #3168 from eclipse/jetty-10.0.x-3162_jetty_servlet_api
Issue #3162 - Use Jetty specific Servlet API jar.
2019-02-07 17:33:14 +01:00
Simone Bordet a005bfd360 Issue #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient.
Fixed compilation errors after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 16:24:22 +01:00
Simone Bordet 9286cdcf09 Issue #3162 - Use Jetty specific Servlet API jar.
Updated references to Servlet jar to "jetty-servlet-api".

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-07 13:08:26 +01:00
Simone Bordet 6d44b13945 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-02-07 10:44:40 +01:00
Simone Bordet c9f73878c9
Merge pull request #3327 from eclipse/jetty-9.4.x-3154-hostname_verifier
Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient
2019-02-07 10:42:27 +01:00
Greg Wilkins 3d096c9e99 Merge branch 'jetty-10.0.x-3290-websocket-close' of https://github.com/lachlan-roberts/jetty.project into jetty-10.0.x-3290-websocket-close
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 14:17:25 +11:00
Lachlan Roberts c86bf2e57f Issue #3290 - review changes, javadoc and todos
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-07 14:09:23 +11:00
Greg Wilkins 11dfe70fc2 Add a Throwable case to EndPoint and Connection onClose notifications
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 11:55:40 +11:00
Greg Wilkins 2a69fcc7ac Merge branch 'jetty-10.0.x-3290-websocket-close' of https://github.com/lachlan-roberts/jetty.project into jetty-10.0.x-3290-websocket-close
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 11:49:33 +11:00
Lachlan Roberts 1709c90286 Issue #3290 - fixing issues with WebSocketClose
introduce channelState check in the catch in WSChannel sendFrame
to guard from multiple closes

WebSocketConnection fillAndParse will now try to read until EOF

removed state change in the isOutputOpen check in webSocketChannelState
to as we do the state change in the catch block in WSChannel

added and improved WebSocketCloseTest to test more cases

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-07 09:58:43 +11:00
Lachlan Roberts ff1f3ca3be Issue #3290 - WebSocket read and writer error handling
when the WSConnection reads EOF it now notifies the WSChannel
the channel instead of handling it locally

fixed FlusherFlusher failure issues

fixed issue with the WebSocketCloseTest expecting close reason

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-07 09:58:08 +11:00
Jan Bartel 1d334d0f01 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-07 09:23:52 +11:00
Jan Bartel 9a25f2757e
Issue #3307 WebAppClassLoader.loadClass call resolveClass if resolve==true (#3328)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-07 09:22:42 +11:00
Simone Bordet 47871fb41e Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient.
Added javadocs after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-06 22:31:28 +01:00
Greg Wilkins e1f3499ff4 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3225-sendErrorNoReason 2019-02-07 08:31:07 +11:00
Greg Wilkins 11bb07da1b Disable test until fix for #3334
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 08:30:42 +11:00
Greg Wilkins fd3e2157ba Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3225-sendErrorNoReason 2019-02-07 07:49:12 +11:00
Joakim Erdfelt 12628adc10 Issue #3278 - ResourceCollection NPE
+ Adding tests + more NPE / ISE / IAE fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-06 11:46:34 -06:00
Jan Bartel 08f1969f64 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-06 17:58:23 +11:00
Tushar I cd304eb65b Issue #150: Ability to handle JAR directories in extraClasspath. (#3325)
* Issue #150: Ability to handle JAR directories in extraClasspath. In keeping with Java conventions[0], any directory paths ending in /* should be considered a JAR directory and all jars in that directory will be added (non recursively) to the classpath.

[0] https://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html

Signed-off-by: Tushar Inamdar <tusharinamdar@hotmail.com>
2019-02-06 17:56:54 +11:00
Jan Bartel fb90666931 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-06 17:24:06 +11:00
Jan Bartel adc2d43536
Issue #3329 Hazelcast remove session fails (#3330)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-06 17:18:40 +11:00
Greg Wilkins 5d9c55be8f Issue #3225 sendError does not set reason.
The message string passed to sendError should only be used for the
error page content and not for the reason string.

Setting the reason in a response via setStatus(int,String) is deprecated

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-06 17:12:02 +11:00
Simone Bordet 8964608bfc Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient.
Added a SslHandshakeListener to SslConnection that performs
the host name verification (only on the client) if the
HostnameVerifier has been configured in SslContextFactory.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-05 15:48:17 +01:00
Jan Bartel ebef147d93 Issue #3278 Empty ResourceCollection throws NPE
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-05 16:14:18 +11:00
Joakim Erdfelt 0817928ea6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api 2019-02-04 19:49:34 -06:00
Joakim Erdfelt e4df1fe8af Issue #3162 - Correcting javadoc 2019-02-04 19:34:20 -06:00
Joakim Erdfelt b09f1de035 Issue #3162 - Fixing compilation issues 2019-02-04 19:32:00 -06:00
Greg Wilkins 7fca634292 fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 10:48:07 +11:00
Jan Bartel aeba829b33
Issue #3308 Remove deprecated session methods (#3309)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-05 10:08:49 +11:00
Simone Bordet cd488c2d7d Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-3162_jetty_servlet_api'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 23:11:32 +01:00
Simone Bordet d22ec03acc
Merge pull request #3287 from eclipse/jetty-9.4.x-3049-sslcontextfactory_warnings
Issue #3049 - Warn on common SslContextFactory problematic configurations
2019-02-04 22:56:32 +01:00
Simone Bordet 107170adf8 Issue #3162 - Use Jetty specific Servlet API jar.
Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 22:55:21 +01:00
Simone Bordet 6c0eee7012
Merge pull request #3322 from eclipse/jetty-9.4.x-3210-unmanaged_threadpool
Fixes #3210 - Threadpool module creates unmanged threadpool.
2019-02-04 22:52:30 +01:00
Greg Wilkins a41f270e47
Merge pull request #3310 from lachlan-roberts/jetty-10.0.x-3298-completableFutures
Issue #3298 - WebSocket UpgradeRequests and CompletableFutures
2019-02-05 08:40:18 +11:00
Greg Wilkins 0809228549 Issue #3317 avoid double log of exception
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:28:37 +11:00
Greg Wilkins 2405e5417d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:24:38 +11:00
Greg Wilkins 051edc94d7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:21:38 +11:00