Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,988 Commits 55 Branches 466 Tags
Commit Graph

625 Commits

Author SHA1 Message Date
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
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
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
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
Jan Bartel
af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Jan Bartel
3d553e79a9 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
 2013-05-29 11:05:09 +10:00
Jan Bartel
54b62eafcb Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-29 10:54:53 +10:00
Jan Bartel
9f2a641dc0 409133 Empty <welcome-file> causes StackOverflowError 2013-05-29 10:21:53 +10:00
Greg Wilkins
15e0d50b79 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-05-23 09:50:27 +10:00
Jesse McConnell
725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell
a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell
74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell
742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00