Fix for Atmosphere#195 [runtime] Add support for Tomcat WebSocket

yaoqi · Apr 6, 2012 · 380b571 · 380b571
1 parent a26ae4c
commit 380b571
Show file tree

Hide file tree

Showing 26 changed files with 608 additions and 104 deletions.
diff --git a/modules/acceptance-tests/pom.xml b/modules/acceptance-tests/pom.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.atmosphere</groupId>
+        <artifactId>atmosphere-project</artifactId>
+        <version>0.9-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.atmosphere</groupId>
+    <artifactId>acceptance-tests-runtime</artifactId>
+    <packaging>jar</packaging>
+    <version>0.9-SNAPSHOT</version>
+    <name>acceptance-tests-runtime</name>
+    <url>https://github.com/Atmosphere/atmosphere</url>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-continuation</artifactId>
+            <version>${jetty7-version}</version>
+            <scope>test</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty7-version}</version>
+            <scope>test</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-websockets</artifactId>
+            <version>${grizzly-version}</version>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-http</artifactId>
+            <version>${grizzly-version}</version>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-http-servlet</artifactId>
+            <version>${grizzly-version}</version>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-comet</artifactId>
+            <version>${grizzly-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-compat</artifactId>
+            <version>${grizzly-version}</version>
+            <scope>test</scope>
+        </dependency>
+
+                <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>catalina</artifactId>
+            <version>${tomcat-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>coyote</artifactId>
+            <version>${tomcat-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.8.5</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.atmosphere</groupId>
+            <artifactId>atmosphere-runtime</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-catalina</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-coyote</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-util</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>
+
diff --git a/.../tests/AbstractHttpAtmosphereHandler.java → .../tests/AbstractHttpAtmosphereHandler.java b/.../tests/AbstractHttpAtmosphereHandler.java → .../tests/AbstractHttpAtmosphereHandler.java
diff --git a/...mosphere/tests/AtmosphereServletTest.java → ...mosphere/tests/AtmosphereServletTest.java b/...mosphere/tests/AtmosphereServletTest.java → ...mosphere/tests/AtmosphereServletTest.java
diff --git a/...t/java/org/atmosphere/tests/BaseTest.java → ...t/java/org/atmosphere/tests/BaseTest.java b/...t/java/org/atmosphere/tests/BaseTest.java → ...t/java/org/atmosphere/tests/BaseTest.java
@@ -216,7 +216,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -268,7 +268,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -320,7 +320,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -392,7 +392,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -474,7 +474,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -550,7 +550,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -623,7 +623,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -704,7 +704,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -784,7 +784,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -858,7 +858,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                 event.getResource().resume();
                 latch.countDown();
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -939,7 +939,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -1006,7 +1006,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -1065,7 +1065,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     latch.countDown();
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -1132,7 +1132,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     assertEquals(event.getMessage(), "broadcastOnResume");
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -1209,7 +1209,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     }
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {
@@ -1276,7 +1276,7 @@ public void onStateChange(AtmosphereResourceEvent event) throws IOException {
                     }
                 }
             }
-                }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
+        }, BroadcasterFactory.getDefault().get(DefaultBroadcaster.class, "suspend"));
 
         AsyncHttpClient c = new AsyncHttpClient();
         try {

diff --git a/...ere/tests/BlockingIOCometSupportTest.java → ...ere/tests/BlockingIOCometSupportTest.java b/...ere/tests/BlockingIOCometSupportTest.java → ...ere/tests/BlockingIOCometSupportTest.java
diff --git a/...phere/tests/BroadcasterLifecycleTest.java → ...phere/tests/BroadcasterLifecycleTest.java b/...phere/tests/BroadcasterLifecycleTest.java → ...phere/tests/BroadcasterLifecycleTest.java
diff --git a/...tmosphere/tests/BroadcasterScopeTest.java → ...tmosphere/tests/BroadcasterScopeTest.java b/...tmosphere/tests/BroadcasterScopeTest.java → ...tmosphere/tests/BroadcasterScopeTest.java
diff --git a/...sphere/tests/ConcurrentBroadcastTest.java → ...sphere/tests/ConcurrentBroadcastTest.java b/...sphere/tests/ConcurrentBroadcastTest.java → ...sphere/tests/ConcurrentBroadcastTest.java
diff --git a/...sphere/tests/GrizzlyCometSupportTest.java → ...sphere/tests/GrizzlyCometSupportTest.java b/...sphere/tests/GrizzlyCometSupportTest.java → ...sphere/tests/GrizzlyCometSupportTest.java
diff --git a/...osphere/tests/Jetty6CometSupportTest.java → ...osphere/tests/Jetty6CometSupportTest.java b/...osphere/tests/Jetty6CometSupportTest.java → ...osphere/tests/Jetty6CometSupportTest.java
diff --git a/...osphere/tests/Jetty7CometSupportTest.java → ...osphere/tests/Jetty7CometSupportTest.java b/...osphere/tests/Jetty7CometSupportTest.java → ...osphere/tests/Jetty7CometSupportTest.java
diff --git a/...java/org/atmosphere/tests/MeteorTest.java → ...java/org/atmosphere/tests/MeteorTest.java b/...java/org/atmosphere/tests/MeteorTest.java → ...java/org/atmosphere/tests/MeteorTest.java
@@ -35,7 +35,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import javax.servlet.http.HttpServlet;

diff --git a/...osphere/tests/TomcatCometSupportTest.java → ...osphere/tests/TomcatCometSupportTest.java b/...osphere/tests/TomcatCometSupportTest.java → ...osphere/tests/TomcatCometSupportTest.java
@@ -85,6 +85,7 @@ public void init(final ServletConfig sc) throws ServletException {
     public void startServer() throws Exception {
 
         System.setProperty("org.atmosphere.useNative", "true");
+        try {
 
         int port = TestHelper.getEnvVariable("ATMOSPHERE_HTTP_PORT", findFreePort());
         urlTarget = "http://127.0.0.1:" + port + "/invoke";
@@ -114,7 +115,11 @@ public void startServer() throws Exception {
         embedded.addEngine(engine);
         embedded.addConnector(connector);
         embedded.start();
+
         atmoServlet = (AtmosphereServlet) w.getServlet();
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
 
     }
 

diff --git a/...s/cpr/src/test/resources/logback-test.xml → ...tests/src/test/resources/logback-test.xml b/...s/cpr/src/test/resources/logback-test.xml → ...tests/src/test/resources/logback-test.xml
diff --git a/modules/compat-tomcat7/pom.xml b/modules/compat-tomcat7/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.atmosphere</groupId>
         <artifactId>atmosphere-project</artifactId>