Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,187 Commits 73 Branches 465 Tags 370 MiB
Commit Graph

18187 Commits

Author SHA1 Message Date
Greg Wilkins 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
Lachlan Roberts 8c5d421b5b remove unnecessary imports in jetty-websocket-tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-29 12:03:53 +11:00
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 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
Lachlan Roberts 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
Greg Wilkins 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
Greg Wilkins 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
Simone Bordet 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
Lachlan Roberts aa1d6ff9cd WebSocketMapping refactor changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-25 17:11:27 +11:00
Lachlan Roberts 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
Olivier Lamy 4d191d8a31
fix groupId (#3294) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-25 16:04:33 +10:00
olivier lamy d2e2f52030 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-25 15:14:43 +10:00
Olivier Lamy 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
Lachlan Roberts 0c85b3138f rename of WebSocketResources to WebSocketComponents 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-25 11:57:03 +11:00
Lachlan Roberts 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
olivier lamy 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
olivier lamy 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
olivier lamy 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
Joakim Erdfelt 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
Simone Bordet 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
olivier lamy 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
Lachlan Roberts ececab10ca Issue #3139 - NPE in WebSocketContainerInitializer for jetty10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-24 17:18:29 +11:00
olivier lamy 3ffdd9427d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-24 14:41:39 +10:00
Olivier Lamy 34b2678e6d
issue #3254 add jsp test need to remove cdi-api and exclude it fron upperBound rule (#3268) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 14:34:41 +10:00
Lachlan Roberts ccdd6391cd Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor 2019-01-24 15:12:18 +11:00
Lachlan Roberts e98809c990 javax WebSocketMappings now stored in ContextHandler attributes 
WebSocketMappings are now stored as attributes in the ContextHandler

init params can be set on the filterHolder to specify what mapping
should be used

the default mapping is stored with attribute key
WebSocketMapping.DEFAULT_KEY and ensureFilter now doesn't ensure there
is an UpgradeFilter registered at "/*" but checks that there is an
UpgradeFilter using the default mapping

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-24 15:10:13 +11:00
Lachlan Roberts 1c999a1794 added missing licence headers 
fixed todo with default WebSocketUpgradeFilter path mapping

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-24 11:50:25 +11:00
Lachlan Roberts 7d26acd882 Issue #3182 - update documentation to use new location of example files 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-24 10:43:14 +11:00
Greg Wilkins 330a3e7f58 simple onOpen test 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-24 10:34:14 +11:00
Greg Wilkins f170191003 Fix problems with close unit tests before creating open unit tests 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-24 10:12:36 +11:00
Greg Wilkins 5f20651d06 Issue #3290 websocket onOpen states 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-24 09:48:30 +11:00
Joakim Erdfelt 5095c8a7b2 Issue #3288 - Correcting Jetty WebSocket API artifactIds 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-23 15:58:11 -06:00
Olivier Lamy 826c27a2b2
- move duplicate configuration to parent pom (#3265) 
- upgrade invoker plugin version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-24 07:29:49 +10:00
Joakim Erdfelt 0b3262e16c
Merge pull request #3275 from eclipse/jetty-10.0.x-issue-3274-exclude-osgi-foundation-conflicting-classes 
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
 2019-01-23 10:50:56 -06:00
Simone Bordet e4d78608a7 Issue #3049 - Warn on common SslContextFactory problematic configurations. 
Made default endpointIdentificationAlgorithm=HTTPS to avoid warnings
when SslContextFactory is used on a server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-23 17:31:41 +01:00
Lachlan Roberts d37dfd4357 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-websocketmapping-refactor 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-23 18:45:59 +11:00
Lachlan Roberts 90003dee13 Issue #3182 - restored old websocket example files 
added new test for these example files

added register and setCreator methods in WebSocketServlet to
give more compatibility with old api

implemented isUserInRole in UpgradeHttpServletRequest to get
example working

made the JettyWebSocketTest more clear

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-23 18:43:54 +11:00
Greg Wilkins 6fc1cb5ca6
Merge pull request #3262 from eclipse/jetty-10.0.x-3167-2175-websocket-close 
Jetty 10.0.x 3167 2175 websocket close clean up
 2019-01-23 10:32:16 +11:00
Lachlan Roberts b06601e5f1 disable checks for duplicate websocket mappings 
throwing on adding of a duplicate websocket mapping causes problems
in EndpointViaConfigTest where we can add mappings even if they have
already been discovered by annotation

added a todo to review why we can't implement this check

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-23 10:18:42 +11:00
Greg Wilkins d520ae5a11 Issue #2175 cleanups after review 
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-23 09:06:27 +11:00
Greg Wilkins 3d7ee93112 Issue #2175 cleanups after review 
Re implemented a queue and flusher above extension stack to serialize
frame handling without holding a lock when calling callbacks

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-23 08:49:55 +11:00
Simone Bordet 20f438d43a 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-01-22 17:44:06 +01:00
Simone Bordet e135de98fa Issue #132 - ClientConnector abstraction. 
Rewrote HttpClientTransportOverUnixSockets in light of ClientConnector.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-22 17:33:29 +01:00
Greg Wilkins d598e0dc6f Issue #2175 cleanups after review 
Improve ws error handling by splitting processError into handling for
errors from the network and errors from the application.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-22 21:20:01 +11:00
Lachlan Roberts 74a5cfa190 remove the word default from all WebSocketServletFactory methods 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 18:32:14 +11:00
Lachlan Roberts 15c6f5250d do not set WebSocketMapping in WSUpgradeFilter if already set 
the WSUpgradeFilter now has to be registered at "/" or "/*"

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 18:17:33 +11:00
Lachlan Roberts 3c2f728574 move check for duplicate mappings to WebSocketMapping class 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 18:08:31 +11:00