18019 Commits

Author SHA1 Message Date
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
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
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
11bb07da1b Disable test until fix for #3334
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-07 08:30:42 +11: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
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
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
Simone Bordet
6a64031840 Fixes #3210 - Threadpool module creates unmanged threadpool.
The thread pool is now created as a nested object, rather than a top
level object, so that it is not started before the Server instance.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 19:40:29 +01:00
Simone Bordet
33f314e9f5 Issue #3162 - Use Jetty specific Servlet API jar.
Updated to jetty-servlet-api:4.0.1, based on javax.servlet 4.0.1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:51 +01:00
Joakim Erdfelt
72ad74866c Issue #3162 - Reverting not-relevant OSGi changes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
Joakim Erdfelt
e135197066 Issue #3162 - Introducing more convenience Options for PaxExam
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
Joakim Erdfelt
95bc15f521 Issue #3162 - Correcting websocket issues in OSGi
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-04 18:51:51 +01:00
Simone Bordet
66f8259df3 Issue #3162 - Use Jetty specific Servlet API jar.
Removed references to jetty-osgi-servlet-api.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:26 +01:00
Simone Bordet
0d89f29e1b Issue #3162 - Use Jetty specific Servlet API jar.
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
  to match the new Jetty Servlet API jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:26 +01:00
olivier lamy
b9281e323d fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
olivier lamy
d8d1ecf6a1 use snapshot of maven-invoker-plugin because of NPE https://issues.apache.org/jira/browse/MINVOKER-247
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
Simone Bordet
514c6dff1e Issue #132 - ClientConnector abstraction.
Reverted refactoring of newConnection() to avoid
to bind the class to a too specific abstract method.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
Simone Bordet
51730a7ccf Issue #132 - ClientConnector abstraction.
Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
Simone Bordet
64a2bc346e Issue #132 - ClientConnector abstraction.
Added name to default executor and scheduler after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
Simone Bordet
3c9c78c835 Issue #132 - ClientConnector abstraction.
Introduced ClientConnector and refactored HttpClient transports,
removing duplicated code that was connect() to a remote host.

Refactored also HTTP2Client to reference ClientConnector.

Refactored tests accordingly to the changes introduced in the
implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:49:12 +01:00
Simone Bordet
fda815cd56
Merge pull request #3306 from eclipse/jetty-9.4.x-3305-avoid_select_now
Fixes #3305 - Avoid additional selectNow().
2019-02-04 11:44:13 +01:00
Simone Bordet
bf6521da5f
Merge pull request #3312 from eclipse/jetty-9.4.x-3311-http_https_same_port
Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
2019-02-04 09:17:35 +01:00
Lachlan Roberts
bfcb890ab2 Issue #3298 - rename typo in JettyWebSocketTest name
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-04 15:05:15 +11:00
Lachlan Roberts
77b7e275cc Issue #3298 - fix to pom file
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-02-04 14:54:27 +11:00
Simone Bordet
da490673af Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
Updated implementation and tests after reviews.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-03 14:24:07 +01:00