Renamed com.vaadin.terminal -> com.vaadin.server (#9431)

14 files changed, 74 insertions, 106 deletions

diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
index 9c7e526dad..7a240a1f1d 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
@@ -318,8 +318,7 @@ public abstract class AbstractContainerTest extends TestCase {
                 FULLY_QUALIFIED_NAME, "ab", false, false));
 
         validateContainer(container, "com.vaadin.data.BufferedValidatable",
-                "com.vaadin.ui.TabSheet",
-                "com.vaadin.client.Focusable",
+                "com.vaadin.ui.TabSheet", "com.vaadin.client.Focusable",
                 "com.vaadin.data.Buffered", isFilteredOutItemNull(), 20);
 
         // Filter by "contains da" (reversed as ad here)
@@ -382,7 +381,7 @@ public abstract class AbstractContainerTest extends TestCase {
 
         validateContainer(container, "com.vaadin.Application",
                 "org.vaadin.test.LastClass",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 sampleData.length);
 
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },
@@ -476,60 +475,52 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.launcher.util.BrowserLauncher",
             "com.vaadin.service.ApplicationContext",
             "com.vaadin.service.FileTypeResolver",
-            "com.vaadin.terminal.ApplicationResource",
-            "com.vaadin.terminal.ClassResource",
-            "com.vaadin.terminal.CompositeErrorMessage",
-            "com.vaadin.terminal.DownloadStream",
-            "com.vaadin.terminal.ErrorMessage",
-            "com.vaadin.terminal.ExternalResource",
-            "com.vaadin.terminal.FileResource",
+            "com.vaadin.server.ApplicationResource",
+            "com.vaadin.server.ClassResource",
+            "com.vaadin.server.CompositeErrorMessage",
+            "com.vaadin.server.DownloadStream",
+            "com.vaadin.server.ErrorMessage",
+            "com.vaadin.server.ExternalResource",
+            "com.vaadin.server.FileResource",
             "com.vaadin.client.ApplicationConfiguration",
             "com.vaadin.client.ApplicationConnection",
             "com.vaadin.client.BrowserInfo",
             "com.vaadin.client.ClientExceptionHandler",
             "com.vaadin.client.ComponentDetail",
             "com.vaadin.client.ComponentDetailMap",
-            "com.vaadin.client.ComponentLocator",
-            "com.vaadin.client.Console",
+            "com.vaadin.client.ComponentLocator", "com.vaadin.client.Console",
             "com.vaadin.client.Container",
             "com.vaadin.client.ContainerResizedListener",
-            "com.vaadin.client.CSSRule",
-            "com.vaadin.client.DateTimeService",
+            "com.vaadin.client.CSSRule", "com.vaadin.client.DateTimeService",
             "com.vaadin.client.DefaultWidgetSet",
             "com.vaadin.client.Focusable",
             "com.vaadin.client.HistoryImplIEVaadin",
             "com.vaadin.client.LocaleNotLoadedException",
             "com.vaadin.client.LocaleService",
             "com.vaadin.client.MouseEventDetails",
-            "com.vaadin.client.NullConsole",
-            "com.vaadin.client.Paintable",
+            "com.vaadin.client.NullConsole", "com.vaadin.client.Paintable",
             "com.vaadin.client.RenderInformation",
             "com.vaadin.client.RenderSpace",
             "com.vaadin.client.StyleConstants",
-            "com.vaadin.client.TooltipInfo",
-            "com.vaadin.client.ui.Action",
+            "com.vaadin.client.TooltipInfo", "com.vaadin.client.ui.Action",
             "com.vaadin.client.ui.ActionOwner",
             "com.vaadin.client.ui.AlignmentInfo",
             "com.vaadin.client.ui.CalendarEntry",
             "com.vaadin.client.ui.ClickEventHandler",
-            "com.vaadin.client.ui.Field",
-            "com.vaadin.client.ui.Icon",
+            "com.vaadin.client.ui.Field", "com.vaadin.client.ui.Icon",
             "com.vaadin.client.ui.layout.CellBasedLayout",
             "com.vaadin.client.ui.layout.ChildComponentContainer",
             "com.vaadin.client.ui.layout.Margins",
             "com.vaadin.client.ui.LayoutClickEventHandler",
