From 5e77672975c6d272072baeec77005c847535fd97 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Tue, 26 Mar 2013 19:02:51 +0200
Subject: Removed CommunicationManager and PortletCommunicationManager

* Moved AbstractCommunicationManager abstract methods
  getThemeResourceAsStream and createBootstrapHandler to VaadinService
* Made ACM non-abstract and renamed to LegacyCommunicationManager
* Lifted anonymous inner BootstrapHandler subclasses into named public classes

Change-Id: I31739ce8a506d572e75ca8cd5509be215e01693d
---
 .../src/com/vaadin/tests/server/TestClassesSerializable.java      | 4 +---
 .../src/com/vaadin/tests/server/TestStreamVariableMapping.java    | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'server/tests')

diff --git a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index 3172b759a1..90cb6b9994 100644
--- a/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
@@ -45,9 +45,7 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.util\\.SerializerHelper", // fully static
             // class level filtering, also affecting nested classes and
             // interfaces
-            "com\\.vaadin\\.server\\.AbstractCommunicationManager.*", //
-            "com\\.vaadin\\.server\\.CommunicationManager.*", //
-            "com\\.vaadin\\.server\\.PortletCommunicationManager.*", //
+            "com\\.vaadin\\.server\\.LegacyCommunicationManager.*", //
             "com\\.vaadin\\.buildhelpers.*", //
             "com\\.vaadin\\.util\\.ReflectTools.*", //
             "com\\.vaadin\\.data\\.util\\.ReflectTools.*", //
diff --git a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
index 0245ec5d5e..68fbdb8d0d 100644
--- a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
 
-import com.vaadin.server.CommunicationManager;
+import com.vaadin.server.LegacyCommunicationManager;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinSession;
@@ -18,7 +18,7 @@ public class TestStreamVariableMapping extends TestCase {
     private Upload owner;
     private StreamVariable streamVariable;
 
-    private CommunicationManager cm;
+    private LegacyCommunicationManager cm;
 
     @Override
     protected void setUp() throws Exception {
@@ -72,8 +72,8 @@ public class TestStreamVariableMapping extends TestCase {
                 variableName));
     }
 
-    private CommunicationManager createCommunicationManager() {
-        return new CommunicationManager(new VaadinSession(null));
+    private LegacyCommunicationManager createCommunicationManager() {
+        return new LegacyCommunicationManager(new VaadinSession(null));
     }
 
 }
-- 
cgit v1.2.3