Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,255 Commits 68 Branches 465 Tags 360 MiB
Commit Graph

270 Commits

Author SHA1 Message Date
Jan Bartel 7bc6ec6b32 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-25 16:37:48 +11:00
Jan Bartel 843f7e8ee4 Issue #1797 2017-10-25 16:36:10 +11:00
Jan Bartel 264aa61a2b Issue #1892 2017-10-19 09:19:06 +11:00
Jan Bartel d5769c21a9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 17:16:19 +11:00
Jan Bartel da813488fb Issue #1213 
Ensure use asm5 for osgi tests
 2017-10-18 17:07:00 +11:00
Jan Bartel 7517e7fdd9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 12:44:52 +11:00
Jan Bartel 84ffdf1447 Issue #1213 
Update annotation parser for asm 6 support.
 2017-10-18 12:42:10 +11:00
Greg Wilkins fa1f103da7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 12:26:07 +11:00
Greg Wilkins aa212df4b1 Use java platform not version 2017-10-18 12:24:53 +11:00
Greg Wilkins c12ba01014 Issue #1797 use platform for MR jars 2017-10-18 12:24:26 +11:00
Greg Wilkins 44a1f1e1a6 Issue #1797 use platform for MR jars 2017-10-18 12:19:33 +11:00
Greg Wilkins dd0eaa0f1f Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:14:18 +11:00
Greg Wilkins 22f95ad847 Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:01:21 +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 e00182323b Issue #1692 2017-10-17 14:43:41 +11:00
Joakim Erdfelt 1295dc372d Issue #1797 - Safety checks for Java 9 and Multi-Release JARs during bytecode scanning 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2017-10-17 14:43:14 +11:00
Greg Wilkins 0f8bf0a64f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-17 14:08:36 +11:00
Jan Bartel 7b93c3c1e7 Issue #1863 2017-10-03 10:16:09 +11:00
Greg Wilkins 50f861e8f2 Issue #1797 MR jar support in java8 code 2017-09-20 13:47:37 +10: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
Simone Bordet 93d0d324ab Formatting cleanup and fixed javadocs. 2017-09-14 11:56:45 +02:00
Jan Bartel 7ad415b9b8 Issue #1819 2017-09-14 16:07:00 +10:00
Jan Bartel 5aa92552bd Issue #1809 2017-09-13 11:42:17 +10:00
Joakim Erdfelt 929e800111 Issue #1797 - Safety checks for Java 9 and Multi-Release JARs during bytecode scanning 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2017-09-07 09:34:09 -07:00
Jan Bartel e81e17d348 Issue #1692 2017-08-08 09:15:27 -07:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570) 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2017-05-30 21:46:11 +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
Jan Bartel 2ba44ac058 Issue #1466 2017-04-14 14:07:36 +10:00
Jan Bartel 70160c5b3f Issue #1467 2017-04-13 16:49:55 +10:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates 
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
 2017-02-02 15:51:38 -07: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 640801987c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-30 09:37:21 +11:00
dreis2211 9b0f6b1fd5 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
(cherry picked from commit 16334c1893)
 2016-11-30 09:36:30 +11:00
Jan Bartel d2a98206df Issue #1018 
Remove deprecated Util class
 2016-10-21 16:38:47 +11: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
Greg Wilkins 9148678dad fixed annotation javadoc 2016-10-06 11:46:40 +11:00
Greg Wilkins baef7f09d4 removed debug 2016-10-06 10:50:19 +11:00
Greg Wilkins afb750515e Issue #963 Location based classpath pattern (#978) 
Issue #963 location based white/black classpath lists
- removed outdated annotations/ClassNameResolver
- implemented loadedFrom in TypeUtil
- created a growable Trie
- reimplemented classpathpattern
- simplified OSGi classloading
 2016-10-06 10:47:09 +11:00
Jan Bartel e5e3e3300e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 08:17:06 +10:00
Jan Bartel c033a3734b Issue #783 
Add loggable exception; remove unused code
 2016-08-11 08:15:45 +10:00
