Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,831 Commits 55 Branches 466 Tags
Commit Graph

593 Commits

Author SHA1 Message Date
Joakim Erdfelt
866a9c96d2 jetty-start / removing --module= references in start.ini 
+ making sure that demo.mod starts jetty appropriately.
+ making sure that --disable-module=demo works as advertised with
  jetty-distribution
 2013-08-26 16:47:08 -07:00
Joakim Erdfelt
14ec13000d Moving demo related files in distro to ${jetty.base}/demo/ directory 2013-08-26 09:50:31 -07:00
Jesse McConnell
ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Joakim Erdfelt
2e94149ea3 Merge branch 'jetty-9.1' into jetty-9.1-altstart 2013-08-23 11:49:41 -07:00
Greg Wilkins
e4235ea070 415744 - Reduce Future usage in websocket 2013-08-23 19:58:46 +10:00
Greg Wilkins
d2ff475834 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
 2013-08-23 17:17:34 +10:00
Joakim Erdfelt
a396563340 414635 Modular start.d and jetty.base property 
+ More work on startup of real jetty server.
 2013-08-22 14:52:02 -07:00
Jesse McConnell
307fdced91 Merge branch 'master' into jetty-9.1 2013-08-20 14:02:45 -05:00
Jesse McConnell
a69deacc4c [Bug 411069] update minimum jdk versions in pom.xml's 2013-08-20 12:40:33 -05:00
Joakim Erdfelt
4016ba571c JSR-356 working javax.websocket demo in the distribution. 2013-08-15 12:20:06 -07:00
Joakim Erdfelt
662d00855d Adding javax.websocket chat to test-jetty-webapp 2013-08-15 12:20:06 -07: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
2c3ecf9e38 414731 Request.getCookies() should return null if there are no cookies 2013-08-09 18:08:16 +10:00
Jan Bartel
47a8809ec7 413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener 2013-08-02 12:26:54 +10:00
Jesse McConnell
20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell
1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell
de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell
e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell
99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Simone Bordet
3b7322f53b Merged branch 'master' into 'jetty-9.1'. 2013-07-23 10:01:17 +02:00
Jan Bartel
f19421112a 405535 implement Request.isUserInRole(role) check security-role-refs defaulting to security-role if no matching ref 2013-07-23 17:20:55 +10:00
Joakim Erdfelt
2e1ad360ae Fixing compilation failure 2013-07-16 18:17:14 -07: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
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
Jesse McConnell
8927c18840 reset versions for release 2013-06-21 15:28:26 -05: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
Jan Bartel
4f6732a7e9 Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization. 2013-06-21 18:41:35 +10:00
Joakim Erdfelt
f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Joakim Erdfelt
2da8c9c306 Merge branch 'master' into javawebsocket-jsr 
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
 2013-06-17 10:54:10 -07: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
Thomas Becker
391b0ee426 ChatServletTest fix test 2013-06-13 17:36:29 +02:00
Thomas Becker
df17ef8b3a 408709 refactor test-webapp's chat application. Now there's only a single request for user login and initial chat message. 2013-06-13 16:58:57 +02:00
Jesse McConnell
eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Jan Bartel
af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Jesse McConnell
725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell
742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell
bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell
0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell
d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00