Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,875 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

1192 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 9e15e01f36 Allowing URLStreamHandler test to exist in codebase, but not run in CI 2017-04-19 18:01:12 -07: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 70160c5b3f Issue #1467 2017-04-13 16:49:55 +10:00
Greg Wilkins c4f2be4cfa Issue #1454 convenience methods 2017-04-11 10:09:33 +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
Simone Bordet 7f94aacdcd Merged branch 'jetty-9.4.x' into 'master'. 2017-04-06 10:54:18 +02:00
Joakim Erdfelt 59bd12edcf Disabling test that modifies java.net.URL class 2017-04-05 10:48:18 -07:00
Joakim Erdfelt 71892ffa3a Test fix 2017-04-05 09:08:02 -07:00
Joakim Erdfelt 3aeb8dbd78 Merge remote-tracking branch 'origin/jetty-9.4.x' 
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
 2017-04-05 06:47:25 -07:00
Joakim Erdfelt 9cdf8b0468 Issue #1449 - Removing unused / broken __jvmLib reference 2017-04-04 09:18:37 -07:00
Joakim Erdfelt f53776628f Issue #1448 - Reduce unncessary URL creation 2017-04-04 09:08:44 -07:00
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11: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 998788d9fa Issue #1384 Revert change as module modifies the classpath 2017-03-16 10:45:32 +11:00
Joakim Erdfelt 92afe54c1d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-10 13:22:32 -07:00
Joakim Erdfelt e25007cb79 Issue #1390 - Addressing new File(URL) use in Windows 
+ Fixing HashLoginService to track its Config via File reference only
  (dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
 2017-03-10 12:47:06 -07:00
Greg Wilkins c366934d30 Issue #1384 Expose StatisticsServlet 2017-03-09 16:03:43 +11:00
Greg Wilkins 7ef9d7c18d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-08 10:05:26 +11:00
Greg Wilkins 43d0488269 Issue #1384 Expose StatisticsServlet 2017-03-08 10:04:48 +11:00
Greg Wilkins 05f05520eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-07 07:55:36 +11:00
Greg Wilkins 1361b31beb Issue #1353. fixed growable Trie 2017-02-25 11:15:10 +09: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
Joakim Erdfelt 3c29947a0d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-15 11:54:57 -07:00
Joakim Erdfelt 0cd8d21bfd Issue #1331 - replacing with ${jetty.base.uri} form 2017-02-15 11:34:47 -07:00
Jesse McConnell 4543c73052 Merge branch 'jetty-9.4.x' 2017-01-28 16:24:15 -06:00
James Earl Douglas 590838f644
Replace contraction with possesive 2017-01-26 19:26:50 -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
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 19333b8b3b Merge branch 'jetty-9.4.x' into release-9.4.0 2016-12-08 08:50:15 -06:00
Jan Bartel 8ea15f4214 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-12-08 20:17:20 +11:00
Simone Bordet 44c84ffb09 Fixes #1151 - NPE in ClasspathPattern.match(). 2016-12-07 22:28:01 +01: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 bc96a8e0e6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-11-30 15:56:04 +11:00
Jan Bartel f64cdd46b8 Issue #1138 2016-11-30 15:55:40 +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
Jan Bartel 34f0015aa9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-21 16:37:13 +11:00
Jan Bartel 638045764e Issue #1018 2016-10-21 16:32:45 +11:00
Simone Bordet 39f47244fa Merged branch 'jetty-9.4.x' into 'master'. 2016-10-17 15:36:32 +02:00
Greg Wilkins 02309d3510 Issue #984 Improve module listing 
Updated CSV operator
 2016-10-17 11:39:10 +11: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
Greg Wilkins f55cac9e9d fixed javadoc 2016-10-11 18:35:26 +11:00
Jan Bartel 6489d7fd23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-11 18:00:12 +11:00
Greg Wilkins d8b1c88abc Issue #984 Improve module listing 
Reworked logging modules
added support for ,= and += properties
 2016-10-07 12:48:47 +11:00