Commit Graph

834 Commits

Author SHA1 Message Date
Joakim Erdfelt 707b2f5ab8 Adding Decorator to serverClasses by default, for CDI use when not using cdi.mod 2014-10-10 08:24:23 -07:00
Greg Wilkins 758ce66c8d Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-websocket/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt d42d8f10c2 Expose Decorator in default serverClasses list 2014-09-26 10:42:21 -07:00
Jan Bartel 851e154be3 444896 Overriding of web-default servlet mapping in web.xml not working with quickstart 2014-09-24 16:03:08 +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 5b97d652e1 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
Jan Bartel 2adb029764 443172 web-fragment.xml wrongly parsed for applications running in serlvet 2.4 mode 2014-09-04 12:10:55 +10:00
Jan Bartel a1587d807e 443262 Distinguish situation where jetty looks for tlds in META-INF but finds none vs does not look 2014-09-04 10:22:40 +10: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 ae8e7f0067 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-20 12:02:09 +10:00
Greg Wilkins 0331992d86 347110 renamed class transformer methods 2014-08-20 10:10:33 +10:00
Greg Wilkins 6b2b6c330d 347110 renamed class transformer methods 2014-08-20 09:43:55 +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
Greg Wilkins 22e57ef7b7 refactored Request to use new HttpURI 2014-07-25 15:03:51 +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
Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins 853e020210 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-16 15:31:48 +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
Greg Wilkins 5e281dd449 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Greg Wilkins 706fe1eba3 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-03 16:01:37 +10:00
Jan Bartel 839485797b 437419 Allow scanning of META-INF for resources,fragments,tlds for unpacked jars 2014-07-01 10:40:58 +10:00
Simone Bordet 334db9fe72 Updated version to 9.3.0-SNAPSHOT. 2014-06-16 21:33:03 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Jesse McConnell 10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Greg Wilkins 8f4aeeeb8d updated version to 10.0.0-SNAPSHOT 2014-06-04 15:08:54 +02:00
Greg Wilkins ca6e9befb4 347110 Supprt ClassFileTransormers in WebAppClassLoader 2014-05-27 23:23:06 +02:00
Jan Bartel d2b08da8a4 Refactoring for ease of customization. 2014-05-27 19:22:28 +02:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Jan Bartel 1386f20cf5 435217 Remove deprecated TagLibConfiguration 2014-05-19 18:20:52 +02:00
Jan Bartel f8c1f70b75 433708 Improve WebAppClassLoader.addClassPath() IllegalStateException message 2014-05-06 10:00:40 +02:00
Jan Bartel e2ed934978 433365 No such servlet: __org.eclipse.jetty.servlet.JspPropertyGroupServlet__ 2014-04-24 11:47:04 +02:00
Jan Bartel 8593ce5820 432473 web.xml declaration order of filters not preserved on calls to init() 2014-04-10 09:34:39 +10:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Jan Bartel d0b70ee259 414885 Don't expose JDT classes by default 2014-03-24 14:13:28 +11:00
Jan Bartel d1c69900ca 427185 Add org.objectweb.asm. as serverClass 2014-03-19 13:20:31 +11:00
Greg Wilkins 119718d86f added jetty-quickstart module 2014-03-19 09:56:19 +11:00
Greg Wilkins b3be247423 merged quickstart changes 2014-03-14 13:07:00 +11:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell 1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Greg Wilkins 18e19260ff Apply changes resulting from the quickstart project 2014-02-13 12:31:14 +11:00
Jesse McConnell eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell 8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Jan Bartel 51aedd2393 426358 NPE generating temp dir name if no resourceBase or war 2014-02-06 12:06:47 +11:00
Jesse McConnell b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Greg Wilkins 1731e0c69a 423392 - GzipFilter without wrapping or blocking
ensure that servlets are enabled for demo
2013-12-13 12:19:38 +11:00
Jan Bartel 4d2c6ca21a 423060 Allow ${jetty.base}/work 2013-12-12 18:06:43 +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
Greg Wilkins 8243bd60b7 423392 - GzipFilter without wrapping or blocking
Handle the case where a gzip flush requires multiple iterations to go from finish() to finished()
Better handling of exceptional cases
2013-12-09 18:20:04 +11:00
Jan Bartel d067dc6010 423373 Correct namespace use for JEE7 Schemas 2013-12-06 11:58:03 +11:00
Joakim Erdfelt fb0b67621b 423373 - Correct namespace use for JEE Schemas
+ Updating webdefault.xml for new namespace in JEE7
2013-12-05 13:36:38 -07:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Joakim Erdfelt 3aca7f864e Added security dependency on webapp.mod 2013-11-15 12:18:29 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Jesse McConnell 63f20d4518 [maven-release-plugin] prepare for next development iteration 2013-11-07 10:42:54 -06:00
Jesse McConnell dc2fd1b9ce [maven-release-plugin] prepare release jetty-9.1.0.RC2 2013-11-07 10:42:41 -06:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Jan Bartel 9d756dc018 294531 Unpacking webapp twice to the same directory name causes problems with updated jars in WEB-INF/lib 2013-10-28 15:25:21 +11:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Jan Bartel 6ef9108cf6 415118 WebAppClassLoader.getResource(name) should strip .class from name 2013-10-24 15:08:04 +11:00
Joakim Erdfelt 90b7a3fc23 Use servlet context temp directory from ${jetty.base}/work, not ${jetty.home}/work 2013-10-07 12:02:05 -07:00
Jan Bartel 0400289826 417561 Refactor annotation related code - make annotation phase able to be multithreaded 2013-09-30 13:27:05 +10:00
Greg Wilkins 7dec90fafb some demo cleanups 2013-09-27 17:47:31 +10:00
Jan Bartel d4c035a06f 417561 Refactor annotation related code to remove some deadwood 2013-09-19 15:43:38 +10:00
Jan Bartel c0f5c5a659 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
2013-09-10 10:18:12 +10:00
Jan Bartel f85acc7437 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2013-09-10 09:48:09 +10:00
Jan Bartel ab9ecd277d 416266 HttpServletResponse.encodeURL() encodes on first request when only SessionTrackingMode.COOKIE is used 2013-09-10 08:57:59 +10:00
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky 767faece5c [Bug 415999] Fix some of FindBugs warnings
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Thomas Becker e26ce1b303 /jetty-webapp/src/main/config/etc/webdefault.xml fix xml error 2013-09-06 16:34:02 +02:00
Greg Wilkins ef98f89e5c 416680 remove uncovered constraint warning 2013-09-06 16:56:15 +10:00
Jan Bartel 810fbdc439 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 18:31:53 +10:00
Jan Bartel b8a4bf37e6 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations 2013-09-05 18:24:12 +10:00
Jan Bartel 6fb95b8ad7 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-05 13:20:39 +10:00
Jan Bartel edaa23b21e 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 13:03:45 +10:00
Jan Bartel 2ab4757450 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-05 12:55:19 +10:00
Jan Bartel e764a0f2e7 416585 WebInfConfiguration examines webapp classloader first instead of its parent when looking for container jars 2013-09-05 12:47:39 +10:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Jesse McConnell 450cdb3ef4 add servlet/s mod 2013-08-22 12:21:52 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Jesse McConnell 307fdced91 Merge branch 'master' into jetty-9.1 2013-08-20 14:02:45 -05:00
Jesse McConnell fd5d789ff5 [Bug 411069] better set compiler defaults to 1.7, including webdefault.xml for jsp 2013-08-20 13:34:33 -05:00
Jan Bartel ccf59bf75d 412934 Ignore any re-definition of an init-param within a descriptor
Also tidy of code.
2013-08-20 09:45:02 +10:00
Jan Bartel 1691618024 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-08-16 11:06:42 +10:00
Jan Bartel 54a899d55f 415192 <jsp-file> maps to JspPropertyGroupServlet instead of JspServlet 2013-08-16 11:02:29 +10:00
Jan Bartel c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel 716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel 3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel 7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Joakim Erdfelt c14e0dc11e Fixing Javadoc in jetty-webapp 2013-08-14 12:46:25 -07:00
Joakim Erdfelt ffad720991 Fixing Javadoc errors that JDK 1.7 complains about 2013-08-14 11:50:07 -07:00
Jesse McConnell 4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell 160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Greg Wilkins e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Jan Bartel 47a8809ec7 413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener 2013-08-02 12:26:54 +10:00
Jesse McConnell 20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell 49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell 6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell 1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell 650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Simone Bordet 5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Jesse McConnell 49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell 9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell 3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell 39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell 99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jesse McConnell 767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jan Bartel ca37782229 412829 Allow any mappings from web-default.xml to be overridden by web.xml 2013-07-23 12:18:18 +10:00
Jan Bartel bd2add0ae9 Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. 2013-07-12 13:53:58 +10:00
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07:00
Jesse McConnell 57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Jan Bartel 59889bc149 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 13:17:14 +10:00
Jan Bartel 232eb4491a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Jan Bartel 64d979a780 409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts 2013-06-12 15:41:03 +10:00
Greg Wilkins d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
Greg Wilkins 7bb3a7be28 409556 Resource files not closed
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.

FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
Greg Wilkins b59949253d Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00