Moved classes from com.vaadin to com.vaadin.server (#10145)

Change-Id: Ica48f1d5edbefde0ef8afca0c2774fe122a6c8ad

server/src/com/vaadin/DefaultDeploymentConfiguration.java → server/src/com/vaadin/server/DefaultDeploymentConfiguration.java

@@ -14,13 +14,11 @@
  * the License.
  */
 
-package com.vaadin;
+package com.vaadin.server;
 
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import com.vaadin.server.Constants;
-import com.vaadin.server.DeploymentConfiguration;
 
 /**
  * The default implementation of {@link DeploymentConfiguration} based on a base

server/src/com/vaadin/LegacyApplication.java → server/src/com/vaadin/server/LegacyApplication.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin;
+package com.vaadin.server;
 
 import java.net.URL;
 import java.util.Collection;
@@ -23,10 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.vaadin.server.DefaultErrorListener;
 import com.vaadin.server.Terminal.ErrorEvent;
 import com.vaadin.server.Terminal.ErrorListener;
-import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 

server/src/com/vaadin/server/LegacyApplicationUIProvider.java

@@ -21,7 +21,6 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
 

server/src/com/vaadin/server/LegacyVaadinPortlet.java

@@ -20,7 +20,6 @@ import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequest;
 
-import com.vaadin.LegacyApplication;
 
 public class LegacyVaadinPortlet extends VaadinPortlet {
 

server/src/com/vaadin/server/LegacyVaadinServlet.java

@@ -20,7 +20,6 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
-import com.vaadin.LegacyApplication;
 
 public class LegacyVaadinServlet extends VaadinServlet {
 

server/src/com/vaadin/server/ServletPortletHelper.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.Locale;
 import java.util.Properties;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.shared.ApplicationConstants;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.UI;

server/src/com/vaadin/server/VaadinPortlet.java

@@ -50,7 +50,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.liferay.portal.kernel.util.PortalClassInvoker;
 import com.liferay.portal.kernel.util.PropsUtil;
-import com.vaadin.DefaultDeploymentConfiguration;
 import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.ui.UI;
 import com.vaadin.util.CurrentInstance;

server/src/com/vaadin/server/VaadinService.java

@@ -32,7 +32,6 @@ import javax.portlet.PortletContext;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.event.EventRouter;
 import com.vaadin.shared.ui.ui.UIConstants;

server/src/com/vaadin/server/VaadinServiceSession.java

@@ -36,7 +36,6 @@ import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.annotations.PreserveOnRefresh;
 import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ConverterFactory;

server/src/com/vaadin/server/VaadinServlet.java

@@ -41,7 +41,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.DefaultDeploymentConfiguration;
 import com.vaadin.sass.ScssStylesheet;
 import com.vaadin.server.AbstractCommunicationManager.Callback;
 import com.vaadin.shared.ApplicationConstants;

server/src/com/vaadin/ui/LegacyWindow.java

@@ -7,7 +7,7 @@ package com.vaadin.ui;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Resource;
 import com.vaadin.server.VaadinRequest;
@@ -18,7 +18,7 @@ import com.vaadin.shared.ui.BorderStyle;
 /**
  * Helper class to emulate the main window from Vaadin 6 using UIs. This
  * class should be used in the same way as Window used as a browser level
- * window in Vaadin 6 with {@link com.vaadin.LegacyApplication}
+ * window in Vaadin 6 with {@link com.vaadin.server.LegacyApplication}
  */
 @Deprecated
 public class LegacyWindow extends UI {

server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java

@@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import junit.framework.TestCase;
 
-import com.vaadin.DefaultDeploymentConfiguration;
 
 public class TestAbstractApplicationServletStaticFilesLocation extends TestCase {
 

server/tests/src/com/vaadin/tests/server/component/ui/CustomUIClassLoader.java

@@ -8,7 +8,7 @@ import junit.framework.TestCase;
 
 import org.easymock.EasyMock;
 
-import com.vaadin.DefaultDeploymentConfiguration;
+import com.vaadin.server.DefaultDeploymentConfiguration;
 import com.vaadin.server.DefaultUIProvider;
 import com.vaadin.server.DeploymentConfiguration;
 import com.vaadin.server.UIClassSelectionEvent;

server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java

@@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;

uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java

@@ -29,7 +29,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.LegacyVaadinServlet;
 import com.vaadin.server.ServiceException;
 import com.vaadin.server.SessionInitEvent;

uitest/src/com/vaadin/tests/Components.java

@@ -9,13 +9,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.DefaultItemSorter;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.shared.MouseEventDetails.MouseButton;
 import com.vaadin.shared.ui.label.ContentMode;

uitest/src/com/vaadin/tests/CustomLayoutDemo.java

@@ -43,7 +43,7 @@ import com.vaadin.ui.Tree;
  * @since 4.0.0
  * 
  */
-public class CustomLayoutDemo extends com.vaadin.LegacyApplication implements
+public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication implements
         Listener {
 
     private CustomLayout mainLayout = null;

uitest/src/com/vaadin/tests/LayoutDemo.java

@@ -37,7 +37,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class LayoutDemo extends com.vaadin.LegacyApplication {
+public class LayoutDemo extends com.vaadin.server.LegacyApplication {
 
     /**
      * Initialize Application. Demo components are added to main window.

uitest/src/com/vaadin/tests/ListenerOrder.java

@@ -16,7 +16,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
 
-public class ListenerOrder extends com.vaadin.LegacyApplication implements
+public class ListenerOrder extends com.vaadin.server.LegacyApplication implements
         Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener,
         ValueChangeListener {
 

uitest/src/com/vaadin/tests/ModalWindow.java

@@ -34,7 +34,7 @@ import com.vaadin.ui.Window;
  * @see com.vaadin.ui.Window
  * @see com.vaadin.ui.Label
  */
-public class ModalWindow extends com.vaadin.LegacyApplication implements
+public class ModalWindow extends com.vaadin.server.LegacyApplication implements
         ClickListener {
 
     private Window test;

uitest/src/com/vaadin/tests/NativeWindowing.java

@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/Parameters.java

@@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout;
  * 
  * @since 3.1.1
  */
-public class Parameters extends com.vaadin.LegacyApplication implements
+public class Parameters extends com.vaadin.server.LegacyApplication implements
         RequestHandler {
 
     private final Label context = new Label();

uitest/src/com/vaadin/tests/RandomLayoutStress.java

@@ -42,7 +42,7 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd.
  * 
  */
-public class RandomLayoutStress extends com.vaadin.LegacyApplication {
+public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
 
     private final Random seededRandom = new Random(1);
 

uitest/src/com/vaadin/tests/ScrollbarStressTest.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/TestBench.java

@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.FragmentChangedEvent;
 import com.vaadin.ui.Component;
@@ -51,7 +51,7 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd.
  * 
  */
-public class TestBench extends com.vaadin.LegacyApplication implements
+public class TestBench extends com.vaadin.server.LegacyApplication implements
         Property.ValueChangeListener {
 
     // Add here packages which are used for finding testable classes

uitest/src/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java

@@ -16,7 +16,7 @@
 
 package com.vaadin.tests;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/TestForNativeWindowing.java

@@ -19,7 +19,7 @@ package com.vaadin.tests;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/TestForStyledUpload.java

@@ -26,7 +26,7 @@ import java.io.OutputStream;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.StreamResource;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;

uitest/src/com/vaadin/tests/TestSetVisibleAndCaching.java

@@ -23,7 +23,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class TestSetVisibleAndCaching extends com.vaadin.LegacyApplication {
+public class TestSetVisibleAndCaching extends com.vaadin.server.LegacyApplication {
 
     Panel panelA = new Panel("Panel A");
     Panel panelB = new Panel("Panel B");

uitest/src/com/vaadin/tests/TestSizeableIncomponents.java

@@ -21,10 +21,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.AbstractComponent;

uitest/src/com/vaadin/tests/TestSplitPanel.java

@@ -20,7 +20,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalSplitPanel;
 
-public class TestSplitPanel extends com.vaadin.LegacyApplication {
+public class TestSplitPanel extends com.vaadin.server.LegacyApplication {
 
     VerticalSplitPanel verticalSplit = new VerticalSplitPanel();
 

uitest/src/com/vaadin/tests/TreeFilesystem.java

@@ -37,7 +37,7 @@ import com.vaadin.ui.Tree.ExpandEvent;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystem extends com.vaadin.LegacyApplication implements
+public class TreeFilesystem extends com.vaadin.server.LegacyApplication implements
         Tree.ExpandListener {
 
     // Filesystem explorer panel and it's components

uitest/src/com/vaadin/tests/TreeFilesystemContainer.java

@@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout;
  * @since 4.0.0
  * 
  */
-public class TreeFilesystemContainer extends com.vaadin.LegacyApplication
+public class TreeFilesystemContainer extends com.vaadin.server.LegacyApplication
         implements Listener {
 
     // Filesystem explorer panel and it's components

uitest/src/com/vaadin/tests/UsingObjectsInSelect.java

@@ -27,7 +27,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Select;
 
-public class UsingObjectsInSelect extends com.vaadin.LegacyApplication
+public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication
         implements ValueChangeListener {
 
     private final Select select = new Select();

uitest/src/com/vaadin/tests/appengine/GAESyncTest.java

@@ -1,11 +1,11 @@
 package com.vaadin.tests.appengine;
 
 import com.google.apphosting.api.DeadlineExceededException;
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.server.ClassResource;
 import com.vaadin.server.DownloadStream;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Embedded;

uitest/src/com/vaadin/tests/components/AbstractTestCase.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinServiceSession;
 import com.vaadin.server.WebBrowser;
 

uitest/src/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java

@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.combobox;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Label;

uitest/src/com/vaadin/tests/components/form/UndefinedWideFormWithRelativeWideFooter.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.form;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Form;

uitest/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.loginform;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.LoginForm;
 import com.vaadin.ui.LoginForm.LoginEvent;

uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.orderedlayout;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Embedded;

uitest/src/com/vaadin/tests/components/table/TableFirstRowFlicker.java

@@ -1,8 +1,8 @@
 package com.vaadin.tests.components.table;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.ProgressIndicator;

uitest/src/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.components.textfield;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;

uitest/src/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java

@@ -2,12 +2,12 @@ package com.vaadin.tests.containers.sqlcontainer;
 
 import java.sql.SQLException;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Form;

uitest/src/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.containers.sqlcontainer;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.combobox.FilteringMode;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java

@@ -2,11 +2,11 @@ package com.vaadin.tests.containers.sqlcontainer;
 
 import java.sql.SQLException;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.sqlcontainer.SQLContainer;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
 import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/integration/IntegrationTestApplication.java

@@ -1,10 +1,10 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.server.ClassResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java

@@ -18,9 +18,9 @@ import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 import javax.portlet.WindowState;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.annotations.StyleSheet;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.VaadinPortletSession;
 import com.vaadin.server.VaadinPortletSession.PortletListener;
 import com.vaadin.shared.ui.label.ContentMode;

uitest/src/com/vaadin/tests/integration/LiferayThemeDemo.java

@@ -4,11 +4,11 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Locale;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.Action;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Page;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;

uitest/src/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.integration;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;

uitest/src/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;

uitest/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java

@@ -2,7 +2,7 @@ package com.vaadin.tests.layouts.layouttester;
 
 import java.util.Date;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.SystemError;
 import com.vaadin.server.ThemeResource;

uitest/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.SystemError;
 import com.vaadin.server.ThemeResource;

uitest/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.layouts.layouttester;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.SystemError;
 import com.vaadin.server.ThemeResource;

uitest/src/com/vaadin/tests/themes/ButtonsTest.java

@@ -13,7 +13,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.NativeButton;
 
 @SuppressWarnings("serial")
-public class ButtonsTest extends com.vaadin.LegacyApplication {
+public class ButtonsTest extends com.vaadin.server.LegacyApplication {
 
     final LegacyWindow main = new LegacyWindow("Button states & themes");
 

uitest/src/com/vaadin/tests/tickets/Ticket1225.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Alignment;

uitest/src/com/vaadin/tests/tickets/Ticket1230.java

@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;

uitest/src/com/vaadin/tests/tickets/Ticket124.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/tickets/Ticket1245.java

@@ -11,7 +11,7 @@ import com.vaadin.ui.Tree;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 
-public class Ticket1245 extends com.vaadin.LegacyApplication {
+public class Ticket1245 extends com.vaadin.server.LegacyApplication {
 
     TextField f = new TextField();
 

uitest/src/com/vaadin/tests/tickets/Ticket1365.java

@@ -7,7 +7,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1365 extends com.vaadin.LegacyApplication implements Handler {
+public class Ticket1365 extends com.vaadin.server.LegacyApplication implements Handler {
 
     TextField f = new TextField();
 

uitest/src/com/vaadin/tests/tickets/Ticket1368.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/tickets/Ticket1397.java

@@ -2,8 +2,8 @@ package com.vaadin.tests.tickets;
 
 import java.util.Date;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.InlineDateField;

uitest/src/com/vaadin/tests/tickets/Ticket1435.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/tickets/Ticket1444.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;

uitest/src/com/vaadin/tests/tickets/Ticket1519.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TabSheet;

uitest/src/com/vaadin/tests/tickets/Ticket1572.java

@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1572 extends com.vaadin.LegacyApplication {
+public class Ticket1572 extends com.vaadin.server.LegacyApplication {
 
     private Label state;
     private GridLayout gl;

uitest/src/com/vaadin/tests/tickets/Ticket1581.java

@@ -9,7 +9,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.ProgressIndicator;
 
-public class Ticket1581 extends com.vaadin.LegacyApplication {
+public class Ticket1581 extends com.vaadin.server.LegacyApplication {
 
     private Label time;
     private ProgressIndicator poller;

uitest/src/com/vaadin/tests/tickets/Ticket1589.java

@@ -10,9 +10,9 @@ import java.util.Date;
 
 import javax.imageio.ImageIO;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.DownloadStream;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;

uitest/src/com/vaadin/tests/tickets/Ticket1598.java

@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.MenuBar;

uitest/src/com/vaadin/tests/tickets/Ticket161.java

@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Container;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;

uitest/src/com/vaadin/tests/tickets/Ticket1632.java

@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Item;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/tickets/Ticket1659.java

@@ -1,7 +1,7 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ExternalResource;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/tickets/Ticket1663.java

@@ -4,7 +4,7 @@ import com.vaadin.server.SystemError;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1663 extends com.vaadin.LegacyApplication {
+public class Ticket1663 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1673.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket1673 extends com.vaadin.LegacyApplication {
+public class Ticket1673 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1710.java

@@ -28,7 +28,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1710 extends com.vaadin.LegacyApplication {
+public class Ticket1710 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1737.java

@@ -1,8 +1,8 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.server.ClassResource;
 import com.vaadin.server.DownloadStream;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Label;

uitest/src/com/vaadin/tests/tickets/Ticket1767.java

@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket1767 extends com.vaadin.LegacyApplication {
+public class Ticket1767 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1772.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1772 extends com.vaadin.LegacyApplication {
+public class Ticket1772 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1775.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 
-public class Ticket1775 extends com.vaadin.LegacyApplication {
+public class Ticket1775 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1804.java

@@ -15,7 +15,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.Window;
 
-public class Ticket1804 extends com.vaadin.LegacyApplication {
+public class Ticket1804 extends com.vaadin.server.LegacyApplication {
 
     LinkedList<Select> listOfAllFields = new LinkedList<Select>();
 

uitest/src/com/vaadin/tests/tickets/Ticket1805.java

@@ -10,7 +10,7 @@ import com.vaadin.ui.Layout.MarginHandler;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1805 extends com.vaadin.LegacyApplication {
+public class Ticket1805 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1806.java

@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 
-public class Ticket1806 extends com.vaadin.LegacyApplication {
+public class Ticket1806 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1811.java

@@ -13,7 +13,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
 
-public class Ticket1811 extends com.vaadin.LegacyApplication {
+public class Ticket1811 extends com.vaadin.server.LegacyApplication {
 
     LinkedList<TextField> listOfAllFields = new LinkedList<TextField>();
 

uitest/src/com/vaadin/tests/tickets/Ticket1819.java

@@ -12,7 +12,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Select;
 import com.vaadin.ui.Window;
 
-public class Ticket1819 extends com.vaadin.LegacyApplication {
+public class Ticket1819 extends com.vaadin.server.LegacyApplication {
 
     LinkedList<Select> listOfAllFields = new LinkedList<Select>();
 

uitest/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java

@@ -8,7 +8,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1834PanelScrolling extends com.vaadin.LegacyApplication {
+public class Ticket1834PanelScrolling extends com.vaadin.server.LegacyApplication {
 
     private static final int ROWS = 50;
 

uitest/src/com/vaadin/tests/tickets/Ticket1857.java

@@ -1,10 +1,10 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/tickets/Ticket1868.java

@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1868 extends com.vaadin.LegacyApplication {
+public class Ticket1868 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1869.java

@@ -7,7 +7,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1869 extends com.vaadin.LegacyApplication {
+public class Ticket1869 extends com.vaadin.server.LegacyApplication {
 
     @Override
     public void init() {

uitest/src/com/vaadin/tests/tickets/Ticket1878.java

@@ -4,9 +4,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.Random;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.data.validator.StringLengthValidator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;

uitest/src/com/vaadin/tests/tickets/Ticket1900.java

@@ -1,9 +1,9 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Validator;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 

uitest/src/com/vaadin/tests/tickets/Ticket1904.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;

uitest/src/com/vaadin/tests/tickets/Ticket1916.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.UserError;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;

uitest/src/com/vaadin/tests/tickets/Ticket1919.java

@@ -7,7 +7,7 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 
-public class Ticket1919 extends com.vaadin.LegacyApplication {
+public class Ticket1919 extends com.vaadin.server.LegacyApplication {
 
     private GridLayout lo;
     private boolean on = true;

uitest/src/com/vaadin/tests/tickets/Ticket1921.java

@@ -3,7 +3,7 @@ package com.vaadin.tests.tickets;
 import java.io.IOException;
 import java.util.Map;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.RequestHandler;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinResponse;

uitest/src/com/vaadin/tests/tickets/Ticket1923.java

@@ -5,7 +5,7 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 
-public class Ticket1923 extends com.vaadin.LegacyApplication {
+public class Ticket1923 extends com.vaadin.server.LegacyApplication {
 
     private static final int ROWS = 50;
 

uitest/src/com/vaadin/tests/tickets/Ticket1925.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 
 public class Ticket1925 extends LegacyApplication {

uitest/src/com/vaadin/tests/tickets/Ticket1939.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.LegacyWindow;

uitest/src/com/vaadin/tests/tickets/Ticket1940.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;

uitest/src/com/vaadin/tests/tickets/Ticket1953.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.tickets;
 
-import com.vaadin.LegacyApplication;
+import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;