Commit Graph

8190 Commits

Author SHA1 Message Date
Joakim Erdfelt a00b3d1e68 Merge branch 'release-9.1' into jetty-9.1 2013-09-17 10:08:27 -07:00
Joakim Erdfelt c5775a6ccf Using correct version for master 2013-09-17 09:41:45 -07:00
Jesse McConnell 2d35fa9558 Merge branch 'release-8' into jetty-8 2013-09-17 11:39:30 -05:00
Thomas Becker 74a75e3d42 test chat fix 2013-09-17 14:39:00 +02:00
Thomas Becker 2e064351a1 test chat fix 2013-09-17 14:36:58 +02:00
Thomas Becker 9fb8fbec14 416940 avoid download of spring-beans.dtd 2013-09-17 12:41:05 +02:00
Thomas Becker 000793a7aa 416940 avoid download of spring-beans.dtd 2013-09-17 12:40:23 +02:00
Jan Bartel f44787075a 417382 - Upgrade to asm 4.1 and refactor annotation parsing 2013-09-17 13:12:54 +10:00
Jesse McConnell 2b4475b046 set for dev 2013-09-16 16:08:29 -05:00
Joakim Erdfelt 5c72f6975a [maven-release-plugin] prepare for next development iteration 2013-09-16 11:06:25 -07:00
Joakim Erdfelt 9d26e0b32a [maven-release-plugin] prepare release jetty-9.1.0.M0 2013-09-16 11:06:18 -07:00
Jesse McConnell 120d2d885b [maven-release-plugin] prepare for next development iteration 2013-09-16 12:42:17 -05:00
Jesse McConnell a6c4c30d2a [maven-release-plugin] prepare release jetty-8.1.13.v20130916 2013-09-16 12:42:06 -05:00
Joakim Erdfelt e53029ac8e [maven-release-plugin] rollback the release of jetty-9.1.0.M0 2013-09-16 10:41:04 -07:00
Joakim Erdfelt 07abfa0c5d [maven-release-plugin] prepare release jetty-9.1.0.M0 2013-09-16 10:25:54 -07:00
Jesse McConnell a816863c30 set for release 2013-09-16 12:15:36 -05:00
Jesse McConnell a5e1f0d8f7 Merge branch 'jetty-8' into release-8 2013-09-16 12:14:24 -05:00
Joakim Erdfelt 105d02b3fe Updating VERSION.txt top section 2013-09-16 10:01:06 -07:00
Joakim Erdfelt b353686608 Reverting back to SNAPSHOTS 2013-09-16 10:00:18 -07:00
Joakim Erdfelt 43029a1476 Reverting VERSION.txt 2013-09-16 09:58:35 -07:00
Joakim Erdfelt 9481cb5bba Merge branch 'jetty-9.1' into release-9.1 2013-09-16 09:49:51 -07:00
Thomas Becker 6594ee87fa 416674 run all jetty-ant tests on random ports 2013-09-16 18:07:12 +02:00
Thomas Becker 257e1a9f2e 416674 run all jetty-ant tests on random ports 2013-09-16 18:05:31 +02:00
Greg Wilkins 9677f6e863 [maven-release-plugin] prepare release jetty-9.1.0.M0 2013-09-17 01:03:16 +10:00
Greg Wilkins dd5277576a Updating VERSION.txt top section 2013-09-16 23:57:21 +10:00
Greg Wilkins bc69700a5a Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-16 23:42:09 +10:00
Greg Wilkins 5ba684f009 reset VERSION to snapshot 2013-09-16 23:41:51 +10:00
Greg Wilkins ea22c21281 Merge remote-tracking branch 'origin/jetty-8' 2013-09-16 23:35:27 +10:00
Greg Wilkins 4ae547b988 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-09-16 23:31:09 +10:00
Greg Wilkins 30bab30d9b Revert "Merge branch 'release-8' into jetty-8"
This reverts commit 463ef68dc3, reversing
changes made to de544ddfbf.
2013-09-16 23:28:59 +10:00
Greg Wilkins 2629f93397 Revert "Merge branch 'release-7' into jetty-7"
This reverts commit 624a0d7e45, reversing
changes made to 3eb84f99a4.

Conflicts:
	VERSION.txt
2013-09-16 23:23:59 +10:00
Greg Wilkins 0e2f3990b1 reset VERSION.txt 2013-09-16 20:12:50 +10:00
Greg Wilkins 05d039b426 413684 deprecated unsafe alias checkers
removed debugs
2013-09-16 19:30:59 +10:00
Greg Wilkins a731ec13c8 413684 deprecated unsafe alias checkers 2013-09-16 19:30:45 +10:00
Greg Wilkins 5a801d398d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-16 12:10:55 +10:00
Greg Wilkins 8449ccc873 415826 modules initialised with --add-to-start and --add-to-startd 2013-09-16 11:53:46 +10:00
Greg Wilkins 9fef8215ed 417225 added Container.addEventListener method 2013-09-16 10:48:51 +10:00
Greg Wilkins 9113767907 417260 Protected targets matched as true URI path segments 2013-09-16 10:07:59 +10:00
Thomas Becker 624a0d7e45 Merge branch 'release-7' into jetty-7 2013-09-13 18:06:06 +02:00
Thomas Becker 463ef68dc3 Merge branch 'release-8' into jetty-8 2013-09-13 18:05:14 +02: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 a2a475b4af minor text cleanups in demo webapps 2013-09-13 15:51:55 +10:00
Greg Wilkins bb8d8fb999 415826 modules initialised with --module-start-ini and --module-startd-ini 2013-09-13 14:12:09 +10:00
Greg Wilkins 822f5d2a0f 417108 - demo-base uses HTTPS 2013-09-13 13:02:27 +10:00
Jan Bartel e5da00aff7 417109 Demo / Jaas test fails to find etc/login.conf 2013-09-13 12:42:14 +10:00
Jan Bartel 4b274b7933 417111 Demo / login with admin/admin fails 2013-09-13 12:31:51 +10:00
Jan Bartel cdec1e9d85 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-13 12:15:03 +10:00
Jan Bartel 0b80b9ba36 417110 Demo / html body end tag missing in authfail.html 2013-09-13 12:13:47 +10:00
Joakim Erdfelt 7f85842666 417134 - WebSocket / Jsr ServerEndpointConfig.Configurator.getNegotiatedExtensions() is never used
+ Extensions pre-negotiated via
  ServerEndpointConfig.Configurator.getNegotiatedExtensions are not
  properly handled.
+ Added JsrBrowserDebugTool (Jsr version of BrowserDebugTool)
2013-09-12 15:25:02 -07:00