From e6bdeff520f6cda7eeb787572ff9f79cf00ff8dc Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 29 Jun 2012 19:48:43 +0300
Subject: Separated part of DefaultWidgetSet to com.vaadin.Vaadin (#9078)

---
 src/com/vaadin/Vaadin.gwt.xml                      | 84 ++++++++++++++++++++++
 .../vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml   | 78 +-------------------
 ...efaultWidgetSetBrowserSpecificOverrides.gwt.xml | 53 --------------
 .../gwt/VaadinBrowserSpecificOverrides.gwt.xml     | 53 ++++++++++++++
 4 files changed, 138 insertions(+), 130 deletions(-)
 create mode 100644 src/com/vaadin/Vaadin.gwt.xml
 delete mode 100644 src/com/vaadin/terminal/gwt/DefaultWidgetSetBrowserSpecificOverrides.gwt.xml
 create mode 100644 src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml

(limited to 'src')

diff --git a/src/com/vaadin/Vaadin.gwt.xml b/src/com/vaadin/Vaadin.gwt.xml
new file mode 100644
index 0000000000..d702b07693
--- /dev/null
+++ b/src/com/vaadin/Vaadin.gwt.xml
@@ -0,0 +1,84 @@
+<module>
+	<!-- This GWT module inherits all Vaadin client side functionality modules. 
+		This is the module you want to inherit in your client side project to be 
+		able to use com.vaadin.* classes. -->
+
+	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
+	<!-- WS Compiler: manually edited -->
+
+	<inherits name="com.google.gwt.user.User" />
+
+	<inherits name="com.google.gwt.http.HTTP" />
+
+	<inherits name="com.google.gwt.json.JSON" />
+
+	<inherits name="com.vaadin.terminal.gwt.VaadinBrowserSpecificOverrides" />
+
+	<source path="terminal/gwt/client" />
+
+	<!-- Use own Scheduler implementation to be able to track if commands are 
+		running -->
+	<replace-with class="com.vaadin.terminal.gwt.client.VSchedulerImpl">
+		<when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
+	</replace-with>
+
+	<!-- Generators for serializators for classes used in communication between 
+		server and client -->
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.SerializerMapGenerator">
+		<when-type-is
+			class="com.vaadin.terminal.gwt.client.communication.SerializerMap" />
+	</generate-with>
+
+	<replace-with class="com.vaadin.terminal.gwt.client.VDebugConsole">
+		<when-type-is class="com.vaadin.terminal.gwt.client.Console" />
+	</replace-with>
+
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator">
+		<when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap" />
+	</generate-with>
+
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator">
+		<when-type-is
+			class="com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory" />
+	</generate-with>
+
+	<!-- Generate client side proxies for client to server RPC interfaces -->
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.RpcProxyGenerator">
+		<when-type-assignable
+			class="com.vaadin.terminal.gwt.client.communication.ServerRpc" />
+	</generate-with>
+
+	<!-- Generate client side proxies for client to server RPC interfaces -->
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.RpcProxyCreatorGenerator">
+		<when-type-assignable
+			class="com.vaadin.terminal.gwt.client.communication.RpcProxy.RpcProxyCreator" />
+	</generate-with>
+
+	<!-- Generate client side RPC manager for server to client RPC -->
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.GeneratedRpcMethodProviderGenerator">
+		<when-type-assignable
+			class="com.vaadin.terminal.gwt.client.communication.GeneratedRpcMethodProvider" />
+	</generate-with>
+
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.ConnectorWidgetFactoryGenerator">
+		<when-type-assignable
+			class="com.vaadin.terminal.gwt.client.ui.ConnectorWidgetFactory" />
+	</generate-with>
+
+	<generate-with
+		class="com.vaadin.terminal.gwt.widgetsetutils.ConnectorStateFactoryGenerator">
+		<when-type-assignable
+			class="com.vaadin.terminal.gwt.client.ui.ConnectorStateFactory" />
+	</generate-with>
+
+	<!-- Use the new cross site linker to get a nocache.js without document.write -->
+	<add-linker name="xsiframe" />
+
+</module>
diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index daa5e9f24d..278d92f38f 100644
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -6,84 +6,8 @@
 	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
 	<!-- WS Compiler: manually edited -->
 
-	<inherits name="com.google.gwt.user.User" />
-
-	<inherits name="com.google.gwt.http.HTTP" />
-
-	<inherits name="com.google.gwt.json.JSON" />
-
-	<inherits
-		name="com.vaadin.terminal.gwt.DefaultWidgetSetBrowserSpecificOverrides" />
-
-	<source path="client" />
-
-	<!-- Use own Scheduler implementation to be able to track if commands are 
-		running -->
-	<replace-with class="com.vaadin.terminal.gwt.client.VSchedulerImpl">
-		<when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
-	</replace-with>
-
-
-	<!-- Generators for serializators for classes used in communication between 
-		server and client -->
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.SerializerMapGenerator">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.communication.SerializerMap" />
-	</generate-with>
-
-	<replace-with class="com.vaadin.terminal.gwt.client.VDebugConsole">
-		<when-type-is class="com.vaadin.terminal.gwt.client.Console" />
-	</replace-with>
-
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator">
-		<when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap" />
-	</generate-with>
-
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.AcceptCriteriaFactoryGenerator">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory" />
-	</generate-with>
-
-	<!-- Generate client side proxies for client to server RPC interfaces -->
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.RpcProxyGenerator">
-		<when-type-assignable
-			class="com.vaadin.terminal.gwt.client.communication.ServerRpc" />
-	</generate-with>
-
-	<!-- Generate client side proxies for client to server RPC interfaces -->
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.RpcProxyCreatorGenerator">
-		<when-type-assignable
-			class="com.vaadin.terminal.gwt.client.communication.RpcProxy.RpcProxyCreator" />
-	</generate-with>
-
-	<!-- Generate client side RPC manager for server to client RPC -->
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.GeneratedRpcMethodProviderGenerator">
-		<when-type-assignable
-			class="com.vaadin.terminal.gwt.client.communication.GeneratedRpcMethodProvider" />
-	</generate-with>
-
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.ConnectorWidgetFactoryGenerator">
-		<when-type-assignable
-			class="com.vaadin.terminal.gwt.client.ui.ConnectorWidgetFactory" />
-	</generate-with>
-
-	<generate-with
-		class="com.vaadin.terminal.gwt.widgetsetutils.ConnectorStateFactoryGenerator">
-		<when-type-assignable
-			class="com.vaadin.terminal.gwt.client.ui.ConnectorStateFactory" />
-	</generate-with>
+	<inherits name="com.vaadin.Vaadin" />
 
 	<entry-point class="com.vaadin.terminal.gwt.client.ApplicationConfiguration" />
 
-	<!-- Use the new cross site linker to get a nocache.js without document.write -->
-	<add-linker name="xsiframe" />
-
-
 </module>
diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSetBrowserSpecificOverrides.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSetBrowserSpecificOverrides.gwt.xml
deleted file mode 100644
index b5ab61df64..0000000000
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSetBrowserSpecificOverrides.gwt.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<module>
-	<!-- This GWT module defines the browser specific overrides used by Vaadin -->
-
-	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
-	<!-- WS Compiler: manually edited -->
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with
-		class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy" />
-	</replace-with>
-
-	<replace-with
-		class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategyIE">
-		<when-type-is
-			class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper">
-		<when-type-is class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper" />
-	</replace-with>
-
-	<replace-with class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapperIE">
-		<when-type-is class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Fall through to this rule for everything but IE -->
-	<replace-with class="com.vaadin.terminal.gwt.client.LayoutManager">
-		<when-type-is class="com.vaadin.terminal.gwt.client.LayoutManager" />
-	</replace-with>
-
-	<replace-with class="com.vaadin.terminal.gwt.client.LayoutManagerIE8">
-		<when-type-is class="com.vaadin.terminal.gwt.client.LayoutManager" />
-		<any>
-			<when-property-is name="user.agent" value="ie8" />
-		</any>
-	</replace-with>
-
-	<!-- Workaround for #6682. Remove when fixed in GWT. -->
-	<replace-with class="com.google.gwt.dom.client.VaadinDOMImplSafari">
-		<when-type-is class="com.google.gwt.dom.client.DOMImpl" />
-		<when-property-is name="user.agent" value="safari" />
-	</replace-with>
-
-</module>
diff --git a/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml b/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml
new file mode 100644
index 0000000000..b5ab61df64
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/VaadinBrowserSpecificOverrides.gwt.xml
@@ -0,0 +1,53 @@
+<module>
+	<!-- This GWT module defines the browser specific overrides used by Vaadin -->
+
+	<!-- Hint for WidgetSetBuilder not to automatically update the file -->
+	<!-- WS Compiler: manually edited -->
+
+	<!-- Fall through to this rule for everything but IE -->
+	<replace-with
+		class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy">
+		<when-type-is
+			class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy" />
+	</replace-with>
+
+	<replace-with
+		class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategyIE">
+		<when-type-is
+			class="com.vaadin.terminal.gwt.client.ui.upload.UploadIFrameOnloadStrategy" />
+		<any>
+			<when-property-is name="user.agent" value="ie8" />
+		</any>
+	</replace-with>
+
+	<!-- Fall through to this rule for everything but IE -->
+	<replace-with class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper">
+		<when-type-is class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper" />
+	</replace-with>
+
+	<replace-with class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapperIE">
+		<when-type-is class="com.vaadin.terminal.gwt.client.ui.draganddropwrapper.VDragAndDropWrapper" />
+		<any>
+			<when-property-is name="user.agent" value="ie8" />
+		</any>
+	</replace-with>
+
+	<!-- Fall through to this rule for everything but IE -->
+	<replace-with class="com.vaadin.terminal.gwt.client.LayoutManager">
+		<when-type-is class="com.vaadin.terminal.gwt.client.LayoutManager" />
+	</replace-with>
+
+	<replace-with class="com.vaadin.terminal.gwt.client.LayoutManagerIE8">
+		<when-type-is class="com.vaadin.terminal.gwt.client.LayoutManager" />
+		<any>
+			<when-property-is name="user.agent" value="ie8" />
+		</any>
+	</replace-with>
+
+	<!-- Workaround for #6682. Remove when fixed in GWT. -->
+	<replace-with class="com.google.gwt.dom.client.VaadinDOMImplSafari">
+		<when-type-is class="com.google.gwt.dom.client.DOMImpl" />
+		<when-property-is name="user.agent" value="safari" />
+	</replace-with>
+
+</module>
-- 
cgit v1.2.3