7 files changed, 37 insertions, 35 deletions
diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
index 7a240a1f1d..ca5c344b2e 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
@@ -327,7 +327,7 @@ public abstract class AbstractContainerTest extends TestCase {
                 REVERSE_FULLY_QUALIFIED_NAME, "ad", false, false));
 
         validateContainer(container, "com.vaadin.data.Buffered",
-                "com.vaadin.terminal.gwt.server.ComponentSizeValidator",
+                "com.vaadin.server.ComponentSizeValidator",
                 "com.vaadin.data.util.IndexedContainer",
                 "com.vaadin.client.ui.VUriFragmentUtility",
                 isFilteredOutItemNull(), 37);
@@ -387,8 +387,7 @@ public abstract class AbstractContainerTest extends TestCase {
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },
                 new boolean[] { true });
 
-        validateContainer(container,
-                "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
+        validateContainer(container, "com.vaadin.server.ApplicationPortlet2",
                 "com.vaadin.data.util.ObjectProperty",
                 "com.vaadin.ui.BaseFieldFactory", "blah", true,
                 sampleData.length);
@@ -574,31 +573,31 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.client.VErrorMessage", "com.vaadin.client.VTooltip",
             "com.vaadin.client.VUIDLBrowser", "com.vaadin.client.WidgetMap",
             "com.vaadin.client.WidgetSet",
-            "com.vaadin.terminal.gwt.server.AbstractApplicationPortlet",
-            "com.vaadin.terminal.gwt.server.AbstractApplicationServlet",
-            "com.vaadin.terminal.gwt.server.AbstractCommunicationManager",
-            "com.vaadin.terminal.gwt.server.AbstractWebApplicationContext",
-            "com.vaadin.terminal.gwt.server.ApplicationPortlet",
-            "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
-            "com.vaadin.terminal.gwt.server.ApplicationRunnerServlet",
-            "com.vaadin.terminal.gwt.server.ApplicationServlet",
-            "com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent",
-            "com.vaadin.terminal.gwt.server.CommunicationManager",
-            "com.vaadin.terminal.gwt.server.ComponentSizeValidator",
-            "com.vaadin.terminal.gwt.server.Constants",
-            "com.vaadin.terminal.gwt.server.GAEApplicationServlet",
-            "com.vaadin.terminal.gwt.server.HttpServletRequestListener",
-            "com.vaadin.terminal.gwt.server.HttpUploadStream",
-            "com.vaadin.terminal.gwt.server.JsonPaintTarget",
-            "com.vaadin.terminal.gwt.server.PortletApplicationContext",
-            "com.vaadin.terminal.gwt.server.PortletApplicationContext2",
-            "com.vaadin.terminal.gwt.server.PortletCommunicationManager",
-            "com.vaadin.terminal.gwt.server.PortletRequestListener",
-            "com.vaadin.terminal.gwt.server.RestrictedRenderResponse",
-            "com.vaadin.terminal.gwt.server.SessionExpiredException",
-            "com.vaadin.terminal.gwt.server.SystemMessageException",
-            "com.vaadin.terminal.gwt.server.WebApplicationContext",
-            "com.vaadin.terminal.gwt.server.WebBrowser",
+            "com.vaadin.server.AbstractApplicationPortlet",
+            "com.vaadin.server.AbstractApplicationServlet",
+            "com.vaadin.server.AbstractCommunicationManager",
+            "com.vaadin.server.AbstractWebApplicationContext",
+            "com.vaadin.server.ApplicationPortlet",
+            "com.vaadin.server.ApplicationPortlet2",
+            "com.vaadin.server.ApplicationRunnerServlet",
+            "com.vaadin.server.ApplicationServlet",
+            "com.vaadin.server.ChangeVariablesErrorEvent",
+            "com.vaadin.server.CommunicationManager",
+            "com.vaadin.server.ComponentSizeValidator",
+            "com.vaadin.server.Constants",
+            "com.vaadin.server.GAEApplicationServlet",
+            "com.vaadin.server.HttpServletRequestListener",
+            "com.vaadin.server.HttpUploadStream",
+            "com.vaadin.server.JsonPaintTarget",
+            "com.vaadin.server.PortletApplicationContext",
+            "com.vaadin.server.PortletApplicationContext2",
+            "com.vaadin.server.PortletCommunicationManager",
+            "com.vaadin.server.PortletRequestListener",
+            "com.vaadin.server.RestrictedRenderResponse",
+            "com.vaadin.server.SessionExpiredException",
+            "com.vaadin.server.SystemMessageException",
+            "com.vaadin.server.WebApplicationContext",
+            "com.vaadin.server.WebBrowser",
             "com.vaadin.terminal.gwt.widgetsetutils.ClassPathExplorer",
             "com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator",
             "com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder",
diff --git a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
index 918c9dfb7b..772cd250ce 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
@@ -179,7 +179,7 @@ public abstract class AbstractHierarchicalContainerTest extends
                 new boolean[] { true });
 
         validateHierarchicalContainer(container,
-                "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
+                "com.vaadin.server.ApplicationPortlet2",
                 "com.vaadin.data.util.ObjectProperty",
                 "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
index d3d7d37690..10bc71c3a7 100644
--- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
+++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
@@ -211,7 +211,7 @@ public class TestHierarchicalContainer extends
         // com.vaadin.client.ui.VTabsheet
         // com.vaadin.client.ui.VTabsheetBase
         // com.vaadin.client.ui.VTabsheetPanel
-        // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent
+        // com.vaadin.server.ChangeVariablesErrorEvent
         // com.vaadin.server.Paintable
         // com.vaadin.server.Scrollable
         // com.vaadin.server.Sizeable
diff --git a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java b/tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index 38fca09157..df16e98bba 100644
--- a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
@@ -1,4 +1,4 @@
-package com.vaadin.terminal.gwt.server;
+package com.vaadin.server;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
@@ -15,6 +15,9 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
+import com.vaadin.server.AbstractApplicationServlet;
+import com.vaadin.server.ApplicationServlet;
+
 import junit.framework.TestCase;
 
 public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
diff --git a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java b/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
index 65455eba37..84247c81c1 100644
--- a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
+++ b/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.SimpleMultiPartInputStream;
+import com.vaadin.server.AbstractCommunicationManager.SimpleMultiPartInputStream;
 
 public class TestSimpleMultiPartInputStream extends TestCase {
 
diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
index 8b35b322cb..f3b367483a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
@@ -5,9 +5,9 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 
 import com.vaadin.Application;
+import com.vaadin.server.CommunicationManager;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.WrappedRequest;
-import com.vaadin.terminal.gwt.server.CommunicationManager;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 
diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
index efebc097bf..0cacccd08a 100644
--- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
+++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
@@ -19,10 +19,10 @@ import junit.framework.TestCase;
 
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
+import com.vaadin.server.AbstractWebApplicationContext;
 import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WebApplicationContext;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext;
-import com.vaadin.terminal.gwt.server.WebApplicationContext;
 
 import org.easymock.EasyMock;