Commit Graph

159 Commits

Author SHA1 Message Date
Greg Wilkins 7fd04a186f cleanup after merge 2013-01-25 11:47:47 +11:00
Jan Bartel f6e5e547f0 396475 Remove unneeded websocket-server dependency from test-jetty-webapp 2012-12-13 19:58:50 +11:00
Jan Bartel c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
2012-11-30 15:45:36 +11:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Thomas Becker 3ea03e7094 394860: fix test-jetty-webapp to work with mvn jetty:run again 2012-11-22 10:22:19 +01:00
Greg Wilkins 2ad9dd5b95 jetty-9 corrected groupId after move 2012-11-20 09:53:56 +11:00
Jesse McConnell a0c1d85094 Revert "jetty-9 cleaned up serverClasses to minimum"
This reverts commit 67b5caadbb.
2012-11-19 10:33:54 -06:00
Greg Wilkins 67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Greg Wilkins f21b74dcb1 jetty-9 relocated test webapp 2012-11-19 15:57:38 +11:00