-            "com.vaadin.client.ui.MenuBar",
-            "com.vaadin.client.ui.MenuItem",
+            "com.vaadin.client.ui.MenuBar", "com.vaadin.client.ui.MenuItem",
             "com.vaadin.client.ui.richtextarea.VRichTextArea",
             "com.vaadin.client.ui.richtextarea.VRichTextToolbar",
             "com.vaadin.client.ui.ShortcutActionHandler",
-            "com.vaadin.client.ui.SubPartAware",
-            "com.vaadin.client.ui.Table",
+            "com.vaadin.client.ui.SubPartAware", "com.vaadin.client.ui.Table",
             "com.vaadin.client.ui.TreeAction",
             "com.vaadin.client.ui.TreeImages",
             "com.vaadin.client.ui.VAbsoluteLayout",
-            "com.vaadin.client.ui.VAccordion",
-            "com.vaadin.client.ui.VButton",
+            "com.vaadin.client.ui.VAccordion", "com.vaadin.client.ui.VButton",
             "com.vaadin.client.ui.VCalendarPanel",
             "com.vaadin.client.ui.VCheckBox",
             "com.vaadin.client.ui.VContextMenu",
@@ -539,13 +530,11 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.client.ui.VDateField",
             "com.vaadin.client.ui.VDateFieldCalendar",
             "com.vaadin.client.ui.VEmbedded",
-            "com.vaadin.client.ui.VFilterSelect",
-            "com.vaadin.client.ui.VForm",
+            "com.vaadin.client.ui.VFilterSelect", "com.vaadin.client.ui.VForm",
             "com.vaadin.client.ui.VFormLayout",
             "com.vaadin.client.ui.VGridLayout",
             "com.vaadin.client.ui.VHorizontalLayout",
-            "com.vaadin.client.ui.VLabel",
-            "com.vaadin.client.ui.VLink",
+            "com.vaadin.client.ui.VLabel", "com.vaadin.client.ui.VLink",
             "com.vaadin.client.ui.VListSelect",
             "com.vaadin.client.ui.VMarginInfo",
             "com.vaadin.client.ui.VMenuBar",
@@ -555,15 +544,13 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.client.ui.VOptionGroup",
             "com.vaadin.client.ui.VOptionGroupBase",
             "com.vaadin.client.ui.VOrderedLayout",
-            "com.vaadin.client.ui.VOverlay",
-            "com.vaadin.client.ui.VPanel",
+            "com.vaadin.client.ui.VOverlay", "com.vaadin.client.ui.VPanel",
             "com.vaadin.client.ui.VPasswordField",
             "com.vaadin.client.ui.VPopupCalendar",
             "com.vaadin.client.ui.VPopupView",
             "com.vaadin.client.ui.VProgressIndicator",
             "com.vaadin.client.ui.VScrollTable",
-            "com.vaadin.client.ui.VSlider",
-            "com.vaadin.client.ui.VSplitPanel",
+            "com.vaadin.client.ui.VSlider", "com.vaadin.client.ui.VSplitPanel",
             "com.vaadin.client.ui.VSplitPanelHorizontal",
             "com.vaadin.client.ui.VSplitPanelVertical",
             "com.vaadin.client.ui.VTablePaging",
@@ -572,26 +559,20 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.client.ui.VTabsheetPanel",
             "com.vaadin.client.ui.VTextArea",
             "com.vaadin.client.ui.VTextField",
-            "com.vaadin.client.ui.VTextualDate",
-            "com.vaadin.client.ui.VTime",
+            "com.vaadin.client.ui.VTextualDate", "com.vaadin.client.ui.VTime",
             "com.vaadin.client.ui.VTree",
             "com.vaadin.client.ui.VTwinColSelect",
             "com.vaadin.client.ui.VUnknownComponent",
             "com.vaadin.client.ui.VUpload",
             "com.vaadin.client.ui.VUriFragmentUtility",
             "com.vaadin.client.ui.VVerticalLayout",
