diff options
| author | Artur Signell <artur@vaadin.com> | 2015-04-22 15:13:23 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-04-22 17:28:40 +0300 |
| commit | 443744ff578545fb57cf77875097ea50f8af4000 (patch) | |
| tree | fde89c4890736a7e96c2b356634d6d7fed8035ab | |
| parent | d001f62bd15ef08a46c04dc3d3e507abeb829397 (diff) | |
| download | vaadin-framework-443744ff578545fb57cf77875097ea50f8af4000.tar.gz vaadin-framework-443744ff578545fb57cf77875097ea50f8af4000.zip | |
Enable running websocket tests on JBoss EAP 6.4 (#13323)
Change-Id: I6930aec1bd7b8df102f01b1d7c393e2155591757
| -rw-r--r-- | WebContent/WEB-INF/jboss-web.xml | 7 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/WebContent/WEB-INF/jboss-web.xml b/WebContent/WEB-INF/jboss-web.xml new file mode 100644 index 0000000000..12548b7c5c --- /dev/null +++ b/WebContent/WEB-INF/jboss-web.xml @@ -0,0 +1,7 @@ +<jboss-web version="7.2" xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee + schema/jboss-web_7_2.xsd"> + <!-- Enable websockets on JBoss EAP 6.4 --> + <enable-websockets>true</enable-websockets> +</jboss-web> diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java index 469428a357..1883e5f601 100644 --- a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java +++ b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java @@ -38,7 +38,6 @@ public class ServletIntegrationTests { notJSR356Compatible.add("jboss4"); notJSR356Compatible.add("jboss5"); notJSR356Compatible.add("jboss6"); - notJSR356Compatible.add("jbosseap6"); notJSR356Compatible.add("jboss7"); notJSR356Compatible.add("jetty7"); @@ -59,7 +58,6 @@ public class ServletIntegrationTests { notWebsocketCompatible.add("jboss5"); notWebsocketCompatible.add("jboss6"); notWebsocketCompatible.add("jboss7"); - notWebsocketCompatible.add("jbosseap6"); notWebsocketCompatible.add("jetty5"); notWebsocketCompatible.add("jetty6"); notWebsocketCompatible.add("tomcat5"); |