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 |
Joakim Erdfelt
|
9f82849900
|
Merge from [master] to [javawebsocket-jsr]
|
2013-05-09 12:10:57 -07:00 |
Jan Bartel
|
9b57f9e29a
|
Fix test-spec test for new annotation added.
|
2013-05-09 12:18:53 +10:00 |
Jan Bartel
|
2fb23e705c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/AnnotationTest.java
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-05-09 11:29:45 +10:00 |
Jesse McConnell
|
3d600ed95e
|
[maven-release-plugin] prepare for next development iteration
|
2013-05-06 18:13:04 -05:00 |
Jesse McConnell
|
d832f3dc7e
|
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
|
2013-05-06 18:12:55 -05:00 |
Jan Bartel
|
143b387727
|
Improve styles for test webapps
|
2013-05-06 19:13:41 +10:00 |
Jan Bartel
|
a5c143063f
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-06 17:00:47 +10:00 |
Jan Bartel
|
b182f09b2c
|
405944 Check annotation and resource injection is supported for AsyncListener
|
2013-05-06 16:32:38 +10:00 |
Greg Wilkins
|
b89de0346d
|
updated jndi, jaas and annotation tests to webapps.demo
|
2013-05-06 16:16:43 +10:00 |
Jan Bartel
|
8d0cf5e949
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-05-06 14:46:28 +10:00 |
Greg Wilkins
|
d3f33909c2
|
improved comments for ini files
|
2013-05-06 09:26:14 +10:00 |
Jan Bartel
|
e7ecfd2b2b
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
|
2013-05-02 09:07:24 +10:00 |
Greg Wilkins
|
9558d7e815
|
modular start.ini files and --download start option
|
2013-04-26 13:53:28 +10:00 |
Jan Bartel
|
2360f5dcd5
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
|
2013-04-23 15:08:56 +10:00 |
Joakim Erdfelt
|
346034b44f
|
JSR-356 removing redundant try/catch
|
2013-04-22 11:16:01 -07:00 |
Greg Wilkins
|
03fd068ebc
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
|
2013-04-22 14:20:03 +10:00 |
Jan Bartel
|
87d4690462
|
405533 Implement special role ** for security constraints
|
2013-04-19 15:53:45 +10:00 |
Greg Wilkins
|
a7073d05a6
|
updated version to 9.1.0-SNAPSHOT
|
2013-04-19 13:59:18 +10:00 |
Jan Bartel
|
d34bd7aec7
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-18 12:16:24 +10:00 |
Jesse McConnell
|
7baaa14ba1
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-17 11:46:39 -05:00 |
Jesse McConnell
|
e390b54b25
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
|
2013-04-17 11:46:31 -05:00 |
Jesse McConnell
|
0b20467c6f
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-15 11:40:45 -05:00 |
Jesse McConnell
|
3aa4301711
|
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
|
2013-04-15 11:40:37 -05:00 |
Jan Bartel
|
db21b42b4f
|
Update to newer 3.1 api jar published by oracle (3.1-b08 - note DOES NOT contain xsds and dtds).
|
2013-04-15 17:44:35 +10:00 |
Greg Wilkins
|
4e3c7367af
|
virtual host example
|
2013-04-15 12:29:08 +10:00 |
Jan Bartel
|
07b844bf85
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
|
2013-04-11 15:55:04 +10:00 |
Greg Wilkins
|
b8dd8bde14
|
[maven-release-plugin] prepare for next development iteration
|
2013-04-08 12:31:34 +10:00 |
Greg Wilkins
|
bf3771904b
|
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
|
2013-04-08 12:30:59 +10:00 |
Jan Bartel
|
279dff381c
|
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
|
2013-03-18 16:00:23 +11:00 |
Jesse McConnell
|
0405c8ded6
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-12 09:05:25 -05:00 |
Jesse McConnell
|
852178cd01
|
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
|
2013-03-12 09:05:14 -05:00 |
Joakim Erdfelt
|
897c35c2cb
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-08 11:33:23 -07:00 |
Joakim Erdfelt
|
cc6196af50
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
|
2013-03-08 11:33:15 -07:00 |
Joakim Erdfelt
|
7fc38f6c0f
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-07 19:14:19 -07:00 |
Joakim Erdfelt
|
96d045442f
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
|
2013-03-07 19:14:11 -07:00 |
Jesse McConnell
|
778ee1411b
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-06 10:21:46 -06:00 |
Jesse McConnell
|
d916078711
|
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
|
2013-03-06 10:21:38 -06:00 |
Joakim Erdfelt
|
94756a42c3
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-01 16:08:32 -07:00 |
Joakim Erdfelt
|
96dabe7e62
|
[maven-release-plugin] prepare release jetty-9.0.0.RC3
|
2013-03-01 16:08:24 -07:00 |
Joakim Erdfelt
|
c267c1a9d0
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-01 10:26:43 -07:00 |
Joakim Erdfelt
|
ba15fe04e2
|
[maven-release-plugin] prepare release jetty-9.0.0.RC3
|
2013-03-01 10:26:34 -07:00 |
Jan Bartel
|
90b5ea2c5e
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
|
2013-03-01 19:08:09 +11:00 |
Joakim Erdfelt
|
29b2118870
|
[maven-release-plugin] prepare for next development iteration
|
2013-02-26 09:20:45 -07:00 |