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

161 Commits

Author SHA1 Message Date
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
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
Jan Bartel
3f852cf3db 416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations by jetty-maven-plugin 2013-10-21 16:44:33 +11:00
Jan Bartel
278dab08b8 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
 2013-10-14 17:03:02 +11:00
Jan Bartel
9a330dad1b 418767 run-forked goal ingores test scope dependencies with useTestScope=true 2013-10-14 16:51:59 +11:00
Jan Bartel
d505350a9f 418596 Faults in JARs during class scanning should report the jar that caused the problem 2013-10-04 11:02:06 +10:00
Jesse McConnell
856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05: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
5f02620603 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
 2013-09-30 13:20:13 +10:00
Jan Bartel
cb554948a2 417574 Setting options with _JAVA_OPTIONS breaks run-forked with <waitForChild>true</waitForChild> 2013-09-30 12:23:14 +10:00
Joakim Erdfelt
1fcede8b8b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
 2013-09-26 06:07:06 -07:00
Joakim Erdfelt
ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Joakim Erdfelt
a20b39e9ab Fixing build error 2013-09-23 14:11:04 -07:00
Jesse McConnell
0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05: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
Simone Bordet
a23e899aff Enabled JSR WebSocket out of the box. 2013-09-13 11:20:17 +02:00
Simone Bordet
c86ecc50fa Fixed logger name and reduced logging level. 2013-09-13 11:20:17 +02: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
Jesse McConnell
ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Jan Bartel
a64319b9b1 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-22 20:11:08 +10:00
Jan Bartel
1ad9d6cff6 411934 War overlay configuration assumes src/main/webapp exists 2013-08-22 20:03:46 +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
Jan Bartel
7dea4f85f9 414085 - Add jetty-continuations to plugin dependencies 2013-08-01 09:59:19 +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
Greg Wilkins
a65ca7b5cd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-11 14:45:16 +10:00
Jesse McConnell
ae3286f9fc [Bug 412713] add dumpOnStart configuration to jetty-maven-plugin 2013-07-10 15:54:48 -05:00
Jan Bartel
fde47b1083 412637 ShutdownMonitorThread already started 2013-07-10 17:21:43 +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
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
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
Jan Bartel
d581dac287 409684 Ids and properties not set for execution of jetty xml config files with mvn plugin 2013-06-03 12:34:37 +10:00