Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,886 Commits 55 Branches 466 Tags
Commit Graph

17886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Greg Wilkins
7fec51ad40 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 15:41:46 +11:00
Greg Wilkins
1189ceed4c 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 13:36:09 +11:00
Greg Wilkins
05dfbd18cd 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 13:25:29 +11:00
Jan Bartel
c2224e3118 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-01-22 12:42:55 +11:00
Jan Bartel
60158edd2b
Issue #3280 Remove unused build.properties from osgi (#3281) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-22 12:41:28 +11:00
Lachlan Roberts
4008005a0e Jetty WebSockets no longer use shared mapping 
mapping is now created for each WebSocketServlet

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 11:55:18 +11:00
Lachlan Roberts
e1674cf4b6 separate out resources from the WebSocketMapping 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-22 11:39:53 +11:00
Greg Wilkins
f9b9cc1313 Issue #2175 cleanups after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-22 09:11:05 +11:00
Greg Wilkins
8aca98976d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-2175-websocket-close 2019-01-22 08:47:27 +11:00
Lachlan Roberts
2ab6f3d66f added sharedresources 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-21 21:14:22 +11:00
Joakim Erdfelt
5bed6a4fd8 Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-18 11:17:49 -06:00
Simone Bordet
afa708a6b8
Merge pull request #3273 from oglueck/jetty-9.4.x 
make JAASPrincipal thread-safe
 2019-01-18 17:20:08 +01:00
Ortwin Glück
1df8dfcc91 make JAASPrincipal thread-safe 
It's immutable anyway, so declare its only instance var final.

Signed-off-by: Ortwin Glück <odi@odi.ch>
 2019-01-18 14:52:34 +01:00
Lachlan Roberts
0f2f1c1e92 new websocket-tests module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-18 16:39:26 +11:00
Lachlan Roberts
51feef6dcf javax websocket bug fixes, for duplicate mappings, and null messageSinks 
dont allow duplicate mappings to be added to websocket mapping for javax

succeed the callback in JavaxWebSocketFrameHandler with null messageSink

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-18 15:19:54 +11:00
olivier lamy
2f6d0b3fb7 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-17 15:35:27 +10:00
Olivier Lamy
766e088109
Issue #3241 Jetty runner add missing Main-Class in MANIFEST (#3260) 
* Issue #3241 no Main Class attribute in MANIFEST for jetty-runner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-17 15:24:07 +10:00
Lachlan Roberts
bc951030ba cleanup the isEnabledViaContext check in JavaxWebSocket SCI 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-17 12:27:42 +11:00
Simone Bordet
2ddd00ec37 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-16 17:33:13 +01:00
Simone Bordet
2a8b4c4c47 Updated ALPN to JDK 8u201 and 8u202. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-16 17:25:39 +01:00
Simone Bordet
0e17b56aaf Updated ALPN to JDK 8u201 and 8u202. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-16 17:12:25 +01:00
Simone Bordet
cdd553332c Updated ALPN version for JDK 8u201 and 8u202. 2019-01-16 17:03:51 +01:00
olivier lamy
14aa789738 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-01-16 21:48:57 +10:00
Greg Wilkins
f16789b101 Issue #3167 cleanups after merge (in #2175) 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-16 15:19:36 +11:00
Greg Wilkins
c89de87f38 Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-2175-websocket-close 2019-01-16 09:14:49 +11:00
Greg Wilkins
4f65799a7b
Merge pull request #3222 from eclipse/jetty-10.0.x-3167-websocket-mapping 
Jetty 10.0.x #3167 refactor websocket mapping
 2019-01-16 09:13:42 +11:00
Lachlan Roberts
2fc6185c29 Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-15 13:11:06 -06:00
olivier lamy
027a91d224 maven assembly plugin 3.1.1 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-15 21:20:46 +10:00
Simone Bordet
1eb6339a6d
Merge pull request #3255 from eclipse/jetty-10.0.x-2095-remove_fcgi_multiplex 
Fixes #2095 - Remove FastCGI multiplexing.
 2019-01-15 11:02:00 +01:00
Greg Wilkins
be69351f0e Merge branch 'jetty-10.0.x-3167-websocket-mapping' into jetty-10.0.x-3167-2175-websocket-close 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 18:02:41 +11:00
Greg Wilkins
4a70d1534e Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-01-15 17:59:09 +11:00
Greg Wilkins
5307f49bbc
Merge pull request #3259 from lachlan-roberts/jetty-10.0.x-websocket-tests 
Issue #3246 - javax-websocket-tests exception stacktraces
 2019-01-15 17:56:08 +11:00
Lachlan Roberts
dde42fc22e Issue #3246 - fix possible illegal javadoc symbol 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-15 17:54:53 +11:00