434 Commits

Author SHA1 Message Date
Joakim Erdfelt
4f48bc7e7b 399343 - OnWebSocketConnect should use api.Session parameter instead.
+ Changed method signature for WebSocketListener and the various
  @OnWebSocket* annotations
2013-01-29 13:22:38 -07:00
Jesse McConnell
e26c60e073 Merge jetty-8 to master 2013-01-29 14:06:47 -06:00
Greg Wilkins
7fd04a186f cleanup after merge 2013-01-25 11:47:47 +11:00
Greg Wilkins
dc4e525622 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-21 17:04:22 +11:00
Jesse McConnell
e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Greg Wilkins
27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins
3efcc2af41 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
Jesse McConnell
82d6388a59 Address javadoc linkages in test webapp and root context 2012-12-26 15:05:17 -03:00
Greg Wilkins
31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Jan Bartel
346918577f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
Joakim Erdfelt
e308f843db Replacing FrameBytes tree with WriteBytesProvider class 2012-12-14 16:12:48 -07:00
Jan Bartel
f6e5e547f0 396475 Remove unneeded websocket-server dependency from test-jetty-webapp 2012-12-13 19:58:50 +11:00
Greg Wilkins
6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +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
4d823c28bf jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref 2012-11-29 17:41:54 +11:00
Greg Wilkins
21f717078c jetty-9 handle null push strategy 2012-11-29 17:03:40 +11:00
Greg Wilkins
9931ddec94 jetty-9 fixed test webapp TestServer and improved error message 2012-11-29 17:03:40 +11:00
Greg Wilkins
5ee2ea85bb fixed path for new layout 2012-11-29 15:55:33 +11:00
Thomas Becker
0fd789216d test-jetty-weappap - Remove wiki link and replace with documentation 2012-11-27 14:26:36 +01:00
Greg Wilkins
9a4e5f3301 jetty-9 Added proxy test webapp. Refined no servlet context handling 2012-11-26 16:57:37 +11:00
Greg Wilkins
f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Jan Bartel
3393108950 Fix link to jetty @ eclipse for test webapp 2012-11-23 10:52:49 +11:00
Jan Bartel
332017d84d Fix link to jetty @ eclipse 2012-11-23 10:48:28 +11:00
Jan Bartel
fc2682ab02 394870 Make enablement of remote access to test webapp configurable in override-web.xml 2012-11-23 10:35:10 +11:00
Jan Bartel
5f69945b33 Update remote.html text for jetty-9 2012-11-22 21:52:56 +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
99fbca11f2 jetty-9 turn on client OPTION for test-webapp 2012-11-20 10:04:57 +11: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 67b5caadbb59851fe2d5292bf5a38b846de9b29c.
2012-11-19 10:33:54 -06:00
Jesse McConnell
ebd807b904 Revert "jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini"
This reverts commit 4bd36e3d38acbaab4db6202da27e00aad36b98ad.
2012-11-19 10:33:45 -06:00
Greg Wilkins
4bd36e3d38 jetty-9 moved the jetty demos to webapps-demos controlled by start.d/demos.ini 2012-11-19 18:35:32 +11:00
Greg Wilkins
67b5caadbb jetty-9 cleaned up serverClasses to minimum 2012-11-19 17:42:52 +11:00
Greg Wilkins
82117bc833 jetty-9 fixed hostHeader handling in ProxyServlet and re-enabled in test webapp 2012-11-19 16:22:27 +11:00
Greg Wilkins
f21b74dcb1 jetty-9 relocated test webapp 2012-11-19 15:57:38 +11:00