Move classes common to client and server to com.vaadin.shared.* (#8934)

src/com/vaadin/Vaadin.gwt.xml

@@ -15,6 +15,7 @@
 	<inherits name="com.vaadin.terminal.gwt.VaadinBrowserSpecificOverrides" />
 
 	<source path="terminal/gwt/client" />
+	<source path="shared" />
 
 	<!-- Use own Scheduler implementation to be able to track if commands are 
 		running -->
@@ -49,7 +50,7 @@
 	<generate-with
 		class="com.vaadin.terminal.gwt.widgetsetutils.RpcProxyGenerator">
 		<when-type-assignable
-			class="com.vaadin.terminal.gwt.client.communication.ServerRpc" />
+			class="com.vaadin.shared.communication.ServerRpc" />
 	</generate-with>
 
 	<!-- Generate client side proxies for client to server RPC interfaces -->

src/com/vaadin/event/FieldEvents.java

@@ -7,8 +7,8 @@ package com.vaadin.event;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 
-import com.vaadin.terminal.gwt.client.EventId;
-import com.vaadin.terminal.gwt.client.communication.FieldRpc.FocusAndBlurServerRpc;
+import com.vaadin.shared.EventId;
+import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Component.Event;

src/com/vaadin/event/ItemClickEvent.java

@@ -9,7 +9,7 @@ import java.lang.reflect.Method;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.event.MouseEvents.ClickEvent;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.ui.Component;
 
 /**

src/com/vaadin/event/LayoutEvents.java

@@ -7,8 +7,8 @@ import java.io.Serializable;
 import java.lang.reflect.Method;
 
 import com.vaadin.event.MouseEvents.ClickEvent;
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;

src/com/vaadin/event/MouseEvents.java

@@ -6,7 +6,7 @@ package com.vaadin.event;
 
 import java.lang.reflect.Method;
 
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.Component;
 

src/com/vaadin/terminal/gwt/client/AbstractFieldState.java → src/com/vaadin/shared/AbstractFieldState.java

@@ -1,9 +1,9 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
-import com.vaadin.terminal.gwt.client.ui.TabIndexState;
+import com.vaadin.shared.ui.TabIndexState;
 import com.vaadin.ui.AbstractField;
 
 /**

src/com/vaadin/terminal/gwt/client/ComponentState.java → src/com/vaadin/shared/ComponentState.java

@@ -2,14 +2,14 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.vaadin.terminal.gwt.client.communication.SharedState;
-import com.vaadin.terminal.gwt.client.communication.URLReference;
+import com.vaadin.shared.communication.SharedState;
+import com.vaadin.shared.communication.URLReference;
 import com.vaadin.ui.Component;
 
 /**

src/com/vaadin/terminal/gwt/client/Connector.java → src/com/vaadin/shared/Connector.java

@@ -1,11 +1,12 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.shared.communication.SharedState;
+import com.vaadin.terminal.gwt.client.ServerConnector;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**

src/com/vaadin/terminal/gwt/client/EventId.java → src/com/vaadin/shared/EventId.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
 public interface EventId {
     public static final String BLUR = "blur";

src/com/vaadin/shared/JavaScriptConnectorState.java

@@ -0,0 +1,14 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.shared;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface JavaScriptConnectorState {
+    public Set<String> getCallbackNames();
+
+    public Map<String, Set<String>> getRpcInterfaces();
+}

src/com/vaadin/terminal/gwt/client/JavaScriptExtensionState.java → src/com/vaadin/shared/JavaScriptExtensionState.java

@@ -2,15 +2,14 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper.JavaScriptConnectorState;
-import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.shared.communication.SharedState;
 
 public class JavaScriptExtensionState extends SharedState implements
         JavaScriptConnectorState {

src/com/vaadin/terminal/gwt/client/MouseEventDetails.java → src/com/vaadin/shared/MouseEventDetails.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
 import java.io.Serializable;
 

src/com/vaadin/terminal/gwt/client/VBrowserDetails.java → src/com/vaadin/shared/VBrowserDetails.java

@@ -1,10 +1,11 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client;
+package com.vaadin.shared;
 
 import java.io.Serializable;
 
+import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.server.WebBrowser;
 
 /**

src/com/vaadin/terminal/gwt/client/communication/ClientRpc.java → src/com/vaadin/shared/communication/ClientRpc.java

@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 import java.io.Serializable;
 

src/com/vaadin/terminal/gwt/client/communication/FieldRpc.java → src/com/vaadin/shared/communication/FieldRpc.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 public class FieldRpc {
     public interface FocusServerRpc extends ServerRpc {

src/com/vaadin/terminal/gwt/client/communication/MethodInvocation.java → src/com/vaadin/shared/communication/MethodInvocation.java

@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 import java.io.Serializable;
 import java.util.Arrays;

src/com/vaadin/terminal/gwt/client/communication/ServerRpc.java → src/com/vaadin/shared/communication/ServerRpc.java

@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 import java.io.Serializable;
 

src/com/vaadin/terminal/gwt/client/communication/SharedState.java → src/com/vaadin/shared/communication/SharedState.java

@@ -2,11 +2,11 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.shared.Connector;
 import com.vaadin.terminal.gwt.client.ServerConnector;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 

src/com/vaadin/terminal/gwt/client/communication/URLReference.java → src/com/vaadin/shared/communication/URLReference.java

@@ -1,7 +1,7 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 import java.io.Serializable;
 

src/com/vaadin/terminal/gwt/client/communication/UidlValue.java → src/com/vaadin/shared/communication/UidlValue.java

@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.communication;
+package com.vaadin.shared.communication;
 
 import java.io.Serializable;
 

src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/ExecuteJavaScriptRpc.java → src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java

@@ -2,9 +2,9 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.extensions.javascriptmanager;
+package com.vaadin.shared.extension.javascriptmanager;
 
-import com.vaadin.terminal.gwt.client.communication.ClientRpc;
+import com.vaadin.shared.communication.ClientRpc;
 
 public interface ExecuteJavaScriptRpc extends ClientRpc {
     public void executeJavaScript(String script);

src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerState.java → src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java

@@ -2,12 +2,12 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.extensions.javascriptmanager;
+package com.vaadin.shared.extension.javascriptmanager;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.shared.communication.SharedState;
 
 public class JavaScriptManagerState extends SharedState {
     private Set<String> names = new HashSet<String>();

src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutState.java → src/com/vaadin/shared/ui/AbstractLayoutState.java

@@ -1,9 +1,9 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
+import com.vaadin.shared.ComponentState;
 
 public class AbstractLayoutState extends ComponentState {
     private int marginsBitmask;

src/com/vaadin/terminal/gwt/client/ui/AbstractMediaState.java → src/com/vaadin/shared/ui/AbstractMediaState.java

@@ -1,13 +1,13 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
-import com.vaadin.terminal.gwt.client.communication.URLReference;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.communication.URLReference;
 
 public class AbstractMediaState extends ComponentState {
     private boolean showControls;

src/com/vaadin/terminal/gwt/client/ui/AlignmentInfo.java → src/com/vaadin/shared/ui/AlignmentInfo.java

@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
 public final class AlignmentInfo {
     /** Bitmask values for client server communication */

src/com/vaadin/terminal/gwt/client/ui/ClickRpc.java → src/com/vaadin/shared/ui/ClickRpc.java

@@ -1,10 +1,10 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
 
 public interface ClickRpc extends ServerRpc {
     /**

src/com/vaadin/terminal/gwt/client/ui/Connect.java → src/com/vaadin/shared/ui/Connect.java

@@ -1,14 +1,14 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.shared.Connector;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 import com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator;
 import com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator;

src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentState.java → src/com/vaadin/shared/ui/JavaScriptComponentState.java

@@ -2,15 +2,15 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
-import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper.JavaScriptConnectorState;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.JavaScriptConnectorState;
 
 public class JavaScriptComponentState extends ComponentState implements
         JavaScriptConnectorState {

src/com/vaadin/terminal/gwt/client/ui/LayoutClickRpc.java → src/com/vaadin/shared/ui/LayoutClickRpc.java

@@ -1,11 +1,11 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
 
 public interface LayoutClickRpc extends ServerRpc {
     /**

src/com/vaadin/shared/ui/MediaControl.java

@@ -0,0 +1,24 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.shared.ui;
+
+import com.vaadin.shared.communication.ClientRpc;
+
+/**
+ * Server to client RPC interface for controlling playback of the media.
+ * 
+ * @since 7.0
+ */
+public interface MediaControl extends ClientRpc {
+    /**
+     * Start playing the media.
+     */
+    public void play();
+
+    /**
+     * Pause playback of the media.
+     */
+    public void pause();
+}

src/com/vaadin/terminal/gwt/client/ui/TabIndexState.java → src/com/vaadin/shared/ui/TabIndexState.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
 /**
  * Interface implemented by state classes that support tab indexes.

src/com/vaadin/terminal/gwt/client/ui/VMarginInfo.java → src/com/vaadin/shared/ui/VMarginInfo.java

@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.ui;
+package com.vaadin.shared.ui;
 
 import java.io.Serializable;
 

src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java

@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.absolutelayout;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.LayoutClickRpc;
+
+public interface AbsoluteLayoutServerRpc extends LayoutClickRpc, ServerRpc {
+
+}

src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutState.java → src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java

@@ -1,13 +1,13 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.absolutelayout;
+package com.vaadin.shared.ui.absolutelayout;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class AbsoluteLayoutState extends AbstractLayoutState {
     // Maps each component to a position

src/com/vaadin/terminal/gwt/client/ui/button/ButtonServerRpc.java → src/com/vaadin/shared/ui/button/ButtonServerRpc.java

@@ -1,10 +1,10 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.button;
+package com.vaadin.shared.ui.button;
 
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
 
 /**
  * RPC interface for calls from client to server.

src/com/vaadin/terminal/gwt/client/ui/button/ButtonState.java → src/com/vaadin/shared/ui/button/ButtonState.java

@@ -2,10 +2,10 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.ui.button;
+package com.vaadin.shared.ui.button;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
-import com.vaadin.terminal.gwt.client.ui.TabIndexState;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.ui.TabIndexState;
 import com.vaadin.ui.Button;
 
 /**

src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxServerRpc.java → src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java

@@ -1,10 +1,10 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.checkbox;
+package com.vaadin.shared.ui.checkbox;
 
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
 
 public interface CheckBoxServerRpc extends ServerRpc {
     public void setChecked(boolean checked, MouseEventDetails mouseEventDetails);

src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxState.java → src/com/vaadin/shared/ui/checkbox/CheckBoxState.java

@@ -1,9 +1,9 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.checkbox;
+package com.vaadin.shared.ui.checkbox;
 
-import com.vaadin.terminal.gwt.client.AbstractFieldState;
+import com.vaadin.shared.AbstractFieldState;
 
 public class CheckBoxState extends AbstractFieldState {
     private boolean checked = false;

src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java

@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.csslayout;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.LayoutClickRpc;
+
+public interface CssLayoutServerRpc extends LayoutClickRpc, ServerRpc {
+
+}

src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutState.java → src/com/vaadin/shared/ui/csslayout/CssLayoutState.java

@@ -1,13 +1,13 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.csslayout;
+package com.vaadin.shared.ui.csslayout;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CssLayoutState extends AbstractLayoutState {
     private Map<Connector, String> childCss = new HashMap<Connector, String>();

src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutState.java → src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java

@@ -1,13 +1,13 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.customlayout;
+package com.vaadin.shared.ui.customlayout;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class CustomLayoutState extends AbstractLayoutState {
     Map<Connector, String> childLocations = new HashMap<Connector, String>();

src/com/vaadin/terminal/gwt/client/ui/dd/AcceptCriterion.java → src/com/vaadin/shared/ui/dd/AcceptCriterion.java

@@ -2,13 +2,15 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.shared.ui.dd;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterion;
+
 /**
  * An annotation type used to point the server side counterpart for client side
  * a {@link VAcceptCriterion} class.

src/com/vaadin/shared/ui/dd/DragEventType.java

@@ -0,0 +1,9 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.shared.ui.dd;
+
+public enum DragEventType {
+    ENTER, LEAVE, OVER, DROP
+}

src/com/vaadin/terminal/gwt/client/ui/dd/HorizontalDropLocation.java → src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.shared.ui.dd;
 
 public enum HorizontalDropLocation {
     LEFT, RIGHT, CENTER

src/com/vaadin/terminal/gwt/client/ui/dd/VerticalDropLocation.java → src/com/vaadin/shared/ui/dd/VerticalDropLocation.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.dd;
+package com.vaadin.shared.ui.dd;
 
 public enum VerticalDropLocation {
     TOP, BOTTOM, MIDDLE

src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java

@@ -0,0 +1,10 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.embedded;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.ClickRpc;
+
+public interface EmbeddedServerRpc extends ClickRpc, ServerRpc {
+}

src/com/vaadin/terminal/gwt/client/ui/form/FormState.java → src/com/vaadin/shared/ui/form/FormState.java

@@ -1,10 +1,10 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.form;
+package com.vaadin.shared.ui.form;
 
-import com.vaadin.terminal.gwt.client.AbstractFieldState;
-import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.shared.AbstractFieldState;
+import com.vaadin.shared.Connector;
 
 public class FormState extends AbstractFieldState {
     private Connector layout;

src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java

@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.gridlayout;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.LayoutClickRpc;
+
+public interface GridLayoutServerRpc extends LayoutClickRpc, ServerRpc {
+
+}

src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutState.java → src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java

@@ -1,9 +1,9 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.gridlayout;
+package com.vaadin.shared.ui.gridlayout;
 
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
+import com.vaadin.shared.ui.AbstractLayoutState;
 
 public class GridLayoutState extends AbstractLayoutState {
     private boolean spacing = false;

src/com/vaadin/terminal/gwt/client/ui/label/ContentMode.java → src/com/vaadin/shared/ui/label/ContentMode.java

@@ -1,7 +1,7 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.label;
+package com.vaadin.shared.ui.label;
 
 /**
  * Content modes defining how the client should interpret a Label's value.

src/com/vaadin/terminal/gwt/client/ui/label/LabelState.java → src/com/vaadin/shared/ui/label/LabelState.java

@@ -1,9 +1,9 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.label;
+package com.vaadin.shared.ui.label;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
+import com.vaadin.shared.ComponentState;
 
 public class LabelState extends ComponentState {
     private ContentMode contentMode = ContentMode.TEXT;

src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java

@@ -0,0 +1,12 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.orderedlayout;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.LayoutClickRpc;
+
+public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc,
+        ServerRpc {
+
+}

src/com/vaadin/terminal/gwt/client/ui/orderedlayout/AbstractOrderedLayoutState.java → src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java

@@ -1,14 +1,14 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.orderedlayout;
+package com.vaadin.shared.ui.orderedlayout;
 
 import java.io.Serializable;
 import java.util.HashMap;
 
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.ui.AbstractLayoutState;
-import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.AbstractLayoutState;
+import com.vaadin.shared.ui.AlignmentInfo;
 
 public class AbstractOrderedLayoutState extends AbstractLayoutState {
     private boolean spacing = false;

src/com/vaadin/shared/ui/panel/PanelServerRpc.java

@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.panel;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.ClickRpc;
+
+public interface PanelServerRpc extends ClickRpc, ServerRpc {
+
+}

src/com/vaadin/terminal/gwt/client/ui/panel/PanelState.java → src/com/vaadin/shared/ui/panel/PanelState.java

@@ -1,9 +1,9 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.panel;
+package com.vaadin.shared.ui.panel;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
+import com.vaadin.shared.ComponentState;
 
 public class PanelState extends ComponentState {
     private int tabIndex;

src/com/vaadin/terminal/gwt/client/ui/root/PageClientRpc.java → src/com/vaadin/shared/ui/root/PageClientRpc.java

@@ -2,9 +2,9 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.client.ui.root;
+package com.vaadin.shared.ui.root;
 
-import com.vaadin.terminal.gwt.client.communication.ClientRpc;
+import com.vaadin.shared.communication.ClientRpc;
 
 public interface PageClientRpc extends ClientRpc {
 

src/com/vaadin/shared/ui/root/RootServerRpc.java

@@ -0,0 +1,11 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.root;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.ClickRpc;
+
+public interface RootServerRpc extends ClickRpc, ServerRpc {
+
+}

src/com/vaadin/terminal/gwt/client/ui/root/RootState.java → src/com/vaadin/shared/ui/root/RootState.java

@@ -1,10 +1,10 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.root;
+package com.vaadin.shared.ui.root;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
-import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.Connector;
 
 public class RootState extends ComponentState {
     private Connector content;

src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelRpc.java → src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java

@@ -1,10 +1,10 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.shared.ui.splitpanel;
 
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.communication.ServerRpc;
 
 public interface AbstractSplitPanelRpc extends ServerRpc {
 

src/com/vaadin/terminal/gwt/client/ui/splitpanel/AbstractSplitPanelState.java → src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java

@@ -1,12 +1,12 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.splitpanel;
+package com.vaadin.shared.ui.splitpanel;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.gwt.client.ComponentState;
-import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.Connector;
 
 public class AbstractSplitPanelState extends ComponentState {
 

src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaState.java → src/com/vaadin/shared/ui/textarea/TextAreaState.java

@@ -1,9 +1,9 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.textarea;
+package com.vaadin.shared.ui.textarea;
 
-import com.vaadin.terminal.gwt.client.ui.textfield.AbstractTextFieldState;
+import com.vaadin.shared.ui.textfield.AbstractTextFieldState;
 
 public class TextAreaState extends AbstractTextFieldState {
 

src/com/vaadin/terminal/gwt/client/ui/textfield/AbstractTextFieldState.java → src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java

@@ -1,9 +1,9 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.textfield;
+package com.vaadin.shared.ui.textfield;
 
-import com.vaadin.terminal.gwt.client.AbstractFieldState;
+import com.vaadin.shared.AbstractFieldState;
 
 public class AbstractTextFieldState extends AbstractFieldState {
     /**

src/com/vaadin/terminal/gwt/client/ui/video/VideoState.java → src/com/vaadin/shared/ui/video/VideoState.java

@@ -1,10 +1,10 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.video;
+package com.vaadin.shared.ui.video;
 
-import com.vaadin.terminal.gwt.client.communication.URLReference;
-import com.vaadin.terminal.gwt.client.ui.AbstractMediaState;
+import com.vaadin.shared.communication.URLReference;
+import com.vaadin.shared.ui.AbstractMediaState;
 
 public class VideoState extends AbstractMediaState {
     private URLReference poster;

src/com/vaadin/shared/ui/window/WindowServerRpc.java

@@ -0,0 +1,10 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.window;
+
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.ui.ClickRpc;
+
+public interface WindowServerRpc extends ClickRpc, ServerRpc {
+}

src/com/vaadin/terminal/gwt/client/ui/window/WindowState.java → src/com/vaadin/shared/ui/window/WindowState.java

@@ -1,9 +1,9 @@
 /* 
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.terminal.gwt.client.ui.window;
+package com.vaadin.shared.ui.window;
 
-import com.vaadin.terminal.gwt.client.ui.panel.PanelState;
+import com.vaadin.shared.ui.panel.PanelState;
 
 public class WindowState extends PanelState {
     private boolean modal = false;

src/com/vaadin/terminal/AbstractClientConnector.java

@@ -19,9 +19,9 @@ import java.util.NoSuchElementException;
 import java.util.logging.Logger;
 
 import com.vaadin.Application;
-import com.vaadin.terminal.gwt.client.communication.ClientRpc;
-import com.vaadin.terminal.gwt.client.communication.ServerRpc;
-import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.shared.communication.ClientRpc;
+import com.vaadin.shared.communication.ServerRpc;
+import com.vaadin.shared.communication.SharedState;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 import com.vaadin.terminal.gwt.server.ClientMethodInvocation;
 import com.vaadin.terminal.gwt.server.RpcManager;

src/com/vaadin/terminal/AbstractJavaScriptExtension.java

@@ -4,7 +4,7 @@
 
 package com.vaadin.terminal;
 
-import com.vaadin.terminal.gwt.client.JavaScriptExtensionState;
+import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.ui.JavaScriptCallback;
 
 /**

src/com/vaadin/terminal/JavaScriptCallbackHelper.java

@@ -14,8 +14,8 @@ import java.util.Set;
 
 import com.vaadin.external.json.JSONArray;
 import com.vaadin.external.json.JSONException;
+import com.vaadin.shared.JavaScriptConnectorState;
 import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper;
-import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper.JavaScriptConnectorState;
 import com.vaadin.tools.ReflectTools;
 import com.vaadin.ui.AbstractJavaScriptComponent;
 import com.vaadin.ui.JavaScript.JavaScriptCallbackRpc;

src/com/vaadin/terminal/Page.java

@@ -12,9 +12,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 import com.vaadin.event.EventRouter;
+import com.vaadin.shared.ui.root.PageClientRpc;
 import com.vaadin.terminal.WrappedRequest.BrowserDetails;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
-import com.vaadin.terminal.gwt.client.ui.root.PageClientRpc;
 import com.vaadin.terminal.gwt.client.ui.root.VRoot;
 import com.vaadin.terminal.gwt.server.WebApplicationContext;
 import com.vaadin.terminal.gwt.server.WebBrowser;

src/com/vaadin/terminal/gwt/client/ApplicationConnection.java

@@ -39,19 +39,20 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.communication.MethodInvocation;
+import com.vaadin.shared.communication.SharedState;
+import com.vaadin.shared.communication.UidlValue;
 import com.vaadin.terminal.gwt.client.ApplicationConfiguration.ErrorMessage;
 import com.vaadin.terminal.gwt.client.ResourceLoader.ResourceLoadEvent;
 import com.vaadin.terminal.gwt.client.ResourceLoader.ResourceLoadListener;
 import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
 import com.vaadin.terminal.gwt.client.communication.JsonDecoder;
 import com.vaadin.terminal.gwt.client.communication.JsonEncoder;
-import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.communication.RpcManager;
 import com.vaadin.terminal.gwt.client.communication.SerializerMap;
-import com.vaadin.terminal.gwt.client.communication.SharedState;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.Type;
-import com.vaadin.terminal.gwt.client.communication.UidlValue;
 import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.VContextMenu;

src/com/vaadin/terminal/gwt/client/BrowserInfo.java

@@ -5,6 +5,7 @@
 package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.user.client.ui.RootPanel;
+import com.vaadin.shared.VBrowserDetails;
 
 /**
  * Class used to query information about web browser.

src/com/vaadin/terminal/gwt/client/ComponentConnector.java

@@ -6,6 +6,7 @@ package com.vaadin.terminal.gwt.client;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.shared.ComponentState;
 
 /**
  * An interface used by client-side widgets or paintable parts to receive

src/com/vaadin/terminal/gwt/client/ComponentLocator.java

@@ -12,7 +12,9 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.communication.SharedState;
 import com.vaadin.terminal.gwt.client.ui.SubPartAware;
 import com.vaadin.terminal.gwt.client.ui.gridlayout.VGridLayout;
 import com.vaadin.terminal.gwt.client.ui.orderedlayout.VMeasuringOrderedLayout;

src/com/vaadin/terminal/gwt/client/EventHelper.java

@@ -3,8 +3,8 @@
  */
 package com.vaadin.terminal.gwt.client;
 
-import static com.vaadin.terminal.gwt.client.EventId.BLUR;
-import static com.vaadin.terminal.gwt.client.EventId.FOCUS;
+import static com.vaadin.shared.EventId.BLUR;
+import static com.vaadin.shared.EventId.FOCUS;
 
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;

src/com/vaadin/terminal/gwt/client/JavaScriptConnectorHelper.java

@@ -15,18 +15,13 @@ import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.user.client.Element;
-import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
+import com.vaadin.shared.JavaScriptConnectorState;
+import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 
 public class JavaScriptConnectorHelper {
 
-    public interface JavaScriptConnectorState {
-        public Set<String> getCallbackNames();
-
-        public Map<String, Set<String>> getRpcInterfaces();
-    }
-
     private final ServerConnector connector;
     private final JavaScriptObject nativeState = JavaScriptObject
             .createObject();

src/com/vaadin/terminal/gwt/client/JavaScriptExtension.java

@@ -4,10 +4,11 @@
 
 package com.vaadin.terminal.gwt.client;
 
+import com.vaadin.shared.JavaScriptExtensionState;
+import com.vaadin.shared.ui.Connect;
 import com.vaadin.terminal.AbstractJavaScriptExtension;
 import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
 import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
-import com.vaadin.terminal.gwt.client.ui.Connect;
 
 @Connect(AbstractJavaScriptExtension.class)
 public final class JavaScriptExtension extends AbstractExtensionConnector

src/com/vaadin/terminal/gwt/client/MouseEventDetailsBuilder.java

@@ -6,6 +6,7 @@ package com.vaadin.terminal.gwt.client;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.user.client.Event;
+import com.vaadin.shared.MouseEventDetails;
 
 /**
  * Helper class for constructing a MouseEventDetails object from a

src/com/vaadin/terminal/gwt/client/ServerConnector.java

@@ -8,7 +8,8 @@ import java.util.List;
 
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.web.bindery.event.shared.HandlerRegistration;
-import com.vaadin.terminal.gwt.client.communication.ClientRpc;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 
 /**

src/com/vaadin/terminal/gwt/client/Util.java

@@ -27,8 +27,9 @@ import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
-import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
 public class Util {

src/com/vaadin/terminal/gwt/client/VCaption.java

@@ -8,6 +8,8 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.shared.AbstractFieldState;
+import com.vaadin.shared.ComponentState;
 import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 

src/com/vaadin/terminal/gwt/client/communication/InitializableServerRpc.java

@@ -3,6 +3,7 @@
  */
 package com.vaadin.terminal.gwt.client.communication;
 
+import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.terminal.gwt.client.ServerConnector;
 
 /**

src/com/vaadin/terminal/gwt/client/communication/JsonDecoder.java

@@ -16,8 +16,8 @@ import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.shared.Connector;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 
 /**

src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java

@@ -17,8 +17,9 @@ import com.google.gwt.json.client.JSONNumber;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.communication.UidlValue;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.Connector;
 
 /**
  * Encoder for converting RPC parameters and other values to JSON for transfer

src/com/vaadin/terminal/gwt/client/communication/RpcManager.java

@@ -11,6 +11,8 @@ import java.util.Map;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONString;
+import com.vaadin.shared.communication.ClientRpc;
+import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.ServerConnector;

src/com/vaadin/terminal/gwt/client/communication/RpcMethod.java

@@ -3,6 +3,8 @@
  */
 package com.vaadin.terminal.gwt.client.communication;
 
+import com.vaadin.shared.communication.ClientRpc;
+
 public abstract class RpcMethod {
     private String interfaceName;
     private String methodName;

src/com/vaadin/terminal/gwt/client/communication/RpcProxy.java

@@ -4,6 +4,7 @@
 package com.vaadin.terminal.gwt.client.communication;
 
 import com.google.gwt.core.client.GWT;
+import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.terminal.gwt.client.ServerConnector;
 
 /**

src/com/vaadin/terminal/gwt/client/communication/URLReference_Serializer.java

@@ -6,6 +6,7 @@ package com.vaadin.terminal.gwt.client.communication;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONValue;
+import com.vaadin.shared.communication.URLReference;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 public class URLReference_Serializer implements JSONSerializer<URLReference> {

src/com/vaadin/terminal/gwt/client/extensions/javascriptmanager/JavaScriptManagerConnector.java

@@ -10,10 +10,12 @@ import java.util.Set;
 import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.core.client.JsArray;
 import com.google.gwt.json.client.JSONArray;
-import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
+import com.vaadin.shared.communication.MethodInvocation;
+import com.vaadin.shared.extension.javascriptmanager.ExecuteJavaScriptRpc;
+import com.vaadin.shared.extension.javascriptmanager.JavaScriptManagerState;
+import com.vaadin.shared.ui.Connect;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector;
-import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.ui.JavaScript;
 
 @Connect(JavaScript.class)

src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java

@@ -11,11 +11,12 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.ui.Focusable;
 import com.google.gwt.user.client.ui.HasEnabled;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.TabIndexState;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ComponentState;
-import com.vaadin.terminal.gwt.client.Connector;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.ServerConnector;

src/com/vaadin/terminal/gwt/client/ui/AbstractConnector.java

@@ -13,12 +13,12 @@ import java.util.Map;
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.gwt.event.shared.HandlerManager;
 import com.google.web.bindery.event.shared.HandlerRegistration;
+import com.vaadin.shared.communication.ClientRpc;
+import com.vaadin.shared.communication.SharedState;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ServerConnector;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VConsole;
-import com.vaadin.terminal.gwt.client.communication.ClientRpc;
-import com.vaadin.terminal.gwt.client.communication.SharedState;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 

src/com/vaadin/terminal/gwt/client/ui/AbstractFieldConnector.java

@@ -3,7 +3,7 @@
  */
 package com.vaadin.terminal.gwt.client.ui;
 
-import com.vaadin.terminal.gwt.client.AbstractFieldState;
+import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 
 public abstract class AbstractFieldConnector extends AbstractComponentConnector {

src/com/vaadin/terminal/gwt/client/ui/AbstractLayoutConnector.java

@@ -3,6 +3,8 @@
  */
 package com.vaadin.terminal.gwt.client.ui;
 
+import com.vaadin.shared.ui.AbstractLayoutState;
+
 public abstract class AbstractLayoutConnector extends
         AbstractComponentContainerConnector {
 

src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java

@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.dom.client.NativeEvent;
+import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
 
 public abstract class ClickEventHandler extends AbstractClickEventHandler {

src/com/vaadin/terminal/gwt/client/ui/ConnectorClassBasedFactory.java

@@ -6,7 +6,7 @@ package com.vaadin.terminal.gwt.client.ui;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.shared.Connector;
 
 public abstract class ConnectorClassBasedFactory<T> {
     public interface Creator<T> {

src/com/vaadin/terminal/gwt/client/ui/ConnectorStateFactory.java

@@ -4,8 +4,8 @@
 package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.communication.SharedState;
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.communication.SharedState;
 
 public abstract class ConnectorStateFactory extends
         ConnectorClassBasedFactory<SharedState> {

src/com/vaadin/terminal/gwt/client/ui/JavaScriptComponentConnector.java

@@ -3,6 +3,8 @@
  */
 package com.vaadin.terminal.gwt.client.ui;
 
+import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.JavaScriptComponentState;
 import com.vaadin.terminal.gwt.client.JavaScriptConnectorHelper;
 import com.vaadin.terminal.gwt.client.communication.HasJavaScriptConnectorHelper;
 import com.vaadin.ui.AbstractJavaScriptComponent;

src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java

@@ -5,8 +5,9 @@ package com.vaadin.terminal.gwt.client.ui;
 
 import com.google.gwt.dom.client.NativeEvent;
 import com.google.gwt.user.client.Element;
+import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder;
 
 public abstract class LayoutClickEventHandler extends AbstractClickEventHandler {

src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java

@@ -3,30 +3,14 @@
  */
 package com.vaadin.terminal.gwt.client.ui;
 
+import com.vaadin.shared.communication.URLReference;
+import com.vaadin.shared.ui.AbstractMediaState;
+import com.vaadin.shared.ui.MediaControl;
 import com.vaadin.terminal.gwt.client.Util;
-import com.vaadin.terminal.gwt.client.communication.ClientRpc;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
-import com.vaadin.terminal.gwt.client.communication.URLReference;
 
 public abstract class MediaBaseConnector extends AbstractComponentConnector {
 
-    /**
-     * Server to client RPC interface for controlling playback of the media.
-     * 
-     * @since 7.0
-     */
-    public static interface MediaControl extends ClientRpc {
-        /**
-         * Start playing the media.
-         */
-        public void play();
-
-        /**
-         * Pause playback of the media.
-         */
-        public void pause();
-    }
-
     @Override
     protected void init() {
         super.init();

src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java

@@ -10,6 +10,10 @@ import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.LayoutClickRpc;
+import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc;
+import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutState;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
@@ -18,9 +22,7 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.LayoutClickRpc;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.ui.AbsoluteLayout;