Joakim Erdfelt
650b804142
Issue #2108 - Updating license headers for year 2018
2018-01-09 10:14:52 -06:00
Joakim Erdfelt
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
Joakim Erdfelt
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -06:00
Joakim Erdfelt
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
Joakim Erdfelt
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
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
e07ba49283
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-29 11:07:51 +11: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
Jan Bartel
78a2c8c6d2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-06 15:46:49 +01:00
Jan Bartel
b1c80ba231
Issue #1986 ServletContextHandler.Context addListener() methods support session listeners ( #2000 )
...
* Issue #1986 Support session listeners in ServletContextHandler.addEventListener method.
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-30 15:03:37 +01:00
Jan Bartel
7f6e2e8dd0
Issue #1933
...
Cherry-pick of 29373c6
and 44d170e
2017-11-22 13:53:38 +01: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
Jan Bartel
406ebd9fe4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-11-16 15:32:41 +01:00
Jan Bartel
98d8c2400d
Issue #1933
...
Add some comments, changes from code review.
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-16 10:01:44 +01:00
Jan Bartel
12327b8876
Issue #1933
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-11-15 10:33:51 +01:00
Greg Wilkins
bdaeb657f6
Pull Request #1824 Fixed merged into Jetty-10
2017-10-31 18:01:53 +11: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
Jan Bartel
050d593056
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-17 16:45:31 +11:00
Greg Wilkins
5de895af88
Issue #1797
...
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-10-17 15:06:09 +11:00
Jan Bartel
ee4fd24cb1
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-09-27 15:44:55 +10:00
Jan Bartel
d81b835ad0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-27 12:19:54 +10:00
Jan Bartel
49b2823ee9
Merge pull request #1824 from jglick/WebAppClassLoader.addJars-ordering
...
Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order
2017-09-27 11:12:39 +10:00
Jan Bartel
e3bec841da
Issue #1838
2017-09-26 16:07:18 +10:00
Jesse Glick
7c460c7ea2
Apparently WebAppClassLoaderUrlStreamTest.testResources was already being skipped, so probably it is acceptable to skip .ordering in the same way.
2017-09-25 19:10:24 -04:00
Jesse Glick
1ffbf15fc1
@janbartel guided me to an analogue of WebAppClassLoaderTest.ordering.
2017-09-25 18:36:42 -04:00
Jesse Glick
fe0a0ead37
Minimizing diff lines at @janbartel’s request.
2017-09-25 18:21:01 -04:00
Greg Wilkins
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
Jan Bartel
d2064599b8
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-09-21 13:59:17 +10:00
Jesse Glick
8aa954a3c7
@janbartel suggests applying sorting also to WebInfConfiguration.findWebInfLibJars.
2017-09-19 12:29:24 -04:00
Greg Wilkins
219b61f5b4
Issue #1797
...
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
2017-09-19 13:40:59 +10:00
Jan Bartel
65d77ff129
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-09-19 12:01:52 +10:00
Jesse Glick
ac61f0e968
Ensure that WebAppClassLoader.addJars considers classpath entries in a deterministic order.
...
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
2017-09-18 16:20:53 -04: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
Jan Bartel
16498333a4
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-09-13 15:36:25 +10:00
Jan Bartel
5aa92552bd
Issue #1809
2017-09-13 11:42:17 +10:00
Jan Bartel
ec9a881941
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-08-30 11:30:21 +10:00
Greg Wilkins
8e02bfef36
Issue #1499 ClasspathPattern module support
...
More efficient implementation that precomputes Path and modules
2017-08-26 09:50:19 +10:00
Greg Wilkins
1d1ba56c88
Issue #1499 ClasspathPattern module support
...
Added simple but inefficient implementation for jrt matching
2017-08-26 09:50:08 +10:00
Greg Wilkins
e462fb2648
Issue #1499 ClasspathPattern module support
...
More efficient implementation that precomputes Path and modules
2017-08-24 10:11:55 +10:00
Greg Wilkins
578afa0f5e
Issue #1499 ClasspathPattern module support
...
Added simple but inefficient implementation for jrt matching
2017-08-24 09:58:50 +10:00
Jan Bartel
b7abc465e4
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-08-17 13:18:46 +10:00
Simone Bordet
c53f4cdd63
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-16 12:54:03 +02:00
Simone Bordet
aea4b784b5
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-08-16 12:53:35 +02:00
Jan Bartel
9e46353988
Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-1640
2017-08-15 16:36:24 +10:00
Greg Wilkins
8e7cdd8371
Updated for servlet 4.0 schemas
2017-08-15 15:33:11 +10:00
Greg Wilkins
7af59b8cc2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-15 12:43:07 +10:00
Greg Wilkins
3689f94bd1
cleaned up webapp xsd imports
2017-08-15 12:42:32 +10:00
Jan Bartel
2acb97db2f
Issue #1640
...
Replay changes after change to jetty-9.4.x base branch.
2017-08-10 13:56:05 +10:00
Joakim Erdfelt
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -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
Greg Wilkins
76981a0a15
Fixed #1715 standardise XML properties and IDs
2017-08-08 09:16:08 -07:00
Greg Wilkins
f297096716
Fix #1653
2017-08-08 09:14:09 -07:00
olivier lamy
8095da3848
try to fix web fragment for directory classes #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:52 -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
Greg Wilkins
2443ca34f3
Issue #1676 remove deprecated methods from WebAppContext
2017-07-19 11:49:27 +02:00
Joakim Erdfelt
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
Joakim Erdfelt
2e8f9fc748
Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
...
This reverts commit 38c112764d
.
2017-07-12 11:28:32 -07:00
Joakim Erdfelt
5b6b80ef81
Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11
2017-07-12 11:18:20 -07:00
Joakim Erdfelt
7129fa7b9b
Merge pull request #1644 from olamy/feature/maven_plugin_its
...
add maven plugin its tests
2017-07-10 16:37:09 -07:00
Joakim Erdfelt
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -07:00
Greg Wilkins
7e46285149
Fix #1653
2017-06-29 08:12:11 +02:00
Joakim Erdfelt
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
olivier lamy
52fa23b968
try to fix web fragment for directory classes #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 20:35:59 +10: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
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
Christoph Dreis
e9f398cf41
Deprecate ConcurrentHashSet ( #1570 )
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
Simone Bordet
311b9fbab0
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-17 13:16:45 +02:00
Jan Bartel
4eca47cdf4
Issue #1558
2017-05-17 11:21:18 +02:00
Joakim Erdfelt
1819fed959
Fixing javadoc errors
2017-05-15 08:58:12 -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
Greg Wilkins
0326af2ce9
renamed for clarity
2017-05-09 09:19:54 +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
Jan Bartel
84bc74754d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-01 17:53:38 +02:00
Jan Bartel
5f65f2916f
Issue #1390
...
Remove this.web_url.path
2017-05-01 17:37:05 +02:00
Greg Wilkins
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
Greg Wilkins
9e65d1ebcb
Issue #1505
...
* minor cleanups of ClasspathPattern
* defined jetty.home.uri and jetty.base.uri in start.jar and webapp configuration properties
* minor cleanup of start.jar property handling (more needed)
* updated location classpathpatterns in modules
2017-04-26 14:54:37 +02:00
Greg Wilkins
a3ace98a8d
Issue #1448
...
Optimized excluded by name handling
2017-04-26 13:50:58 +02:00
Joakim Erdfelt
6ca9bacee6
Issue #1448 - Eliminating Resource creation from TypeUtil.getLoadedFrom()
...
+ Replaced with URI TypeUtil.getLocationOfClass(Class clazz)
+ and File TypeUtil.getLocationOfClassAsFile(Class clazz)
+ This is done to eliminate extraneous "new URL" and "URI.toURL" calls
that can trigger URL Stream Handler creation and initialization
which is the cause of the StackOverflowError
2017-04-26 13:43:35 +02:00
Simone Bordet
99e5b118bd
Fixes to make code compatible with JDK 9.
2017-04-24 11:04:05 +02:00
Simone Bordet
20ac0dbb76
Code cleanup.
2017-04-24 11:04:05 +02:00
Joakim Erdfelt
2f870b0923
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2017-04-20 06:13:47 -07:00
Greg Wilkins
6bb8f793a3
Fixed #1487 #1486
2017-04-20 14:32:54 +10:00