-            "com.vaadin.client.ui.VView",
-            "com.vaadin.client.ui.VWindow",
-            "com.vaadin.client.UIDL",
-            "com.vaadin.client.Util",
-            "com.vaadin.client.ValueMap",
-            "com.vaadin.client.VCaption",
+            "com.vaadin.client.ui.VView", "com.vaadin.client.ui.VWindow",
+            "com.vaadin.client.UIDL", "com.vaadin.client.Util",
+            "com.vaadin.client.ValueMap", "com.vaadin.client.VCaption",
             "com.vaadin.client.VCaptionWrapper",
             "com.vaadin.client.VDebugConsole",
-            "com.vaadin.client.VErrorMessage",
-            "com.vaadin.client.VTooltip",
-            "com.vaadin.client.VUIDLBrowser",
-            "com.vaadin.client.WidgetMap",
+            "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",
@@ -621,18 +602,16 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.terminal.gwt.widgetsetutils.ClassPathExplorer",
             "com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator",
             "com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder",
-            "com.vaadin.terminal.KeyMapper", "com.vaadin.terminal.Paintable",
-            "com.vaadin.terminal.PaintException",
-            "com.vaadin.terminal.PaintTarget",
-            "com.vaadin.terminal.ParameterHandler",
-            "com.vaadin.terminal.Resource", "com.vaadin.terminal.Scrollable",
-            "com.vaadin.terminal.Sizeable",
-            "com.vaadin.terminal.StreamResource",
-            "com.vaadin.terminal.SystemError", "com.vaadin.terminal.Terminal",
-            "com.vaadin.terminal.ThemeResource",
-            "com.vaadin.terminal.UploadStream",
-            "com.vaadin.terminal.URIHandler", "com.vaadin.terminal.UserError",
-            "com.vaadin.terminal.VariableOwner",
+            "com.vaadin.server.KeyMapper", "com.vaadin.server.Paintable",
+            "com.vaadin.server.PaintException",
+            "com.vaadin.server.PaintTarget",
+            "com.vaadin.server.ParameterHandler", "com.vaadin.server.Resource",
+            "com.vaadin.server.Scrollable", "com.vaadin.server.Sizeable",
+            "com.vaadin.server.StreamResource",
+            "com.vaadin.server.SystemError", "com.vaadin.server.Terminal",
+            "com.vaadin.server.ThemeResource",
+            "com.vaadin.server.UploadStream", "com.vaadin.server.URIHandler",
+            "com.vaadin.server.UserError", "com.vaadin.server.VariableOwner",
             "com.vaadin.tools.ReflectTools",
             "com.vaadin.tools.WidgetsetCompiler",
             "com.vaadin.ui.AbsoluteLayout", "com.vaadin.ui.AbstractComponent",
diff --git a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
index 6bfff90c7b..918c9dfb7b 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
@@ -149,7 +149,7 @@ public abstract class AbstractHierarchicalContainerTest extends
         int expectedSize = sampleData.length + packages;
         validateHierarchicalContainer(container, "com",
                 "org.vaadin.test.LastClass",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
 
     }
@@ -172,7 +172,7 @@ public abstract class AbstractHierarchicalContainerTest extends
         int expectedSize = sampleData.length + packages;
         validateHierarchicalContainer(container, "com",
                 "org.vaadin.test.LastClass",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
 
         sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME },
@@ -181,7 +181,7 @@ public abstract class AbstractHierarchicalContainerTest extends
         validateHierarchicalContainer(container,
                 "com.vaadin.terminal.gwt.server.ApplicationPortlet2",
                 "com.vaadin.data.util.ObjectProperty",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize, 2, true);
 
     }
