olivier lamy
825838f3a9
fix format
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:41:22 +10:00
olivier lamy
a21f2aa578
fix async-rest-jar bundle name typo
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:40:15 +10:00
olivier lamy
bbd45fa66d
Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
...
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:40:11 +10:00
Olivier Lamy
9ca77a23aa
issue #3186 add it to override javax.annotation provided by maven core ( #3194 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:38:11 +10:00
Lachlan Roberts
3bcb4d8229
Issue #3167 - lazily create the WebSocketCoreClient
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-12-18 17:19:55 +11:00
Greg Wilkins
28533d4ca6
Merge pull request #3205 from eclipse/jetty-9.4.x-3202-async-session-create
...
Issue #3202 Ensure sessions created during async are cleaned up.
2018-12-18 16:43:20 +11:00
Greg Wilkins
503bd71d4c
Issue #3202
...
Handle async cross context session completion
2018-12-18 16:00:46 +11:00
Greg Wilkins
06bbab50f9
Issue #3202
...
Handle async cross context session completion
2018-12-18 14:07:16 +11:00
Jan Bartel
34b6ecec6c
Issue #3202 Ensure sessions created during async are cleaned up.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-18 09:32:12 +11:00
Greg Wilkins
1999b23d67
Merge pull request #3198 from eclipse/jetty-10.0.x-3129-websocket
...
Issue #3129 rename websocket directories, modules and artifacts
2018-12-18 09:28:25 +11:00
Greg Wilkins
f2f6598ddc
Fixed param name after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-18 08:46:52 +11:00
olivier lamy
9af977fa93
fix async-rest-jar bundle name typo
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-17 10:05:53 +10:00
olivier lamy
471dab752b
Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
...
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-17 10:05:53 +10:00
Olivier Lamy
f26b9f7c15
issue #3186 add it to override javax.annotation provided by maven core ( #3194 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-15 12:35:16 +10:00
WalkerWatch
7c4d12fb7d
Updating for customrequestlog impl
...
Signed-off-by: WalkerWatch <ctwalker@gmail.com>
2018-12-13 13:43:22 -05:00
Greg Wilkins
6590dfe832
fixed javax websocket OSGi test
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 16:19:16 +11:00
Jan Bartel
3acb98f477
Issue #3161 Update to Apache JSP 8.5.35 ( #3163 )
...
* Issue #3161 Update to Apache JSP 8.5.35
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-13 14:57:14 +11:00
Greg Wilkins
fb06b82172
Issue #3030 ignore identity content encoding during parameter extraction
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 13:42:08 +11:00
Greg Wilkins
1176b267b5
removed -impl from websocket name and fixed SCI
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
Greg Wilkins
52d0d62594
Configure default EndpointIdentificationAlgorithm for WebSocketCoreClient
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 09:36:13 +11:00
Greg Wilkins
9a67114c43
work in progress to fix websocket OSGi
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-12 17:35:46 +11:00
Jan Bartel
61686843db
Issue #3162 Partial fix for javaxwebsocket in osgi, wip.
2018-12-12 14:44:04 +11:00
Joakim Erdfelt
ff0aa965c4
Issue #3162 - Attempting to address ServiceLoader with javax.websocket (client) on OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-12-12 14:43:58 +11:00
Greg Wilkins
8320d88698
Disable test that fails
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-11 18:02:07 +11:00
Greg Wilkins
252bb5dd72
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3129-websocket
2018-12-11 17:02:16 +11:00
Jan Bartel
6af567a4b9
Handle ServletContainerInitializer from WEB-INF/classes #3146 ( #3158 )
...
* Handle the case where a ServletContainerInitializer comes from
WEB-INF/classes
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-11 06:33:44 +01:00
Simone Bordet
2497cf6feb
Merge pull request #3193 from bjorncs/low-resource-monitor
...
Change access of LowResourceCheck to public
2018-12-10 14:17:21 +01:00
Bjørn Christian Seime
71c0e47446
Change access of LowResourceCheck to public
...
This interface is currently package-private while it's in the
signature of several public methods (e.g. addLowResourceCheck, getLowResourceChecks)
Signed-off-by: Bjørn Christian Seime <bjorncs@yahoo-inc.com>
2018-12-10 13:39:29 +01:00
olivier lamy
14ffa0d981
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-08 18:42:42 +10:00
Torbjørn Martinsen
e7be376882
Update DoSFilter.java ( #3191 )
...
Add missing word and remove extra space in comments
2018-12-06 17:59:08 +10:00
Olivier Lamy
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
Greg Wilkins
e8d468b3e1
work in progress
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 14:45:23 +01:00
Greg Wilkins
13ee892921
Merge remote-tracking branch 'remotes/lachlan/jetty-10.0.x-3129-websocketModuleRefactor' into jetty-10.0.x-3129-websocket
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-05 09:55:22 +01:00
Jan Bartel
f4cf671b27
Issue #3129 Fix websocket in osgi; javax websocket test still broken.
2018-12-05 09:38:13 +01:00
olivier lamy
c0655ce634
Revert "fix argLine inheritance ( #3177 )"
...
This reverts commit 3e6ab2d1ac
.
2018-12-03 13:25:00 +10:00
Olivier Lamy
3e6ab2d1ac
fix argLine inheritance ( #3177 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-03 11:20:20 +10:00
Greg Wilkins
18b0ad842a
Merge pull request #3160 from eclipse/jetty-10.0.x-113-customrequestlog
...
Issue #113 CustomRequestLog as default in jetty-10
2018-12-01 16:32:45 +01:00
Greg Wilkins
81ca90b1f6
Issue #113
...
Deletes the deprecated NcsaRequestLog classes
Updates modules to use CustomRequestLog by default
Move jetty-customrequestlog.xml from home to base
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-01 16:31:23 +01:00
olivier lamy
3e1f814674
Merge remote-tracking branch 'upstream/jetty-9.4.x' into jetty-10.0.x
2018-11-30 17:59:42 +10:00
Olivier Lamy
b4ab8a07c1
#2718 take care of starting new created context ( #3145 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-30 17:55:51 +10:00
Lachlan Roberts
e8ba030904
Issue #3129 - refactor of javax websocket package names
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-11-29 17:43:51 +01:00
Simone Bordet
99d1983ebd
Issue #3011 - Move HttpCompliance to HttpConfiguration.
...
Fixed jetty-https.xml.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:41:25 +01:00
Greg Wilkins
aeb200e583
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-29 12:10:58 +01:00
Greg Wilkins
132aef4420
Issue #113
...
default to extended format
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 12:10:18 +01:00
Greg Wilkins
0d4e20b964
Issue #113
...
Fixed merge to 10
2018-11-29 11:08:55 +01:00
Greg Wilkins
bbc7037171
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-29 11:06:49 +01:00
Greg Wilkins
7742650fa5
Issue #113
...
Fixed property names
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:55:00 +01:00
Greg Wilkins
fc39e96653
Issue #113
...
Updated customrequestlog module defaults for timezone
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:34:42 +01:00
Greg Wilkins
e7d4f55891
Issue #113
...
Use CustomRequestLog in examples.
Convenience constructors
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-29 10:13:12 +01:00
Greg Wilkins
720e561008
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-29 09:32:50 +01:00