diff options
| author | Markus Koivisto <markus@vaadin.com> | 2015-04-08 14:53:27 +0300 |
|---|---|---|
| committer | Markus Koivisto <markus@vaadin.com> | 2015-04-08 14:53:27 +0300 |
| commit | 2478267d11fddfd798fee89227b5f258441e1331 (patch) | |
| tree | ad41582f60af26d2b47959f00130f48a0a510919 /WebContent | |
| parent | a1aa700db37f727bb6a3690f1704d3ec512ee468 (diff) | |
| parent | 6abcbdf1eeb8f23ebda97df3ffad7b0abdee37ea (diff) | |
| download | vaadin-framework-2478267d11fddfd798fee89227b5f258441e1331.tar.gz vaadin-framework-2478267d11fddfd798fee89227b5f258441e1331.zip | |
Merge branch 'master' into grid-7.5
Conflicts:
WebContent/release-notes.html
Change-Id: I3906caeb01d1991dc9cb927b3d9ce0fb21c77e04
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 16 | ||||
| -rw-r--r-- | WebContent/release-notes.html | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index ef60364202..51ac907843 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -87,6 +87,17 @@ </servlet> <servlet> + <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name> + <servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class> + <!-- Force web sockets to use JSR 356 standard --> + <init-param> + <param-name>org.atmosphere.cpr.asyncSupport</param-name> + <param-value>org.atmosphere.container.JSR356AsyncSupport</param-value> + </init-param> + <async-supported>true</async-supported> + </servlet> + + <servlet> <!-- This servlet is a separate instance for the sole purpose of testing #12446 (com.vaadin.tests.components.ui.TimeoutRedirectResetsOnActivity) because it modifies the VaadinService timeout parameters --> @@ -149,6 +160,11 @@ </servlet-mapping> <servlet-mapping> + <servlet-name>VaadinApplicationRunnerWithJSR356</servlet-name> + <url-pattern>/run-jsr356/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>IntegrationTest</servlet-name> <url-pattern>/integration/*</url-pattern> </servlet-mapping> diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index e810285d83..97730cc292 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -108,7 +108,7 @@ <h3 id="incompatible">Incompatible or Behavior-altering Changes in @version-minor@</h3> <ul> - + <li>Push path has been changed from /PUSH/ to /PUSH to be compatible with JSR 356.</li> </ul> <h3 id="knownissues">Known Issues and Limitations</h3> <ul> |