diff --git a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java b/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
index ebe604ff3a..ff6de50651 100644
--- a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
+++ b/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
@@ -2,9 +2,6 @@ package com.vaadin.data.util;
 
 import java.util.Collection;
 
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.IndexedContainer;
-
 public class TestContainerHierarchicalWrapper extends
         AbstractHierarchicalContainerTest {
 
@@ -34,7 +31,7 @@ public class TestContainerHierarchicalWrapper extends
         int expectedSize = sampleData.length + packages - 1;
 
         validateContainer(container, "com", "com.vaadin.util.SerializerHelper",
-                "com.vaadin.terminal.ApplicationResource", "blah", true,
+                "com.vaadin.server.ApplicationResource", "blah", true,
                 expectedSize);
 
         // rootItemIds
diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
index f0cbfe7a87..d3d7d37690 100644
--- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
+++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
@@ -2,7 +2,6 @@ package com.vaadin.data.util;
 
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
 
 public class TestHierarchicalContainer extends
         AbstractHierarchicalContainerTest {
@@ -58,12 +57,10 @@ public class TestHierarchicalContainer extends
         container.addContainerFilter(FULLY_QUALIFIED_NAME, "ab", false, false);
         Object p1 = container.getParent("com.vaadin.ui.TabSheet");
         assertEquals("com.vaadin.ui", p1);
-        p1 = container
-                .getParent("com.vaadin.client.ui.VPopupCalendar");
+        p1 = container.getParent("com.vaadin.client.ui.VPopupCalendar");
         assertNull(p1);
         container.removeAllContainerFilters();
-        p1 = container
-                .getParent("com.vaadin.client.ui.VPopupCalendar");
+        p1 = container.getParent("com.vaadin.client.ui.VPopupCalendar");
         assertEquals("com.vaadin.client.ui", p1);
 
     }
@@ -110,9 +107,8 @@ public class TestHierarchicalContainer extends
         int expectedRoots = 1;
 
         validateHierarchicalContainer(container, "com",
-                "com.vaadin.ui.TabSheet",
-                "com.vaadin.client.Focusable", "blah", true,
-                expectedSize, expectedRoots, true);
+                "com.vaadin.ui.TabSheet", "com.vaadin.client.Focusable",
+                "blah", true, expectedSize, expectedRoots, true);
 
         // only include .gwt.client classes
         container.removeAllContainerFilters();
@@ -127,8 +123,8 @@ public class TestHierarchicalContainer extends
 
         validateHierarchicalContainer(container, "com",
                 "com.vaadin.client.WidgetSet",
-                "com.vaadin.client.ui.VSplitPanelVertical",
-                "blah", true, expectedSize, expectedRoots, true);
+                "com.vaadin.client.ui.VSplitPanelVertical", "blah", true,
+                expectedSize, expectedRoots, true);
 
         // Additionally remove all without 'm' in the simple name.
         container.addContainerFilter(SIMPLE_NAME, "m", false, false);
@@ -136,12 +132,10 @@ public class TestHierarchicalContainer extends
         expectedSize = 7 + 18;
         expectedRoots = 1;
 
-        validateHierarchicalContainer(
-                container,
-                "com",
+        validateHierarchicalContainer(container, "com",
                 "com.vaadin.client.ui.VUriFragmentUtility",
-                "com.vaadin.client.ui.layout.ChildComponentContainer",
-                "blah", true, expectedSize, expectedRoots, true);
+                "com.vaadin.client.ui.layout.ChildComponentContainer", "blah",
+                true, expectedSize, expectedRoots, true);
 
     }
 
@@ -218,10 +212,10 @@ public class TestHierarchicalContainer extends
         // com.vaadin.client.ui.VTabsheetBase
         // com.vaadin.client.ui.VTabsheetPanel
         // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent
-        // com.vaadin.terminal.Paintable
-        // com.vaadin.terminal.Scrollable
-        // com.vaadin.terminal.Sizeable
-        // com.vaadin.terminal.VariableOwner
+        // com.vaadin.server.Paintable
+        // com.vaadin.server.Scrollable
+        // com.vaadin.server.Sizeable
+        // com.vaadin.server.VariableOwner
         // com.vaadin.ui.Label
         // com.vaadin.ui.Table
         // com.vaadin.ui.TableFieldFactory
