Jan Bartel
280000e88a
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
VERSION.txt
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-spi/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-overlay-deployer/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
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-jetty-webapp/src/main/config/demo/webapps/test.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-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-29 12:59:32 +10:00
Greg Wilkins
c84063a5f8
415826 start.jar replace --enable with --initialize
...
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
Greg Wilkins
c1bd267c17
415826 start.jar replace --enable with --initialize
2013-08-28 15:41:27 +10:00
Greg Wilkins
d66778ad06
415826 start.jar module --enable and --disable
...
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
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
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
acb5919844
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
2013-03-12 09:10:42 -05: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
Joakim Erdfelt
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
Greg Wilkins
c60f18e7dd
401644 Dump does not login user already logged in
2013-02-25 13:34:58 +11:00
Jan Bartel
b2b888d18a
Use etc/jetty-plus.xml from start.ini by preference for test-jndi-webapp
2013-02-22 15:22:40 +11:00
Jan Bartel
1153e0455c
Use etc/jetty-plus.xml and etc/jetty-annotations.xml in start.ini for test-spec webapp
2013-02-22 13:00:07 +11:00
Joakim Erdfelt
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
Joakim Erdfelt
1480f3d8fc
399669 - Remove WebSocketConnection in favor of websocket.api.Session
2013-01-31 12:09:04 -07:00
Jesse McConnell
5c58878c3c
[maven-release-plugin] prepare for next development iteration
2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
2013-01-31 11:34:30 -06:00
Jesse McConnell
a5e1e04af1
[maven-release-plugin] prepare for next development iteration
2013-01-31 08:42:20 -06:00
Jesse McConnell
b7fb18fd65
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
2013-01-31 08:42:12 -06:00
Greg Wilkins
b132663c2b
jetty-9 made WebAppContext configuration additive
2013-01-31 12:21:04 +11:00
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
Jan Bartel
a36c55d7a0
Update instructions for test-spec webapp
2013-01-25 11:28:40 +11:00
Jan Bartel
16ef1cbd74
Update deployment instructions for test-jndi webapp
2013-01-25 11:09:19 +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
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -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
3c7b78b8f4
adjust to fit
2012-12-26 15:20:19 -03:00
Jesse McConnell
82d6388a59
Address javadoc linkages in test webapp and root context
2012-12-26 15:05:17 -03:00
Jesse McConnell
2bc4cdcd01
wire up transparent access for both xref and apidocs
2012-12-26 15:01:41 -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
7115ea5e12
jetty-9 added missing manifest (was ignored)
2012-11-26 20:48:56 +11:00
Greg Wilkins
3b935c9061
jetty-9 fixed assembly
2012-11-26 17:33:50 +11:00
Greg Wilkins
9a4e5f3301
jetty-9 Added proxy test webapp. Refined no servlet context handling
2012-11-26 16:57:37 +11:00
Thomas Becker
ab642141d1
Add jetty-maven-plugin to test-webapp-rfc2616
2012-11-23 11:01:58 +01: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 67b5caadbb
.
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 4bd36e3d38
.
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
Jan Bartel
0912731b89
Add test-mock-resources to plugin dependencies for test-jndi-webapp
2012-11-19 13:29:29 +11:00
Jan Bartel
b000fa4f34
394545 Add jetty-jaas dependency to jetty-maven-plugin
2012-11-19 12:21:01 +11:00
Jan Bartel
13e0b40c8b
Update context path from /test-annotations to /test-spec for test-spec-webapp
2012-11-08 13:54:04 +11:00
Jesse McConnell
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
Jan Bartel
ce1c1107eb
Fix license headers
2012-11-02 23:09:09 +11:00
Jan Bartel
2a2215cf0b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-11-02 16:59:11 +11:00
Jan Bartel
4e7932f519
Add production warning; rename test-annotation.war to test-spec.war for jetty-9
2012-11-02 16:56:17 +11:00
Jan Bartel
94c05e6c2e
Porting test webapps from codehaus to jetty-9
2012-11-02 15:43:05 +11:00
Jan Bartel
c49563244c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2012-10-30 19:18:20 +11:00
Jan Bartel
a74c9f176c
392237 Split jaas from jetty-plus into jetty-jaas and port the test-jaas-webapp from codehaus
2012-10-29 18:21:37 +11:00
Jan Bartel
958d0c6949
Start incorporating (EDR version) servlet 3.1 spec
2012-10-27 17:38:43 +11:00
Jesse McConnell
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
Jesse McConnell
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
Jesse McConnell
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
Jesse McConnell
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
Jesse McConnell
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
Jesse McConnell
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
Jesse McConnell
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
Jesse McConnell
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
Jesse McConnell
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
Jesse McConnell
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
Joakim Erdfelt
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
Jesse McConnell
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
Jesse McConnell
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
Greg Wilkins
b1750c0aae
jetty-9 fixed bad merge of poms
2012-07-20 15:20:57 +10:00
Jesse McConnell
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
Jesse McConnell
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
Jesse McConnell
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
Jesse McConnell
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
Jesse McConnell
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
Jesse McConnell
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
Jesse McConnell
30e8e40ef2
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:41:45 -05:00
Jesse McConnell
667cf9a643
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 15:41:38 -05:00
Jesse McConnell
d23a3c90b5
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:40:47 -05:00
Jesse McConnell
57c73283d8
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 15:40:35 -05:00
Jesse McConnell
e45a89694a
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:30:58 -05:00
Jesse McConnell
36fc6fe890
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 09:30:52 -05:00
Jesse McConnell
035e16aedc
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:27:27 -05:00
Jesse McConnell
f8c629026d
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 09:27:21 -05:00
Jesse McConnell
c7a9adaa32
reset for release
2012-05-24 08:33:44 -05:00
Jesse McConnell
c8fe38733f
reset versions for release
2012-05-24 08:30:26 -05:00
Jesse McConnell
ea176f0586
[maven-release-plugin] prepare for next development iteration
2012-05-22 15:14:05 -05:00
Jesse McConnell
3fdda881d8
[maven-release-plugin] prepare release jetty-8.1.4.v20120522
2012-05-22 15:13:56 -05:00
Jesse McConnell
300a37319a
[maven-release-plugin] prepare for next development iteration
2012-05-22 14:34:10 -05:00
Jesse McConnell
9ccd059375
[maven-release-plugin] prepare release jetty-7.6.4.v20120522
2012-05-22 14:33:59 -05:00
Jesse McConnell
d292c67b7d
[maven-release-plugin] prepare for next development iteration
2012-04-16 09:37:37 -05:00
Jesse McConnell
eabdb734ef
[maven-release-plugin] prepare release jetty-8.1.3.v20120416
2012-04-16 09:37:31 -05:00
Jesse McConnell
10e269ad68
[maven-release-plugin] prepare for next development iteration
2012-04-16 09:37:15 -05:00
Jesse McConnell
df1f709ea2
[maven-release-plugin] prepare release jetty-7.6.3.v20120416
2012-04-16 09:37:08 -05:00
Jesse McConnell
b64909900c
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:31:47 -05:00
Jesse McConnell
2c0a35d430
[maven-release-plugin] prepare release jetty-8.1.3.v20120413
2012-04-13 15:31:38 -05:00
Jesse McConnell
b963840d40
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:29:14 -05:00
Jesse McConnell
a652ee7396
[maven-release-plugin] prepare release jetty-7.6.3.v20120413
2012-04-13 15:29:05 -05:00
Simone Bordet
72040202d4
Reverted release back to 8.1.3-SNAPSHOT.
2012-04-13 17:27:37 +02:00
Simone Bordet
85710fb9ea
Reverted release back to 7.6.3-SNAPSHOT.
2012-04-13 16:59:06 +02:00
Jesse McConnell
3b87e91cbe
[maven-release-plugin] prepare for next development iteration
2012-04-12 10:29:30 -05:00
Jesse McConnell
308b010744
[maven-release-plugin] prepare release jetty-8.1.3.v20120412
2012-04-12 10:29:20 -05:00
Jesse McConnell
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
Jesse McConnell
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Jesse McConnell
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Joakim Erdfelt
fdaad62b63
Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
...
+ Removed old deps in javax.*, geronimo, and asm in favor of
new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Jesse McConnell
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00