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

2 files changed, 324 insertions, 5 deletions

diff --git a/server/tests/src/com/vaadin/server/MockServletContext.java b/server/tests/src/com/vaadin/server/MockServletContext.java
index 031c83ae90..45ec700c40 100644
--- a/server/tests/src/com/vaadin/server/MockServletContext.java
+++ b/server/tests/src/com/vaadin/server/MockServletContext.java
@@ -24,12 +24,21 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * 
@@ -56,7 +65,7 @@ public class MockServletContext implements ServletContext {
      */
     @Override
     public int getMajorVersion() {
-        return 2;
+        return 3;
     }
 
     /*
@@ -66,7 +75,7 @@ public class MockServletContext implements ServletContext {
      */
     @Override
     public int getMinorVersion() {
-        return 4;
+        return 0;
     }
 
     /*
@@ -153,8 +162,7 @@ public class MockServletContext implements ServletContext {
      */
     @Override
     public Enumeration getServlets() {
-        // TODO Auto-generated method stub
-        return null;
+        return Collections.enumeration(Collections.EMPTY_SET);
     }
 
     /*
@@ -301,4 +309,315 @@ public class MockServletContext implements ServletContext {
         return null;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getContextPath()
+     */
+    @Override
+    public String getContextPath() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getEffectiveMajorVersion()
+     */
+    @Override
+    public int getEffectiveMajorVersion() {
+        return 3;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getEffectiveMinorVersion()
+     */
+    @Override
+    public int getEffectiveMinorVersion() {
+        return 0;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#setInitParameter(java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public boolean setInitParameter(String name, String value) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addServlet(java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public Dynamic addServlet(String servletName, String className) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addServlet(java.lang.String,
+     * javax.servlet.Servlet)
+     */
+    @Override
+    public Dynamic addServlet(String servletName, Servlet servlet) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addServlet(java.lang.String,
+     * java.lang.Class)
+     */
+    @Override
+    public Dynamic addServlet(String servletName,
+            Class<? extends Servlet> servletClass) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#createServlet(java.lang.Class)
+     */
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> clazz)
+            throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * javax.servlet.ServletContext#getServletRegistration(java.lang.String)
+     */
+    @Override
+    public ServletRegistration getServletRegistration(String servletName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getServletRegistrations()
+     */
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addFilter(java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(
+            String filterName, String className) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addFilter(java.lang.String,
+     * javax.servlet.Filter)
+     */
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(
+            String filterName, Filter filter) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addFilter(java.lang.String,
+     * java.lang.Class)
+     */
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(
+            String filterName, Class<? extends Filter> filterClass) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#createFilter(java.lang.Class)
+     */
+    @Override
+    public <T extends Filter> T createFilter(Class<T> clazz)
+            throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getFilterRegistration(java.lang.String)
+     */
+    @Override
+    public FilterRegistration getFilterRegistration(String filterName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getFilterRegistrations()
+     */
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getSessionCookieConfig()
+     */
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#setSessionTrackingModes(java.util.Set)
+     */
+    @Override
+    public void setSessionTrackingModes(
+            Set<SessionTrackingMode> sessionTrackingModes) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getDefaultSessionTrackingModes()
+     */
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getEffectiveSessionTrackingModes()
+     */
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addListener(java.lang.String)
+     */
+    @Override
+    public void addListener(String className) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addListener(java.util.EventListener)
+     */
+    @Override
+    public <T extends EventListener> void addListener(T t) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#addListener(java.lang.Class)
+     */
+    @Override
+    public void addListener(Class<? extends EventListener> listenerClass) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#createListener(java.lang.Class)
+     */
+    @Override
+    public <T extends EventListener> T createListener(Class<T> clazz)
+            throws ServletException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getJspConfigDescriptor()
+     */
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#getClassLoader()
+     */
+    @Override
+    public ClassLoader getClassLoader() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.servlet.ServletContext#declareRoles(java.lang.String[])
+     */
+    @Override
+    public void declareRoles(String... roleNames) {
+        // TODO Auto-generated method stub
+
+    }
+
 }
diff --git a/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java b/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
index 0de8fd6aab..9603032ce5 100644
--- a/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
+++ b/server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java
@@ -16,7 +16,6 @@ import java.util.jar.JarFile;
 
 import junit.framework.TestCase;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ClassesSerializableTest extends TestCase {
@@ -80,6 +79,7 @@ public class ClassesSerializableTest extends TestCase {
             "com\\.vaadin\\.external\\..*", //
             "com\\.vaadin\\.util\\.WeakValueMap.*", //
             "com\\.vaadin\\.themes\\.valoutil\\.BodyStyleName", //
+            "com\\.vaadin\\.server\\.communication\\.JSR356WebsocketInitializer.*", //
     };
 
     /**