@@ -232,9 +226,8 @@ public class TestHierarchicalContainer extends
 
         validateHierarchicalContainer(container,
                 "com.vaadin.data.BufferedValidatable",
-                "com.vaadin.ui.TabSheet",
-                "com.vaadin.client.ui.VTabsheetBase", "blah",
-                true, expectedSize, expectedRoots, false);
+                "com.vaadin.ui.TabSheet", "com.vaadin.client.ui.VTabsheetBase",
+                "blah", true, expectedSize, expectedRoots, false);
 
         // only include .gwt.client classes
         container.removeAllContainerFilters();
@@ -261,11 +254,10 @@ public class TestHierarchicalContainer extends
         expectedSize = 13;
         expectedRoots = expectedSize;
 
-        validateHierarchicalContainer(container,
-                "com.vaadin.client.Paintable",
+        validateHierarchicalContainer(container, "com.vaadin.client.Paintable",
                 "com.vaadin.client.ui.VTabsheetPanel",
-                "com.vaadin.client.ui.VPopupCalendar", "blah",
-                true, expectedSize, expectedRoots, false);
+                "com.vaadin.client.ui.VPopupCalendar", "blah", true,
+                expectedSize, expectedRoots, false);
 
     }
 }
diff --git a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java b/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
index 4f5f0b1431..1c1f9624c8 100644
--- a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
+++ b/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.KeyMapper;
+import com.vaadin.server.KeyMapper;
 
 public class TestKeyMapper extends TestCase {
 
diff --git a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java b/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
index 8231030666..7bb1fd0050 100644
--- a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
+++ b/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.server;
 import junit.framework.TestCase;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.ClassResource;
+import com.vaadin.server.ClassResource;
 import com.vaadin.ui.Embedded;
 
 public class TestMimeTypes 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 5ea4bc52c4..8b35b322cb 100644
--- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
@@ -5,8 +5,8 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.StreamVariable;
-import com.vaadin.terminal.WrappedRequest;
+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 f7ac55b6da..efebc097bf 100644
--- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
+++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
@@ -19,8 +19,8 @@ import junit.framework.TestCase;
 
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
+import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.service.ApplicationContext.TransactionListener;
-import com.vaadin.terminal.DeploymentConfiguration;
 import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext;
 import com.vaadin.terminal.gwt.server.WebApplicationContext;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
index 4458872c79..d76dcffa2f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
+++ b/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.server.component.absolutelayout;
 
 import junit.framework.TestCase;
 
-import com.vaadin.terminal.Sizeable;
-import com.vaadin.terminal.Sizeable.Unit;
+import com.vaadin.server.Sizeable;
+import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index 3a251ecbb9..5dbab8467e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -8,7 +8,7 @@ import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.AbstractProperty;
 import com.vaadin.data.util.converter.Converter.ConversionException;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.UI;
 
diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index 9b4d9492a2..906d6ccebd 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
@@ -11,9 +11,9 @@ import org.easymock.EasyMock;
 import com.vaadin.Application;
 import com.vaadin.Application.ApplicationStartEvent;
 import com.vaadin.UIRequiresMoreInformationException;
-import com.vaadin.terminal.DefaultUIProvider;
-import com.vaadin.terminal.DeploymentConfiguration;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.DefaultUIProvider;
+import com.vaadin.server.DeploymentConfiguration;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.UI;
 
 public class CustomUIClassLoader extends TestCase {
diff --git a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java b/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
index c9ce0ac0a2..265e5382d4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
+++ b/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.server.component.upload;
 
-import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;
+import com.vaadin.server.StreamVariable.StreamingProgressEvent;
 import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.Upload.FailedEvent;
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
index 2a0a733140..0fb0765c9f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.server.WrappedRequest;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index e342ee9005..18ed52cc2a 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
@@ -23,8 +23,8 @@ import org.easymock.IMocksControl;
 
 import com.vaadin.navigator.Navigator;
 import com.vaadin.navigator.Navigator.UriFragmentManager;
-import com.vaadin.terminal.Page;
-import com.vaadin.terminal.Page.FragmentChangedEvent;
+import com.vaadin.server.Page;
+import com.vaadin.server.Page.FragmentChangedEvent;
 
 public class UriFragmentManagerTest extends TestCase {