Move generators to widget set - they aren't needed by widgets (#15544)

Change-Id: I42f3353dfa9a334cb1bc5966ca50476793b4c076

diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
index 8512d547e30a9f5497cebcc37e8594df0b56c75b..7694be9de6c0655ee4a03fc52d818f7256e3a546 100755 (executable)
--- a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
+++ b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
@@ -10,6 +10,18 @@
 
     <entry-point class="com.vaadin.client.ApplicationConfiguration" />
 
+    <generate-with
+        class="com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator">
+        <when-type-is class="com.vaadin.client.ui.dd.VAcceptCriterionFactory" />
+    </generate-with>
+
+    <generate-with
+        class="com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory">
+        <when-type-assignable
+            class="com.vaadin.client.metadata.ConnectorBundleLoader" />
+    </generate-with>
+
+
     <!-- Since 7.2. Compile all permutations (browser support) into one Javascript 
         file. Speeds up compilation and does not make the Javascript significantly 
         larger. -->

diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml
index 7387d0f997a8a9e7e1f865e7780de70a9872de79..19b700ada3f1510d88591ee9e9d341e590acbae6 100644 (file)
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/com/vaadin/Vaadin.gwt.xml
@@ -26,17 +26,6 @@
         <when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
     </replace-with>
 
-    <generate-with
-        class="com.vaadin.server.widgetsetutils.AcceptCriteriaFactoryGenerator">
-        <when-type-is class="com.vaadin.client.ui.dd.VAcceptCriterionFactory" />
-    </generate-with>
-
-    <generate-with
-        class="com.vaadin.server.widgetsetutils.ConnectorBundleLoaderFactory">
-        <when-type-assignable
-            class="com.vaadin.client.metadata.ConnectorBundleLoader" />
-    </generate-with>
-
     <replace-with
         class="com.vaadin.client.communication.AtmospherePushConnection">
         <when-type-is class="com.vaadin.client.communication.PushConnection" />