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
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
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
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
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
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
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
b9281e323d
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
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
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
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
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
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
c25cbf3480
Issue #3162 - Reverting not-relevant JspConfig change.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-30 12:47:25 -06:00
26fa79a050
Issue #3162 - Reverting not-relevant OSGi changes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-30 12:43:36 -06:00
755d5728d9
Issue #3162 - Using snapshot repositories on CI (temporary)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-30 12:43:21 -06:00
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
bd0a61b1d5
Merge pull request #3286 from lachlan-roberts/jetty-10.0.x-websocketmapping-refactor
...
WebSocketMapping Refactor to have a mapping per filter/servlet
2019-01-30 14:56:27 +11:00
ce976b5aa3
Issue #3249 Update to apache jsp 9.0.14 ( #3299 )
...
* Issue #3249 Update to apache jsp 9.0.14
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-30 14:31:58 +11:00
e789cd6834
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-01-30 14:26:52 +11:00
78dc801153
WebSocketMapping Refactor - add javadoc for WebSocketComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-30 14:02:50 +11:00
169d93e790
Jetty 9.4.x 3284 sessions and system clock jitter ( #3296 )
...
* Issue 3284 System clock jitter can affect session timers.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-30 14:02:35 +11:00
deaaa0bf30
Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor
2019-01-30 13:49:10 +11:00
58b73c10af
Merge pull request #3291 from eclipse/jetty-10.0.x-3290-websocket-onOpen
...
Issue #3290 async websocket onOpen, onError and onClose
2019-01-30 12:05:09 +11:00
b0aec2b26e
fix bug in WebSocketMapping failing isInstance test
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-29 15:26:16 +11:00
f5751618bd
Issue #3290 async onOpen, onClose and onError
...
Fixed OSGi tests.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 13:08:35 +11:00
8c5d421b5b
remove unnecessary imports in jetty-websocket-tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-29 12:03:53 +11:00
cf0eaecbdc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3290-websocket-onOpen
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:59:08 +11:00
1d9e7b7613
Merge pull request #3199 from lachlan-roberts/jetty-10.0.x-3139-npe-websocket-sci
...
Issue #3139 - NPE in WebSocketContainerInitializer for jetty10
2019-01-29 10:56:59 +11:00
3ad584eaef
Issue #3290 async onOpen, onClose and onError
...
Changes after review:
+ failure to send abnormal close closes connection prior to failing
callback.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:45:54 +11:00
6f7395c8f0
Issue #3290 async onOpen, onClose and onError
...
Changes after review:
+ fixed import order
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:38:12 +11:00
84d74ba1de
Issue #3290 async onOpen, onClose and onError
...
Changes after review:
+ removed Adaptor from FrameHandler, so all non test usages of
FrameHandler now use async API.
+ Fixed sequencing of multiple async operation so callback is notified
after completion (created more Callback.from utilities for this)
+ fixed import order
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-29 10:33:37 +11:00
402d756ea5
rename websocket-tests module to jetty-websocket-tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-29 10:29:38 +11:00
1171d7c8d7
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3290-websocket-onOpen
2019-01-26 18:16:30 +11:00
8b93922d08
Issue #3290 async onOpen, onClose and onError
...
Gave onOpen, onError and onClose callback signatures
Illegal to ask for demand prior to onOpen success
added tests for various onOpen scenarios
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-01-26 15:34:50 +11:00
fe5b7be7f6
Fixes #3293 HttpClientTLSTest.testNoCommonTLSProtocol() fail with jdk 11.0.2.
...
Updated to force TLS 1.3 vs TLS 1.2, rather TLS 1.2 vs TLS 1.1.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-25 17:02:00 +10:00
aa1d6ff9cd
WebSocketMapping refactor changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-25 17:11:27 +11:00
a8a5e50579
Issue #3139 ContextHandler must be set on server before configureContext
...
If configure context is called with a context that does not yet have
a server, we should just throw an ISE. This is better than having a
different configuration result depending on if the context has been set
been added to the handler tree or not.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-25 17:05:26 +11:00
4d191d8a31
fix groupId ( #3294 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-25 16:04:33 +10:00
d2e2f52030
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-25 15:14:43 +10:00
6145fd7468
Issue #3166 add autobahn testsuite running via autobahn maven plugin ( #3292 )
...
Issue #3166 Add autobahn profile to automatically run autobahn test suite in Jenkins
2019-01-25 15:10:24 +10:00
0c85b3138f
rename of WebSocketResources to WebSocketComponents
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-25 11:57:03 +11:00
b2f2a16aed
Merge branch 'jetty-10.0.x-websocketmapping-refactor' of https://github.com/lachlan-roberts/jetty.project into jetty-10.0.x-websocketmapping-refactor
2019-01-25 11:38:40 +11:00
884afb5ba1
disable parse junit report when building compact3 profile
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-25 09:27:42 +10:00
5463b64a7c
do not parse junit report when building javadoc tests are reported one more time
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-25 08:27:00 +10:00
cf406b8854
do not parse junit report when building javadoc tests are reported one more time
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-25 07:40:42 +10:00
02dd7d1887
Merge pull request #3289 from eclipse/jetty-10.0.x-websocket-artifact-ids
...
Issue #3288 - Correcting Jetty WebSocket API artifactIds
2019-01-24 10:47:12 -06:00
43c7a4c00d
Fixes #3293 HttpClientTLSTest.testNoCommonTLSProtocol() fail with jdk 11.0.2.
...
Updated to force TLS 1.3 vs TLS 1.2, rather TLS 1.2 vs TLS 1.1.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-24 14:39:38 +01:00
15d998b269
fix javadoc with jdk 11.0.2
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 21:20:01 +10:00
ececab10ca
Issue #3139 - NPE in WebSocketContainerInitializer for jetty10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-01-24 17:18:29 +11:00
Simone Bordet
Joakim Erdfelt
olivier lamy
Greg Wilkins
Jan Bartel
Lachlan Roberts
Olivier Lamy