Greg Wilkins
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
olivier lamy
b48364c298
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 19:54:09 +11:00
olivier lamy
083c8045e8
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 16:10:52 +11:00
Joakim Erdfelt
bd01e1877a
Updating to version 9.2.25-SNAPSHOT
2018-01-05 11:35:42 -06:00
Joakim Erdfelt
a617842695
Updating to version 9.2.24.v20180105
2018-01-05 10:11:08 -06:00
Joakim Erdfelt
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
Joakim Erdfelt
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
Joakim Erdfelt
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
Joakim Erdfelt
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
Jesse McConnell
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
Jesse McConnell
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
Greg Wilkins
978fe59957
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 15:38:50 +11:00
Greg Wilkins
1dab620fe4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 15:38:05 +11:00
Greg Wilkins
8ea8295a4c
javadoc
2017-10-18 15:37:41 +11:00
Jan Bartel
2555f7a65b
Issue #1852
2017-09-27 14:32:14 +10:00
Joakim Erdfelt
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
Joakim Erdfelt
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
Joakim Erdfelt
1311052b15
Cleaning up state of branch to match the original jetty-9.4.x
...
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Joakim Erdfelt
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -07:00
Joakim Erdfelt
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
Joakim Erdfelt
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
Joakim Erdfelt
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
Joakim Erdfelt
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
Joakim Erdfelt
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07:00
Joakim Erdfelt
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
Joakim Erdfelt
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
Joakim Erdfelt
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
Greg Wilkins
b5a3eb1f70
removed Configuration marker classes
2017-05-11 11:32:23 +02:00
Greg Wilkins
1fc046fb3d
renamed for clarity
2017-05-09 09:52:20 +02:00
Joakim Erdfelt
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
Joakim Erdfelt
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
Joakim Erdfelt
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
Simone Bordet
cab1ec77ad
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-02 10:03:30 +02:00
Greg Wilkins
5493c9e596
Refactor ServletHandler to add getMappedServlet method ( #1519 )
2017-05-01 16:38:55 +02:00
Greg Wilkins
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
Joakim Erdfelt
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
Jan Bartel
8885f24ccb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 11:26:09 +10:00
Jan Bartel
daafc8fed1
Issue #877
...
Add test case
2017-04-12 11:08:07 +10:00
Joakim Erdfelt
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
Joakim Erdfelt
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
Jan Bartel
976ffb7ecd
Issue #877
...
And also #1117
2017-03-23 11:24:22 +11:00
Joakim Erdfelt
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
Joakim Erdfelt
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
Joakim Erdfelt
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
Greg Wilkins
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
Joakim Erdfelt
6cf0663fe8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-03-08 17:47:27 -07:00
Joakim Erdfelt
298de714f6
More windows build fixes
2017-03-08 15:29:54 -07:00
Joakim Erdfelt
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
Jesse McConnell
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
Jesse McConnell
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
Jesse McConnell
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
Jesse McConnell
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
Jesse McConnell
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
Jesse McConnell
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Jan Bartel
d33f42fbab
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 10:26:11 +11:00
Jan Bartel
255ae29e2a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-19 10:25:13 +11:00
Jan Bartel
eeae3bfdad
Issue #1274
2017-01-19 10:24:31 +11:00
Joakim Erdfelt
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
Joakim Erdfelt
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
Joakim Erdfelt
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
Joakim Erdfelt
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
Jesse McConnell
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
Jesse McConnell
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
Jesse McConnell
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
Jesse McConnell
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
Jan Bartel
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +11:00
Jan Bartel
ce6054391c
Issue #877
2016-12-01 11:57:54 +11:00
Jan Bartel
79c364368d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-24 15:51:06 +11:00
Jan Bartel
40d9e56d92
Issue #1117
2016-11-24 14:04:37 +11:00
Joakim Erdfelt
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
Joakim Erdfelt
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
Joakim Erdfelt
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
Greg Wilkins
eda0cff90a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-28 10:55:03 +11:00
Greg Wilkins
9f430ae7f7
Issue #1038 i
...
Handle resources as URIs
Avoid unneccessary trailing /
2016-10-28 10:50:39 +11:00
Greg Wilkins
6e1994641b
Issue #1038
...
Readded sorting of attributes by length
added .uri attributes
support WAR.path and WAR.uri in preference to WAR
updated for latest unit test
2016-10-28 10:31:22 +11:00
Greg Wilkins
b17dafc2ad
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-27 16:34:44 +11:00
Greg Wilkins
0f7028e9fa
Quickstart attribute normilazation #1038
...
Removed a lot of bad tests that incorrection assumed it was OK to mix Paths and URIs like:
jar:file:${jetty.base}/webapps/some.war!/some/path
refactored to keep PathAttributes and URIAttributes separate
2016-10-27 16:29:52 +11:00
Joakim Erdfelt
55c6514a2e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-26 16:42:42 -07:00
Joakim Erdfelt
7256d75e9c
Issue #1038 - fixes for MS Windows
2016-10-26 16:09:12 -07:00
Joakim Erdfelt
ca5e075ba0
Issue #1038 - treating ${WAR} as a URI always, not a Path
...
+ Still needs testing on MS Windows
2016-10-26 15:30:34 -07:00
Joakim Erdfelt
ebc8983721
Issue #1038 - correcting "file:" and double "//" behavior
2016-10-26 14:25:20 -07:00
Joakim Erdfelt
a7ac269027
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-26 11:42:49 -07:00
Joakim Erdfelt
c4a8e684c8
Fixes #1039 - AttributeNormalizer should not track null paths
2016-10-26 10:31:12 -07:00
Joakim Erdfelt
7328742ae5
Fixes #1038 - ${WAR} should be favored over other attributes, like ${jetty.base}
2016-10-26 10:23:58 -07:00
Joakim Erdfelt
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
Joakim Erdfelt
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
Jesse McConnell
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
Jesse McConnell
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
Joakim Erdfelt
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
Joakim Erdfelt
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
Joakim Erdfelt
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
Joakim Erdfelt
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
Joakim Erdfelt
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
Joakim Erdfelt
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
Joakim Erdfelt
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
Joakim Erdfelt
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
Jan Bartel
b1d0661655
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-01 18:33:29 +10:00
Jan Bartel
aeda5a40a2
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-01 18:31:39 +10:00
Jan Bartel
29e6c6c4a4
Issue #682
2016-07-01 17:48:32 +10:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
Jesse McConnell
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951
Merge: a50e882
301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c0
Merge: 5ae7da0
f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e9
Merge: 571d503
2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf62
Merge: 8e54aad
ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0
Merge: ea1deda
2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9
Merge: cfe9c83
f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e
Merge: f19bd2c
8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9
Merge: 36b5687
7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b5687329
Merge: 13d914a
e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c4
Merge: fd34007
692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2
Merge: 0e6d886
b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01
Merge: d150405
2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055de
Merge: 22a6cd0
3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe5
Merge: add9876
bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f83
Merge: 5263f15
eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acd
Merge: 89803ae
21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec95
Merge: 5fed7c7
779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0b
Merge: 4c8257d
d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770a
Merge: 14bde1f
96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3a
Merge: 9e82fa0
ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de4
Merge: 120e330
5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f
Merge: 6c5b95d
384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8
Merge: 722eb60
5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Joakim Erdfelt
c09f31a51d
Bumping up master to version 10.0.0-SNAPSHOT
2016-04-29 11:47:15 -07:00
Jan Bartel
d28dffb16e
Remove SessionManager; refactor names of session classes; add start modules for new session arch
2016-04-15 11:08:46 +10:00
Joakim Erdfelt
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
Joakim Erdfelt
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
Joakim Erdfelt
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
Joakim Erdfelt
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
Joakim Erdfelt
5353aeb573
Merge branch 'jetty-9.3.x'
2016-03-25 10:14:41 -07:00
Joakim Erdfelt
5d882d12ab
Fixing AttributeNormalizerTest to use real 'user.home'
...
+ Removing many debug lines
+ Resolving System.getProperty("user.home") to real system path
before using it in the test case
2016-03-24 11:04:13 -07:00
Joakim Erdfelt
81c8708c52
Attempting to ascertain what's going on with AttributeNormalizer on CI
2016-03-24 10:13:39 -07:00
Joakim Erdfelt
3628e105e9
Fixing QuickStart / AttributeNormalizer test failures
...
+ Adding more noise to test cases to help determine what's going on in
CI builds for test-quickstart
2016-03-23 21:28:27 -07:00
Jan Bartel
4ca9e3b149
Merge remote-tracking branch 'origin/jetty-9.3.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionManager.java
tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java
2016-03-24 11:38:44 +11:00
Joakim Erdfelt
36f559b483
Issue #446 - jetty-quickstart path normalization uses improper paths on Windows
...
Using URI syntax everywhere in AttributeNormalizer
2016-03-21 15:40:42 -07:00
Joakim Erdfelt
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
Joakim Erdfelt
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
Simone Bordet
f727e2bac3
Merged branch 'jetty9.3.x' into 'master'.
2016-02-13 11:32:53 +01:00
Joakim Erdfelt
30b5fe1c96
AttributeNormalizer.normalize() now supports URI
2016-02-12 09:29:49 -07:00
Joakim Erdfelt
bc59c0853d
Adjusting quickstart AttributeNormalizer to treat 'WAR' as a URI, not a Path
2016-02-12 09:11:19 -07:00
Joakim Erdfelt
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
Joakim Erdfelt
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
Simone Bordet
2ac465a343
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-09 18:14:07 +01:00
Simone Bordet
6306f06e2f
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-09 18:12:04 +01:00
Simone Bordet
145e4bee71
487511 - Jetty HTTP won't work on turkish systems.
...
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
2016-02-09 17:50:26 +01:00
Greg Wilkins
df79ad689a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-04 07:00:13 +01:00
Joakim Erdfelt
7d50167ec1
486674 - Quickstart path attribute normalization should be based on longest path match
...
+ Adding weight to individual PathAttribute's to allow specific
keys to win in the situation where more than 1 key is the same path value
2016-02-02 10:00:55 -07:00
Joakim Erdfelt
83bc83a99d
486674 - Quickstart path attribute normalization should be based on longest path match
2016-01-27 11:55:08 -07:00
Joakim Erdfelt
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
Joakim Erdfelt
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
Greg Wilkins
c5cbc64e77
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-01-14 11:00:06 +11:00
Joakim Erdfelt
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07:00
Greg Wilkins
682f09bebb
485712 - Quickstart web.xml is absolute
2016-01-13 15:17:58 +11:00
Greg Wilkins
e2a0794d91
485712 - Quickstart web.xml is absolute
2016-01-13 12:47:25 +11:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Greg Wilkins
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
Joakim Erdfelt
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
Joakim Erdfelt
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
Joakim Erdfelt
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
Joakim Erdfelt
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
Joakim Erdfelt
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
Jesse McConnell
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
Jesse McConnell
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
Jesse McConnell
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
Jesse McConnell
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
Joakim Erdfelt
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
Joakim Erdfelt
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
Joakim Erdfelt
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
Joakim Erdfelt
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
Jesse McConnell
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
Jesse McConnell
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
Jesse McConnell
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
Jesse McConnell
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
Jan Bartel
75640039fd
471272 ArrayIndexOutOfBoundsException in org.eclipse.jetty.quickstart.PreconfigureQuickStartWar
2015-07-01 15:06:04 +10:00
Jan Bartel
3ac6a727cf
470803 If a webapp is not fully started do not fully stop it
2015-06-25 18:29:51 +10:00
Jesse McConnell
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
Jesse McConnell
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
Joakim Erdfelt
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
Joakim Erdfelt
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
Joakim Erdfelt
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
Joakim Erdfelt
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
Joakim Erdfelt
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
Joakim Erdfelt
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
Joakim Erdfelt
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Jesse McConnell
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
Jesse McConnell
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
Jesse McConnell
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
Jesse McConnell
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Joakim Erdfelt
4db2784354
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 16:54:50 -07:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Joakim Erdfelt
e92bcccc84
Using new Decorator
2015-03-12 10:09:53 -07:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Jesse McConnell
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
Jesse McConnell
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
Jesse McConnell
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
Jesse McConnell
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
Jesse McConnell
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
Jesse McConnell
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
Greg Wilkins
41e95bfa5a
added TLD to quickstart example
2014-09-23 11:33:44 +02:00
Greg Wilkins
709ac00f8b
added TLD to quickstart example
2014-09-22 15:52:40 +10:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Greg Wilkins
edcb56ae6b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
Greg Wilkins
4c8e2a6635
442642 Quickstart generates valid XML
...
Fixed issues with XmlParser and WebDescriptor that were stopping validation.
2014-08-27 16:38:49 +10:00
Greg Wilkins
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
Greg Wilkins
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
Greg Wilkins
aaa2e5c6c1
refined PathResource alias handling
2014-08-02 12:58:24 +10:00
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Joakim Erdfelt
17a9fb2a3d
Fixing build
...
+ Quick start example is now in /examples/quickstart/ to avoid
dependency loop
+ Forgotten tests are now versioned correctly at 9.3.0
2014-07-23 10:47:19 -07:00
Joakim Erdfelt
4f88f2fce2
Fixing build
...
+ Quick start example is now in /examples/quickstart/ to avoid
dependency loop
+ Forgotten tests are now versioned correctly at 9.3.0
2014-07-21 15:51:44 -07:00
Greg Wilkins
853e020210
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-16 15:31:48 +10:00
Jan Bartel
5f77a0ef72
439394 load-on-startup with value 0 not preserved for quickstart
2014-07-11 16:25:32 +10:00
Jan Bartel
d5c210f1c3
439390 Ensure jsp scratchdir is created same way for quickstart and non-quickstart
2014-07-11 16:06:40 +10:00
Jan Bartel
644eccab8b
439387 Ensure empty servlet-class never generated for quickstart
2014-07-11 14:16:24 +10:00