summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xclient/src/com/vaadin/DefaultWidgetSet.gwt.xml12
-rw-r--r--client/src/com/vaadin/Vaadin.gwt.xml11
2 files changed, 12 insertions, 11 deletions
diff --git a/client/src/com/vaadin/DefaultWidgetSet.gwt.xml b/client/src/com/vaadin/DefaultWidgetSet.gwt.xml
index 8512d547e3..7694be9de6 100755
--- 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 7387d0f997..19b700ada3 100644
--- 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" />