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

29 files changed, 47 insertions, 47 deletions

diff --git a/build/package/build-widgetset.xml b/build/package/build-widgetset.xml
index 0be10a5b9d..f42b58ff0f 100644
--- a/build/package/build-widgetset.xml
+++ b/build/package/build-widgetset.xml
@@ -143,7 +143,7 @@ See configure target to adjust this buildfile.
         <!-- Create the directory if it does not already exist. -->
         <mkdir dir="${src-location}/${widgetset-path}"/>
         
-        <java classname="com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder"
+        <java classname="com.vaadin.server.widgetsetutils.WidgetSetBuilder"
               failonerror="yes" fork="yes" maxmemory="256m">
             <arg value="${widgetset}"/>
             <jvmarg value="-Xss1024k"/>
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
index 2721f5dcf9..5b9cd399c7 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/AcceptCriteriaFactoryGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.Date;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
index f57a58a557..70120b944d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorBundleLoaderFactory.java b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
index 2e94ba9b64..aa220225c9 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/ConnectorBundleLoaderFactory.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/ConnectorBundleLoaderFactory.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -37,21 +37,21 @@ import com.vaadin.client.metadata.TypeData;
 import com.vaadin.client.metadata.TypeDataBundle;
 import com.vaadin.client.metadata.TypeDataStore;
 import com.vaadin.client.ui.UnknownComponentConnector;
