Commit Graph

2621 Commits

Author SHA1 Message Date
Jesse McConnell 675464e82d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-08 12:46:56 -05:00
Jesse McConnell f3d0557828 Merge branch 'release' 2011-09-08 12:46:41 -05:00
Jesse McConnell 0046c5a9c2 set for next release 2011-09-08 12:45:59 -05:00
Joakim Erdfelt 03c0192cdb Making image files from src/main/javadoc actually show up in javadoc:aggregate and -javadoc.jar files 2011-09-08 10:29:27 -07:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4a575d4958 Merge branch 'master' into release 2011-09-08 11:36:48 -05:00
Greg Wilkins e914e0f97f improved websocket handling of error cases for autobahn test suite 2011-09-09 01:52:27 +10:00
Greg Wilkins a75b9bfb0c 357058 Acceptor thread blocking 2011-09-09 01:36:24 +10:00
Greg Wilkins 224962908d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-08 11:36:00 +10:00
Greg Wilkins b8556bec76 fixes from running autobahn test suite 2011-09-08 11:35:39 +10:00
hmalphettes 8d51bc05ac update the example osgi servlet bridge webapp 2011-09-07 17:08:24 -07:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 66af591b8c Updating VERSION.txt top section 2011-09-07 17:52:40 -05:00
Jesse McConnell 39838ed3a5 Merge branch 'master' into release 2011-09-07 17:51:39 -05:00
Jesse McConnell 336e3b383b reset for release 2011-09-07 17:49:08 -05:00
Jesse McConnell cbde93f1c9 add jetty websocket as a dependency that is no longer provided 2011-09-07 13:41:08 -05:00
Jesse McConnell eca0e31282 Add missing websocket test dependency to monitor 2011-09-07 11:50:55 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell caf6e0f1e4 Merge branch 'release' 2011-09-07 10:46:29 -05:00
Jesse McConnell 7f5cafc717 Updating VERSION.txt top section 2011-09-07 10:46:08 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Jesse McConnell 4169d610b0 Updating VERSION.txt top section 2011-09-07 09:44:20 -05:00
Jesse McConnell cee44dcfbf Merge branch 'master' into release 2011-09-07 09:43:21 -05:00
Greg Wilkins 04385c5c3b Fixed missing 7.4.5 2011-09-07 19:56:59 +10:00
Greg Wilkins 65a1e84886 misc findbugs cleanups 2011-09-07 15:57:18 +10:00
Greg Wilkins cf45e7b647 356823 correctly decode close codes. Send not utf-8 close code. 2011-09-07 11:37:46 +10:00
Greg Wilkins ba5af45d17 350634 Added Resource.newResource(File) 2011-09-06 14:29:33 +10:00
Greg Wilkins 8e67fd926b 356428 removed timed waits from test 2011-09-06 13:40:40 +10:00
Greg Wilkins 53327b469d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-06 11:33:35 +10:00
Greg Wilkins 1d6079e78f findbugs inspired code cleanups 2011-09-06 11:22:37 +10:00
Jan Bartel a96052def2 356751 Add null protection to ServletContextHandler.doStop 2011-09-06 09:25:55 +10:00
Jan Bartel 44204a2e5b 356726 Instead of the sessionDestroyed called sessionCreated after invalidate session 2011-09-06 09:15:26 +10:00
Simone Bordet b1f95541de Fixes #356749 (WebSocket message length is computed wrongly when greater than 0xFFFF), and a bunch of other silly mistakes. 2011-09-06 00:18:02 +02:00
Simone Bordet 93547f2d38 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-05 13:49:03 +02:00
Simone Bordet 5297d98350 Fixes #356693 (Too much of the websocket implementation is exposed to the webapp).
WebSocketServlet must be loaded from the webapp classloader, even if the webapp is configured to have parent classloader priority.
2011-09-05 13:45:33 +02:00
Jan Bartel 9800e1e0fb 356190 fix monodb tests for changed test api 2011-09-05 20:09:43 +10:00
Simone Bordet 1f380606d1 Fixes #356695 (websocket packages should be provided), along with commit a8ce6e8878. 2011-09-05 11:29:43 +02:00
Simone Bordet a8ce6e8878 Fixed pom.xml by declaring dependencies in the right way.
Dependency on jetty-server must be kept with scope provided (the classes that depend on jetty-server can only be run on Jetty).
2011-09-05 11:18:47 +02:00
Jan Bartel 9ed8a75b9b Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-05 13:49:00 +10:00
Jan Bartel e8f37070a6 356190 - Problem selecting expired sessions java.sql.SQLException: Database 'sessions' not found 2011-09-05 13:48:33 +10:00
Greg Wilkins 898dcc8b2a 356693 reduce visibility to webapp of websocket implementations 2011-09-05 11:24:37 +10:00
Greg Wilkins 68fe9c4b82 stop test hanging forever so we can work out what is going wrong with intermittant failure 2011-09-05 11:22:24 +10:00
Greg Wilkins 8a40a0d9fb 356695 jetty server jars are provided for websockets 2011-09-05 11:21:26 +10:00
Jesse McConnell 837c4ce1cf Merge branch 'release' 2011-09-01 11:54:50 -05:00
Jesse McConnell bfcd3f6308 Updating VERSION.txt top section 2011-09-01 11:54:29 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00