Jan Bartel 5b5c8c3791 Issue #282 2016-07-08 13:23:00 +10:00
Jan Bartel 15b5920349 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 15:13:27 +10:00
Jan Bartel 7afc36064b Issue #678 2016-07-07 15:12:32 +10:00
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
Jesse McConnell 39ef0ec7d6 fix bad test target dir usage 2016-06-07 11:55:48 -05:00
Greg Wilkins 6163ee7293 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-14 16:32:51 +10:00
Greg Wilkins e1b0967e59 removed needless warning 2016-04-14 16:32:26 +10: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 3527c6a71b StringUtil.csvSplit(String) 
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2015-12-08 14:54:33 -07:00
Simone Bordet 9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Simone Bordet 9c673e542d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 13:02:20 +01:00
Jan Bartel 66e596511d 483620 Servlet annotation mapping to "/" should override webdefault.xml mapping 2015-12-04 15:58:07 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Jan Bartel e1bade217f 479839 Regression when starting application with excessive scan times 2015-10-16 15:43:48 +11:00
Jan Bartel 27a41a4f77 479839 Regression when starting application with excessive scan times 2015-10-16 15:16:43 +11:00
Joakim Erdfelt f4133dfd35 javadoc fix 2015-10-01 15:56:26 -07:00
Jan Bartel 697b0cccf2 477895 Prevent leak of handles to deleted files after redeploy 2015-09-30 13:39:31 +10:00
Jan Bartel 4743c19a8c 474961 Close input stream for classes in AnnotationParser after scanning 2015-08-19 11:12:40 +10:00
Jan Bartel 3de7fc77c7 474558 Debug log ServletContainerInitializer @HandlesTypes contents 2015-08-19 10:25:36 +10:00
Greg Wilkins 3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -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
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt 77c02af49f Fixing javadoc visibility 2015-04-23 17:07:28 -07:00
Joakim Erdfelt cffeea3ed6 464727 - Update Javadoc for Java 8 DocLint 
+ Fixing javadoc in jetty-annotations
 2015-04-22 12:05:53 -07:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Joakim Erdfelt e92bcccc84 Using new Decorator 2015-03-12 10:09:53 -07:00
Joakim Erdfelt aea4713d27 Minor test class cleanup while testing some annotation scanning behavior reported 2015-01-16 15:18:01 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Jan Bartel 381227cd9d 456486 Jar containing ServiceContainerInitializer impl not found in TCCL in osgi 2015-01-01 17:25:10 +01:00
Jan Bartel 1ab6d7398c 447979 Refactor to make MetaData responsible for progressively ordering web-inf jars 2014-10-24 12:48:15 +11:00
Jan Bartel 21d590a74a 442759 Allow specific ServletContainerInitializers to be excluded 2014-08-28 16:52:26 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet 745f757552 Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-07-15 18:49:14 +02:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Jan Bartel d2b08da8a4 Refactoring for ease of customization. 2014-05-27 19:22:28 +02:00
Jan Bartel 609945fe7c 433656 Change to Opcode.ASM5 breaks jetty-osgi 2014-04-28 15:36:36 +02:00
Jan Bartel b4542a031b 433512 Jetty throws RuntimeException when webapp compiled with jdk8 -parameters 2014-04-25 16:36:01 +02:00
Greg Wilkins b3be247423 merged quickstart changes 2014-03-14 13:07:00 +11:00
Jan Bartel b6f36dadb2 Add appropriate headers to allow ServiceLoader mechanism to work with OSGi. 2014-03-10 13:42:05 +11:00
Greg Wilkins 18e19260ff Apply changes resulting from the quickstart project 2014-02-13 12:31:14 +11:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Jan Bartel aca8e4d44c 424380 Augment class / Jar scanning timing log events 2013-12-20 11:00:46 +11:00
Jan Bartel 2d3d912173 423361 Ensure ServletContainerInitializers called before injecting Listeners 2013-12-13 15:03:46 +11:00
Jan Bartel dfe5889bc4 423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation) 2013-12-12 14:44:38 +11:00
Jan Bartel 8b544e4327 423556 HttpSessionIdListener should be resource injectable 2013-12-09 17:05:52 +11:00
Jan Bartel 5f204b8812 423395 Ensure @WebListeners are injected 2013-12-06 15:46:51 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Jan Bartel fc6493b5b1 Remove accidental checkin of println 2013-10-28 13:09:26 +11:00
Jan Bartel c5fe3bcfd3 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
 2013-10-21 17:27:45 +11:00