486 Commits

Author SHA1 Message Date
Jan Bartel
0400289826 417561 Refactor annotation related code - make annotation phase able to be multithreaded 2013-09-30 13:27:05 +10:00
Jan Bartel
d4c035a06f 417561 Refactor annotation related code to remove some deadwood 2013-09-19 15:43:38 +10:00
Jan Bartel
f44787075a 417382 - Upgrade to asm 4.1 and refactor annotation parsing 2013-09-17 13:12:54 +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
Jan Bartel
a98bbc31e0 Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build. 2013-09-02 17:14:17 +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
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
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
Jesse McConnell
8927c18840 reset versions for release 2013-06-21 15:28:26 -05: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
Jan Bartel
4f6732a7e9 Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization. 2013-06-21 18:41:35 +10: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
Jesse McConnell
eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Jan Bartel
c5bdc019a2 409801 Jetty should allow webdefault to be specified using a relative location when running in OSGi 2013-06-11 18:39:15 +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
Greg Wilkins
76457d4807 409441 jetty.xml threadpool arg injection
Do not use arg injection for ThreadPool
2013-05-30 11:59:36 +10:00
Greg Wilkins
942f8a5c40 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-28 22:51:31 +10:00
Jan Bartel
5df7ab401d Fix errors from small osgi refactor; comment out some test code 2013-05-28 15:10:12 +10:00
Jan Bartel
82b0ae2c63 Ensure jetty.home set as Server attribute on defaultJettyServer instance 2013-05-28 14:58:21 +10:00
Jan Bartel
7e797d8eed 408910 META-INF/jetty-webapp-context.xml file should be able to refer to bundle-relative locations 2013-05-28 13:10:49 +10:00
Jan Bartel
20aeae5914 409228 Set jetty.home property so config files work even if deployed inside a bundle 2013-05-28 11:35:09 +10:00
Jan Bartel
5c97019be1 408923 Need to be able to configure the ThreadPool for the default jetty server in osgi 2013-05-24 16:26:13 +10:00
Jesse McConnell
3d600ed95e [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e [maven-release-plugin] prepare release jetty-9.0.3.v20130506 2013-05-06 18:12:55 -05:00
Jan Bartel
e7ecfd2b2b Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Jan Bartel
140419c097 406618 Jetty startup in OSGi Equinox fails when using option jetty.home.bundle=org.eclipse.jetty.osgi.boot 2013-04-29 15:48:46 +10:00
Greg Wilkins
a7073d05a6 updated version to 9.1.0-SNAPSHOT 2013-04-19 13:59:18 +10:00
Jesse McConnell
7baaa14ba1 [maven-release-plugin] prepare for next development iteration 2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25 [maven-release-plugin] prepare release jetty-9.0.2.v20140417 2013-04-17 11:46:31 -05:00
Jesse McConnell
0b20467c6f [maven-release-plugin] prepare for next development iteration 2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711 [maven-release-plugin] prepare release jetty-9.0.2.v20140415 2013-04-15 11:40:37 -05:00
Jan Bartel
8a0ba267c1 Rename some jetty-osgi classes, add comments, organize imports. 2013-04-11 15:14:08 +10:00
Jan Bartel
6783975707 Prune unused code; add more comments; rename classes. 2013-04-11 15:14:08 +10:00
Jan Bartel
76df005c64 405119 Tidy up comments and code formatting for osgi 2013-04-11 10:23:20 +10:00
Greg Wilkins
b8dd8bde14 [maven-release-plugin] prepare for next development iteration 2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b [maven-release-plugin] prepare release jetty-9.0.1.v20130408 2013-04-08 12:30:59 +10:00
Jan Bartel
4951b1ccc4 404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath 2013-03-28 19:33:52 +11:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00