Merge branch 'master' into grid-7.5

Conflicts:
	WebContent/release-notes.html

Change-Id: I3906caeb01d1991dc9cb927b3d9ce0fb21c77e04

2 files changed, 96 insertions, 1 deletions

diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
new file mode 100644
index 0000000000..f118d38158
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.integration;
+
+public class ServletIntegrationJSR356WebsocketUITest extends
+        AbstractServletIntegrationTest {
+    // Uses the test method declared in the super class
+
+    @Override
+    protected String getDeploymentPath(Class<?> uiClass) {
+        return super.getDeploymentPath(uiClass)
+                .replace("/run/", "/run-jsr356/");
+    }
+
+    @Override
+    protected Class<?> getUIClass() {
+        return ServletIntegrationWebsocketUI.class;
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
index 77c5676215..2f97ce27c3 100644
--- a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
+++ b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java
@@ -17,21 +17,84 @@
 package com.vaadin.tests.tb3;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.model.InitializationError;
 
 import com.vaadin.tests.integration.AbstractServletIntegrationTest;
+import com.vaadin.tests.integration.ServletIntegrationJSR356WebsocketUITest;
+import com.vaadin.tests.integration.ServletIntegrationWebsocketUITest;
 import com.vaadin.tests.tb3.ServletIntegrationTests.ServletIntegrationTestSuite;
 
 @RunWith(ServletIntegrationTestSuite.class)
 public class ServletIntegrationTests {
 
+    public static Set<String> notJSR356Compatible = new HashSet<String>();
+    public static Set<String> notWebsocketCompatible = new HashSet<String>();
+    static {
+        notJSR356Compatible.add("jboss4");
+        notJSR356Compatible.add("jboss5");
+        notJSR356Compatible.add("jboss6");
+        notJSR356Compatible.add("jbosseap6");
+        notJSR356Compatible.add("jboss7");
+
+        notJSR356Compatible.add("jetty7");
+        notJSR356Compatible.add("jetty8");
+
+        notJSR356Compatible.add("glassfish3");
+
+        notJSR356Compatible.add("tomcat6");
+        notJSR356Compatible.add("tomcat7");
+        notJSR356Compatible.add("tomcat7apacheproxy");
+        notJSR356Compatible.add("weblogic10");
+        notJSR356Compatible.add("osgi"); // Karaf 3, Jetty 8
+
+        notWebsocketCompatible.add("glassfish2");
+        // In theory GF3 could work but in reality broken
+        notWebsocketCompatible.add("glassfish3");
+        notWebsocketCompatible.add("jboss4");
+        notWebsocketCompatible.add("jboss5");
+        notWebsocketCompatible.add("jboss6");
+        notWebsocketCompatible.add("jboss7");
+        notWebsocketCompatible.add("jbosseap6");
+        notWebsocketCompatible.add("jetty5");
+        notWebsocketCompatible.add("jetty6");
+        notWebsocketCompatible.add("tomcat5");
+        notWebsocketCompatible.add("tomcat6");
+        notWebsocketCompatible.add("tomcat7apacheproxy");
+        notWebsocketCompatible.add("weblogic10");
+    }
+
     public static class ServletIntegrationTestSuite extends TB3TestSuite {
         public ServletIntegrationTestSuite(Class<?> klass)
                 throws InitializationError, IOException {
             super(klass, AbstractServletIntegrationTest.class,
-                    "com.vaadin.tests.integration", new String[] {});
+                    "com.vaadin.tests.integration", new String[] {},
+                    new ServletTestLocator());
+        }
+    }
+
+    public static class ServletTestLocator extends TB3TestLocator {
+        @Override
+        protected <T> List<Class<? extends T>> findClasses(Class<T> baseClass,
+                String basePackage, String[] ignoredPackages)
+                throws IOException {
+            List<Class<? extends T>> allClasses = super.findClasses(baseClass,
+                    basePackage, ignoredPackages);
+            String serverName = System.getProperty("server-name");
+
+            if (notJSR356Compatible.contains(serverName)) {
+                allClasses
+                        .remove(ServletIntegrationJSR356WebsocketUITest.class);
+            }
+
+            if (notWebsocketCompatible.contains(serverName)) {
+                allClasses.remove(ServletIntegrationWebsocketUITest.class);
+            }
+            return allClasses;
         }
     }
 }