diff options
| author | Artur Signell <artur@vaadin.com> | 2015-03-18 16:22:08 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-04-02 13:08:42 +0000 |
| commit | dad7ac2309a550de6b02614c3a9be93d84e843e0 (patch) | |
| tree | afe822155f91155a17f55d291f621366c2c650cf /push | |
| parent | 99882e2958e5692fbe52bd478a5c84ac65266ce6 (diff) | |
| download | vaadin-framework-dad7ac2309a550de6b02614c3a9be93d84e843e0.tar.gz vaadin-framework-dad7ac2309a550de6b02614c3a9be93d84e843e0.zip | |
Support JSR-356 websockets (#16738, #14432)
* Initialize Atmosphere in a context listener as JSR-356 requires
* Do not run JSR-356 or websocket tests on servers without support
* Adds /run-jsr356/ for testing JSR-356 websockets with uitest.war
* Change push path to /PUSH (from /PUSH/) to be compatible with JSR 356
endpoint mappings in Atmosphere (#14381)
Change-Id: Iec43f26df8c7b2bd347a713623a5298cc9e7b2cd
Diffstat (limited to 'push')
| -rw-r--r-- | push/ivy.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/push/ivy.xml b/push/ivy.xml index 605f5d1a05..8827d92bc0 100644 --- a/push/ivy.xml +++ b/push/ivy.xml @@ -29,9 +29,9 @@ <dependencies> <!-- API DEPENDENCIES --> - <!--Servlet API version 2.4 --> - <dependency org="javax.servlet" name="servlet-api" - rev="2.4" conf="build-provided,ide,test -> default" /> + <!-- @WebListener is used for JSR356 websockets so we need to compile with servlet 3 API --> + <dependency org="javax.servlet" name="javax.servlet-api" + rev="3.0.1" conf="build-provided,ide,test -> default" /> <!-- Atmosphere --> <dependency org="com.vaadin.external.atmosphere" |