+import com.vaadin.server.widgetsetutils.metadata.ClientRpcVisitor;
+import com.vaadin.server.widgetsetutils.metadata.ConnectorBundle;
+import com.vaadin.server.widgetsetutils.metadata.ConnectorInitVisitor;
+import com.vaadin.server.widgetsetutils.metadata.GeneratedSerializer;
+import com.vaadin.server.widgetsetutils.metadata.Property;
+import com.vaadin.server.widgetsetutils.metadata.ServerRpcVisitor;
+import com.vaadin.server.widgetsetutils.metadata.StateInitVisitor;
+import com.vaadin.server.widgetsetutils.metadata.TypeVisitor;
+import com.vaadin.server.widgetsetutils.metadata.WidgetInitVisitor;
 import com.vaadin.shared.annotations.Delayed;
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.communication.ClientRpc;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ClientRpcVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ConnectorBundle;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ConnectorInitVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.GeneratedSerializer;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.Property;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.ServerRpcVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.StateInitVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.TypeVisitor;
-import com.vaadin.terminal.gwt.widgetsetutils.metadata.WidgetInitVisitor;
 
 public class ConnectorBundleLoaderFactory extends Generator {
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/CustomWidgetMapGenerator.java
index dbe3cd2efc..250bfbb4a1 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/CustomWidgetMapGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/EagerWidgetMapGenerator.java
index 1ce59c6953..568dc939e7 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/EagerWidgetMapGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import com.vaadin.client.ServerConnector;
 import com.vaadin.shared.ui.Connect.LoadStyle;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/LazyWidgetMapGenerator.java
index 2ea276bfcb..9e46b6d9dd 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/LazyWidgetMapGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import com.vaadin.client.ServerConnector;
 import com.vaadin.shared.ui.Connect.LoadStyle;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetMapGenerator.java
index f7fc3cf45a..b90791d61b 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetMapGenerator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -69,7 +69,7 @@ import com.vaadin.shared.ui.Connect.LoadStyle;
  * <pre>
  * <code>
  * &lt;generate-with
- *           class="com.vaadin.terminal.gwt.widgetsetutils.MyWidgetMapGenerator"&gt;
+ *           class="com.vaadin.server.widgetsetutils.MyWidgetMapGenerator"&gt;
  *          &lt;when-type-is class="com.vaadin.client.WidgetMap" /&gt;
  * &lt;/generate-with&gt;
  * 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
index bcfa9990ec..4137662b35 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/WidgetSetBuilder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.terminal.gwt.widgetsetutils;
+package com.vaadin.server.widgetsetutils;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ArraySerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
index 010503c508..4ab5cccb2e 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ArraySerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ArraySerializer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JArrayType;
@@ -23,7 +23,7 @@ import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.client.communication.JsonDecoder;
 import com.vaadin.client.communication.JsonEncoder;
-import com.vaadin.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory;
+import com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory;
 
 public class ArraySerializer extends JsonSerializer {
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ClientRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
index d5a78b86b9..3b78519a0d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ClientRpcVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ClientRpcVisitor.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.util.Set;
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index 9fb08f720e..1d37d12a45 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
index fec337afd9..3e863516a5 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ConnectorInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorInitVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/CustomSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
index 11252c4acb..a0105b4bf3 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/CustomSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/CustomSerializer.java
@@ -14,14 +14,14 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.core.ext.typeinfo.JClassType;
 import com.google.gwt.user.rebind.SourceWriter;
-import com.vaadin.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory;
+import com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory;
 
 public class CustomSerializer implements GeneratedSerializer {
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/EnumSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
index 324b555300..5590e6cd7a 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/EnumSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/EnumSerializer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JEnumConstant;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index c4c2a50e1c..a7896a5bf6 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/GeneratedSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
index 0cfde7748c..8f6c8696fd 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/GeneratedSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/GeneratedSerializer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
index 0beddeae8e..6e521dc763 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/JsonSerializer.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/MethodProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
index 431ead7f96..318519f37d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/MethodProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/MethodProperty.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/Property.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
index 5ef0293688..b55b70784a 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/Property.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/Property.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.lang.annotation.Annotation;
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
index 4c0fc94500..cbcfc3075b 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/ServerRpcVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.util.Set;
 
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/StateInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
index 49cf687412..17ea62b249 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/StateInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/StateInitVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JClassType;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/TypeVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
index cda849f564..7191093755 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/TypeVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/TypeVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/WidgetInitVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
index 9df295c741..fbbabe084d 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/metadata/WidgetInitVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/WidgetInitVisitor.java
@@ -2,7 +2,7 @@
 @VaadinApache2LicenseForJavaFiles@
  */
 
-package com.vaadin.terminal.gwt.widgetsetutils.metadata;
+package com.vaadin.server.widgetsetutils.metadata;
 
 import java.util.Collection;
 
diff --git a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
index 7e06dfc205..4de6847012 100755
--- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
+++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java
@@ -19,7 +19,7 @@ import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder;
+import com.vaadin.server.widgetsetutils.WidgetSetBuilder;
 
 /**
  * A wrapper for the GWT 1.6 compiler that runs the compiler in a new thread.
diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml
index 3e0f47f16d..cb6581f70e 100644
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/com/vaadin/Vaadin.gwt.xml
@@ -35,7 +35,7 @@
 
     <generate-with
         class="
-            com.vaadin.terminal.gwt.widgetsetutils.ConnectorBundleLoaderFactory ">
+            com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory ">
         <when-type-assignable
             class="com.vaadin.client.metadata.ConnectorBundleLoader" />
     </generate-with>
diff --git a/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java b/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
index 2141103a84..dee006805b 100644
--- a/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
+++ b/client/src/com/vaadin/client/ui/dd/VAcceptCriterionFactory.java
@@ -17,7 +17,7 @@ package com.vaadin.client.ui.dd;
 
 /**
  * Generated by
- * {@link com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator}
+ * {@link com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator}
  */
 public abstract class VAcceptCriterionFactory {
 
diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java
index 7756eef890..17171ec843 100644
--- a/shared/src/com/vaadin/shared/ui/Connect.java
+++ b/shared/src/com/vaadin/shared/ui/Connect.java
@@ -46,9 +46,9 @@ public @interface Connect {
      * Depending on the used WidgetMap generator, these optional hints may be
      * used to define how the client side components are loaded by the browser.
      * The default is to eagerly load all widgets
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator},
+     * {@link com.vaadin.server.widgetsetutils.EagerWidgetMapGenerator},
      * but if the
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator} is used
+     * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} is used
      * by the widgetset, these load style hints are respected.
      * <p>
      * Lazy loading of a widget implementation means the client side component
@@ -69,14 +69,14 @@ public @interface Connect {
      * the best of both worlds.
      * <p>
      * Fine tunings to widget loading can also be made by overriding
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator} in the
+     * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} in the
      * GWT module. Tunings might be helpful if the end users have slow
      * connections and especially if they have high latency in their network.
      * The
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator}
+     * {@link com.vaadin.server.widgetsetutils.CustomWidgetMapGenerator}
      * is an abstract generator implementation for easy customization. Vaadin
      * package also includes
-     * {@link com.vaadin.terminal.gwt.widgetsetutils.LazyWidgetMapGenerator}
+     * {@link com.vaadin.server.widgetsetutils.LazyWidgetMapGenerator}
      * that makes as many widgets lazily loaded as possible.
      * 
      * @since 6.4
diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
index ca5c344b2e..b0151a6690 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
+++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
@@ -598,9 +598,9 @@ public abstract class AbstractContainerTest extends TestCase {
             "com.vaadin.server.SystemMessageException",
             "com.vaadin.server.WebApplicationContext",
             "com.vaadin.server.WebBrowser",
-            "com.vaadin.terminal.gwt.widgetsetutils.ClassPathExplorer",
-            "com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator",
-            "com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder",
+            "com.vaadin.server.widgetsetutils.ClassPathExplorer",
+            "com.vaadin.server.widgetsetutils.WidgetMapGenerator",
+            "com.vaadin.server.widgetsetutils.WidgetSetBuilder",
             "com.vaadin.server.KeyMapper", "com.vaadin.server.Paintable",
             "com.vaadin.server.PaintException",
             "com.vaadin.server.PaintTarget",