From 4a4ac77777f9619131d561e39ffa9b32742c0f5c Mon Sep 17 00:00:00 2001
From: Bogdan Udrescu <bogdan@vaadin.com>
Date: Tue, 29 Jul 2014 16:42:10 +0300
Subject: [PATCH] Revert "Fixing problem caused by
 release/7.2.6/39c3ab667db7ab7b2aa9cb4449e4ccad840135b3"

This reverts commit 10b64f824597f85a5c83784a6b82802a4c7521a0.

It also adds the gwt/ivy.xml to make the build work.

Actually the project won't build with the latest GWT if we
don't use the gwt/ivy.xml and the laters build/ide.xml from
Leif's patch.

Change-Id: I3cdd40303d309aa0ebf82bf427c307f96983a75d
---
 build/ide.xml |  9 +++------
 gwt/ivy.xml   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 gwt/ivy.xml

diff --git a/build/ide.xml b/build/ide.xml
index d6e3995373..76f37f9d2e 100755
--- a/build/ide.xml
+++ b/build/ide.xml
@@ -29,22 +29,19 @@
         <ivy:cachepath pathid="uitest.deps" conf="ide" />
         <ivy:resolve log="download-only" file="buildhelpers/ivy.xml" />
         <ivy:cachepath pathid="buildhelpers.deps" />
+        <ivy:resolve log="download-only" file="gwt/ivy.xml" conf="ide" />
+        <ivy:cachepath pathid="gwt.deps" conf="ide" />
 
         <path id="classpath">
             <path location="bin" />
             <path location="build/classes" />
-        	<path location="${gwt.user.classes}" />
-	        <path location="${gwt.user.src}" />
-    	    <path location="${gwt.user.super.src}" />
-        	<path location="${gwt.dev.classes}" />
-	        <path location="${gwt.dev.super.src}" />
-    	    <path location="${gwt.dev.src}" />
             <path refid="client-compiler.deps" />
             <path refid="server.deps" />
             <path refid="shared.deps" />
             <path refid="uitest.deps" />
             <path refid="client.deps" />
             <path refid="buildhelpers.deps" />
+            <path refid="gwt.deps" />
             <path location="server/src" />
             <path location="shared/src" />
             <path location="uitest/src" />
diff --git a/gwt/ivy.xml b/gwt/ivy.xml
new file mode 100644
index 0000000000..52d8acea92
--- /dev/null
+++ b/gwt/ivy.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
+    xmlns:m="http://ant.apache.org/ivy/maven">
+
+    <info organisation="com.vaadin" module="vaadin-gwt"
+        revision="${vaadin.version}" />
+
+    <configurations>
+        <conf name="build" />
+        <conf name="gwt-dev" />
+        <conf name="gwt-user" />
+        <conf name="gwt-codeserver" />
+        <conf name="gwt-elemental" />
+        <conf name="ide" visibility="private" />
+    </configurations>
+    <publications>
+        <artifact type="jar" ext="jar" />
+        <artifact type="source" ext="jar" m:classifier="sources" />
+        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
+        <artifact type="pom" ext="pom" />
+    </publications>
+    <dependencies>
+      <dependency org="com.vaadin.external.gwt" name="gwt-dev" rev="${gwt.version}" conf="gwt-dev,ide->default" />
+      <dependency org="com.vaadin.external.gwt" name="gwt-user" rev="${gwt.version}" conf="gwt-user,ide->default" />
+      <dependency org="com.vaadin.external.gwt" name="gwt-codeserver" rev="${gwt.version}" conf="gwt-codeserver,ide->default" />
+      <dependency org="com.vaadin.external.gwt" name="gwt-elemental" rev="${gwt.version}" conf="gwt-elemental->default" />
+    </dependencies>
+</ivy-module>
-- 
2.39.5