From 0e048a5ba6cf734485fc83cb3b264b8ff104ecb9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 16 Sep 2013 15:49:35 +0300
Subject: Clarified error message (#12583)

Change-Id: I542046158f6e78c8bb26aaee110bd5b123ae13e6
---
 server/src/com/vaadin/ui/UI.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 0746431302..27f04c39e1 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -402,9 +402,12 @@ public abstract class UI extends AbstractSingleComponentContainer implements
      * @see #getSession()
      */
     public void setSession(VaadinSession session) {
-        if ((session == null) == (this.session == null)) {
+        if (session == null && this.session == null) {
             throw new IllegalStateException(
-                    "VaadinServiceSession has already been set. Old session: "
+                    "Session should never be set to null when UI.session is already null");
+        } else if (session != null && this.session != null) {
+            throw new IllegalStateException(
+                    "Session has already been set. Old session: "
                             + getSessionDetails(this.session)
                             + ". New session: " + getSessionDetails(session)
                             + ".");
-- 
cgit v1.2.3


From d0af7d103a94cc7c7817b2fd7cb7cc2ba3bcd519 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 4 Sep 2013 20:07:54 +0300
Subject: Add async-supported to all servlets to enable push testing (#12573)

Change-Id: I8025c7d032f1a76244dbf085e76cb231c1a4459c
---
 WebContent/WEB-INF/web.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index ba948968e2..b93e0670fc 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -24,6 +24,7 @@
             <param-name>application</param-name>
             <param-value>com.vaadin.tests.components.button.Buttons</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
     <servlet>
         <servlet-name>Embed App 2</servlet-name>
@@ -32,6 +33,7 @@
             <param-name>UI</param-name>
             <param-value>com.vaadin.tests.components.label.MarginsInLabels</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
     <servlet>
         <servlet-name>UI provider app</servlet-name>
@@ -44,6 +46,7 @@
             <param-name>UI</param-name>
             <param-value>com.vaadin.tests.VerifyAssertionsEnabled</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
 
     <servlet>
@@ -70,6 +73,7 @@
             <param-name>testParam</param-name>
             <param-value>42</param-value>
         </init-param>
+        <async-supported>true</async-supported>
     </servlet>
 
     <servlet>
-- 
cgit v1.2.3


From 1de438915468e92ad0657ac4f22dc3e1b1580e63 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 4 Sep 2013 15:58:26 +0300
Subject: Use JUnit 4.11 in all modules (#12572)

Change-Id: I244f4afdebe956166a9158d85dc69fd7746c5a47
---
 client/ivy.xml         | 2 +-
 server/ivy.xml         | 2 +-
 theme-compiler/ivy.xml | 2 +-
 uitest/ivy.xml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/ivy.xml b/client/ivy.xml
index 5d079537b9..ccc304be3d 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -32,7 +32,7 @@
         <!-- gwt-user dependencies -->
         <dependency org="org.w3c.css" name="sac" rev="1.3" />
 
-        <dependency org="junit" name="junit" rev="4.5"
+        <dependency org="junit" name="junit" rev="4.11"
             conf="test->default" />
 
         <dependency org="javax.validation" name="validation-api"
diff --git a/server/ivy.xml b/server/ivy.xml
index b78541c52f..ba859b08ee 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -58,7 +58,7 @@
         <!-- TESTING DEPENDENCIES -->
 
         <!-- Test frameworks & related -->
-        <dependency org="junit" name="junit" rev="4.5"
+        <dependency org="junit" name="junit" rev="4.11"
             conf="test,ide -> default" />
         <dependency org="org.easymock" name="easymock" rev="3.0"
             conf="test,ide-> default" transitive="true" />
diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 5bcdbb54cb..7b99b2cdaa 100644
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -40,7 +40,7 @@
             rev="2.4" conf="build-provided->default" />
 
         <!-- Testing libs -->
-        <dependency org="junit" name="junit" rev="4.5"
+        <dependency org="junit" name="junit" rev="4.11"
             conf="ide,test -> default" />
 
         <!-- Internally used, for now -->
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 7ff83324ae..e737165288 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -61,7 +61,7 @@
         <dependency org="org.mortbay.jetty" name="jetty-runner"
             rev="7.5.0.v20110901" conf="jetty-run->default" />
 
-        <dependency org="junit" name="junit" rev="4.5"
+        <dependency org="junit" name="junit" rev="4.11"
             conf="build,ide -> default" />
 
         <dependency org="commons-codec" name="commons-codec"
-- 
cgit v1.2.3


From d6954f86e401566456a64418ae80e2f8853a5e43 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 10 Jun 2013 21:32:57 +0300
Subject: Include TestBench 3.1.1 in the project (#12572)

* Jetty is updated to 8.1.9.v20130131 to avoid conflicts with TestBench dependencies
* The new jetty dependens on servlet 3.0

Change-Id: Ibbbc8f5838feb4c132ee2b6f7d7f3f630e95dd68
---
 ivysettings.xml                                    |  4 +++
 uitest/ivy.xml                                     | 38 ++++++++++++++--------
 .../vaadin/launcher/DevelopmentServerLauncher.java |  8 +++--
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/ivysettings.xml b/ivysettings.xml
index fa08f3d0bb..e18b2233d1 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -11,6 +11,8 @@
     <settings defaultResolver="public" />
     <resolvers>
         <ibiblio name="public" m2compatible="true" />
+        <ibiblio name="vaadin-addons" usepoms="true"
+            m2compatible="true" root="http://maven.vaadin.com/vaadin-addons" />
         <filesystem name="local-maven" m2compatible="true">
             <artifact
                 pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
@@ -23,6 +25,8 @@
         </filesystem>
     </resolvers>
     <modules>
+        <module organisation="com.vaadin" name="vaadin-testbench"
+            resolver="vaadin-addons" />
         <module organisation="com.vaadin" name="vaadin-buildhelpers"
             resolver="build-temp" />
         <module organisation="com.vaadin" name="vaadin-shared"
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index e737165288..d75a591f94 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ivy-module [
+    <!ENTITY jetty.version "8.1.9.v20130131">
+]>
 <ivy-module version="2.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"
@@ -11,7 +14,7 @@
         <conf name="build" />
         <conf name="build-provided" visibility="private" />
         <conf name="ide" visibility="private" />
-        <conf name="jetty-run" extends="build" visibility="private" />
+        <conf name="jetty-run" visibility="private" />
     </configurations>
     <publications>
         <artifact type="war" ext="war" />
@@ -23,9 +26,6 @@
 
         <dependency org="javax.validation" name="validation-api"
             rev="1.0.0.GA" conf="build,ide -> default,sources" />
-        <!-- Servlet API -->
-        <dependency org="javax.servlet" name="servlet-api"
-            rev="2.4" conf="build-provided,ide -> default" />
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
             rev="1.2.1" conf="build-provided,ide -> default" />
@@ -33,7 +33,9 @@
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build->build"></dependency>
+            rev="${vaadin.version}" conf="build->build">
+            <exclude org="javax.servlet"></exclude>
+        </dependency>
         <dependency org="com.vaadin" name="vaadin-client"
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-client-compiled"
@@ -41,25 +43,33 @@
         <dependency org="com.vaadin" name="vaadin-themes"
             rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-push" rev="${vaadin.version}"
-            conf="build->build"></dependency>
+            conf="build->build">
+            <exclude org="javax.servlet"></exclude>
+        </dependency>
 
         <!-- For compiling TestingWidgetSet -->
         <dependency org="com.vaadin" name="vaadin-client-compiler"
             rev="${vaadin.version}" conf="build-provided-> build"></dependency>
 
-        <!-- Newest Jetty does not work with Ivy currently (orbit -> jar 
-            mapping problem) -->
+        <!-- Servlet 3.0 API -->
+        <dependency org="javax.servlet" name="javax.servlet-api"
+            rev="3.0.1" conf="build-provided,ide -> default" />
+
         <dependency org="org.eclipse.jetty" name="jetty-server"
-            rev="7.5.0.v20110901" conf="ide, build-provided, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default">
+            <exclude org="org.eclipse.jetty.orbit"></exclude>
+        </dependency>
         <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
         <dependency org="org.eclipse.jetty" name="jetty-servlets"
-            rev="7.5.0.v20110901" conf="ide, build-provided, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default" />
         <dependency org="org.eclipse.jetty" name="jetty-websocket"
-            rev="7.5.0.v20110901" conf="ide, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, jetty-run->default" />
         <dependency org="org.eclipse.jetty" name="jetty-webapp"
-            rev="7.5.0.v20110901" conf="ide, build-provided, jetty-run->default" />
+            rev="&jetty.version;" conf="ide, build-provided, jetty-run->default" />
         <dependency org="org.mortbay.jetty" name="jetty-runner"
-            rev="7.5.0.v20110901" conf="jetty-run->default" />
+            rev="&jetty.version;" conf="ide, jetty-run->default">
+            <exclude org="org.eclipse.jetty.orbit"></exclude>
+        </dependency>
 
         <dependency org="junit" name="junit" rev="4.11"
             conf="build,ide -> default" />
@@ -71,6 +81,8 @@
         <!-- Mainly for SQLContainer tests -->
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
             conf="build,ide -> default" />
+        <dependency org="com.vaadin" name="vaadin-testbench"
+            rev="3.1.1" conf="build-provided,ide -> default" />
     </dependencies>
 
 </ivy-module>
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 5ab2134cdb..a8d639cbc8 100644
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -24,10 +24,12 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -181,7 +183,8 @@ public class DevelopmentServerLauncher {
             String[] paths = serverArgs.get("slowdown").split(",");
             for (String p : paths) {
                 System.out.println("Slowing down: " + p);
-                webappcontext.addFilter(SlowFilter.class, p, 1);
+                webappcontext.addFilter(SlowFilter.class, p,
+                        EnumSet.of(DispatcherType.REQUEST));
             }
         }
         // --cache=/run/APP/PUBLISHED/*,/other/path/asd.jpg
@@ -190,7 +193,8 @@ public class DevelopmentServerLauncher {
             String[] paths = serverArgs.get("cache").split(",");
             for (String p : paths) {
                 System.out.println("Enabling cache for: " + p);
-                webappcontext.addFilter(CacheFilter.class, p, 1);
+                webappcontext.addFilter(CacheFilter.class, p,
+                        EnumSet.of(DispatcherType.REQUEST));
             }
         }
 
-- 
cgit v1.2.3


From cdb9a49bd542fe28ed29c52b90ee9875e2556f67 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Tue, 10 Sep 2013 15:36:51 +0300
Subject: Enable native scrolling in all iOS versions newer than 5, not just
 iOS 6 (#12324)

Change-Id: I8f9ec7f34aefa5b48fd23f3f000f9455475edefa
---
 WebContent/VAADIN/themes/base/common/common.scss | 8 +++++---
 client/src/com/vaadin/client/BrowserInfo.java    | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index cb3645c9d8..07e244a76f 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -227,11 +227,13 @@ input::-ms-clear {
 	font-size: 0;
 	line-height: normal;
 }
-
-/* Enable kinetic scrolling on iOS 6 */
-.v-ios6.v-webkit & .v-scrollable {
+.v-ios.v-webkit & .v-scrollable {
 	-webkit-overflow-scrolling: touch; 
 }
+/* Disable native scrolling on iOS 5 due to #8792 */
+.v-ios5.v-webkit & .v-scrollable {
+	-webkit-overflow-scrolling: none;
+}
 
 &.v-overlay-container {
 	width: 0;
diff --git a/client/src/com/vaadin/client/BrowserInfo.java b/client/src/com/vaadin/client/BrowserInfo.java
index 5d588f6f8b..84b6f14c34 100644
--- a/client/src/com/vaadin/client/BrowserInfo.java
+++ b/client/src/com/vaadin/client/BrowserInfo.java
@@ -207,8 +207,8 @@ public class BrowserInfo {
             return prefix + OS_ANDROID;
         } else if (browserDetails.isIOS()) {
             String iosClass = prefix + OS_IOS;
-            if (isIOS6()) {
-                iosClass += " " + prefix + OS_IOS + "6";
+            if (getOperatingSystemMajorVersion() == 5) {
+                iosClass += " " + prefix + OS_IOS + "5";
             }
             return iosClass;
         } else if (browserDetails.isWindows()) {
@@ -392,9 +392,9 @@ public class BrowserInfo {
         if (isAndroid() && isWebkit() && getWebkitVersion() >= 534) {
             return false;
         }
-        // iOS 6 Safari supports native scrolling; iOS 5 suffers from #8792
+        // iOS 6+ Safari supports native scrolling; iOS 5 suffers from #8792
         // TODO Should test other iOS browsers
-        if (isIOS6() && isWebkit()) {
+        if (isIOS() && isWebkit() && getOperatingSystemMajorVersion() >= 6) {
             return false;
         }
         return true;
-- 
cgit v1.2.3


From 0e2780a0ad6212a7bee9d204464504c6ed0e41a1 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 16 Sep 2013 14:33:54 +0300
Subject: Ensure string converter is always set

Change-Id: I8c9146975397356e92fded0d0207b56d057ac6c5
---
 .../tests/server/component/abstractfield/AbsFieldValueConversions.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
index 9854296538..a5e825bddb 100644
--- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java
@@ -249,6 +249,7 @@ public class AbsFieldValueConversions extends TestCase {
     @Test
     public void testNullConverter() {
         TextField tf = new TextField("foo");
+        tf.setConverter(new StringToIntegerConverter());
         tf.setPropertyDataSource(new ObjectProperty<Integer>(12));
         tf.setConverter((Converter) null);
         try {
-- 
cgit v1.2.3


From cf796e281ec684c94117725ab27d4089859e0161 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Thu, 19 Sep 2013 14:23:46 +0300
Subject: Add v-iosN classname for all iOS versions instead of just N=6
 (#12324)

Change-Id: Id06cfab1404facd612aa470d82757ae6dfe71641
---
 client/src/com/vaadin/client/BrowserInfo.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/com/vaadin/client/BrowserInfo.java b/client/src/com/vaadin/client/BrowserInfo.java
index 84b6f14c34..273964c889 100644
--- a/client/src/com/vaadin/client/BrowserInfo.java
+++ b/client/src/com/vaadin/client/BrowserInfo.java
@@ -207,10 +207,7 @@ public class BrowserInfo {
             return prefix + OS_ANDROID;
         } else if (browserDetails.isIOS()) {
             String iosClass = prefix + OS_IOS;
-            if (getOperatingSystemMajorVersion() == 5) {
-                iosClass += " " + prefix + OS_IOS + "5";
-            }
-            return iosClass;
+            return iosClass + " " + iosClass + getOperatingSystemMajorVersion();
         } else if (browserDetails.isWindows()) {
             return prefix + OS_WINDOWS;
         } else if (browserDetails.isLinux()) {
-- 
cgit v1.2.3


From 46ac1e6fb9d2ecf27b3946bffdc7d2f83f691924 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 19 Sep 2013 00:18:19 +0300
Subject: Update release notes to more closely be like 7.0.x (#12544)

* Fixed ticket link and removed duplicate link
* Reordered sections to changes in this version comes before changes in old versions
* Updated browser versions

Change-Id: Ib3afc6257c93fe6481103fbb80aa5ebf9d2a5dd5
---
 WebContent/release-notes.html | 54 +++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 387a5121cb..a11e526c3f 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -41,10 +41,10 @@
         <ul>
             <li><a href="#overview">Overview of Vaadin
                     @version@ Release</a></li>
+            <li><a href="#changelog">Change log for Vaadin
+                    @version@</a></li>
             <li><a href="#enhancements">Enhancements in Vaadin
                     @version-minor@</a></li>
-            <li><a href="#changelog">Complete change log for
-                    Vaadin @version@</a></li>
             <li><a href="#limitations">Limitations in
                     @version-minor@</a></li>
             <li><a href="#vaadin">Vaadin Installation</a></li>
@@ -63,11 +63,30 @@
         <h2 id="overview">Overview of Vaadin @version@ Release</h2>
 
         <p>
-            Vaadin @version@ is a maintenance release that includes a number
-            of important bug fixes, as listed in the <a href="#changelog">change
-            log</a> below. You can also view the <a
-                href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+@version@&order=priority">list
-                of the closed issues</a> at the Vaadin developer's site.
+            Vaadin @version@ is a maintenance release that includes a
+            number of important bug fixes, as listed in the <a
+                href="#changelog">change log</a> below.
+        </p>
+
+        <p>
+            For a list of enhancements in the last feature release, see
+            <a href="#enhancements">Enhancements in Vaadin
+                @version-minor@</a> and the <a
+                href="http://vaadin.com/download/release/@version-minor@/@version-minor@.0/release-notes.html">Release
+                Notes for Vaadin @version-minor@.0</a>.
+        </p>
+
+        <h3 id="changelog">Change log for Vaadin @version@</h3>
+
+        <p>This release includes the following closed issues:</p>
+
+        <ul>@release-notes-tickets@
+        </ul>
+
+        <p>
+            You can also view the <a
+                href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+@version@&order=id">list
+                of the closed issues</a> at the Vaadin developer's site. .
         </p>
 
         <h2 id="enhancements">Enhancements in Vaadin
@@ -191,21 +210,6 @@
                 streaming to work.</li>
         </ul>
 
-        <h3 id="changelog">ChangeLog</h3>
-
-        <p>This release includes the following closed issues:</p>
-
-        <ul>@release-notes-tickets@
-        </ul>
-
-        <p>
-            The <a
-                href="http://dev.vaadin.com/query?status=closed&resolution=fixed&milestone=Vaadin+7.1.0.beta1&milestone=Vaadin+7.1.0&order=id">full
-                list of the closed issues</a> can also be found at
-            <tt>dev.vaadin.com</tt>
-            .
-        </p>
-
         <h2 id="vaadin">Vaadin Installation</h2>
 
         <p>
@@ -573,11 +577,11 @@
         </p>
 
         <ul>
-            <li>Mozilla Firefox 18-23</li>
+            <li>Mozilla Firefox 18-24</li>
             <li>Mozilla Firefox 17 ESR</li>
             <li>Internet Explorer 8-10</li>
             <li>Safari 6</li>
-            <li>Opera 12</li>
+            <li>Opera 12,16</li>
             <li>Google Chrome 23-29</li>
         </ul>
 
@@ -587,7 +591,7 @@
         </p>
 
         <ul>
-            <li>iOS 5-6</li>
+            <li>iOS 5-7</li>
             <li>Android 2.3-4</li>
         </ul>
 
-- 
cgit v1.2.3


From d9f204fda6b56429b6dfe2dda0b79203ff2ef99e Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 12 Sep 2013 10:13:12 +0300
Subject: PostLayoutListener javadocs (#12562)

Change-Id: Icdc39630a8d48f87ca4765f4513c9871d49f5d76
---
 .../src/com/vaadin/client/ui/PostLayoutListener.java   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/client/src/com/vaadin/client/ui/PostLayoutListener.java b/client/src/com/vaadin/client/ui/PostLayoutListener.java
index d60360747c..3da2358b0c 100644
--- a/client/src/com/vaadin/client/ui/PostLayoutListener.java
+++ b/client/src/com/vaadin/client/ui/PostLayoutListener.java
@@ -15,6 +15,24 @@
  */
 package com.vaadin.client.ui;
 
+import com.vaadin.client.ComponentConnector;
+import com.vaadin.client.LayoutManager;
+
+/**
+ * Interface implemented by {@link ComponentConnector} implementations that want
+ * to know whenever a layout phase has ended. At the end of each layout phase,
+ * {@link LayoutManager} invokes the {@link #postLayout()} method for all
+ * registered component connectors implementing this interface.
+ * 
+ * @since 7.0
+ * @author Vaadin Ltd
+ */
 public interface PostLayoutListener {
+    /**
+     * Method invoked by {@link LayoutManager} to notify the connector that a
+     * layout phase has ended. This method can be used to finalize internal
+     * layouting, but it is not allowed to change the its own external size or
+     * modify the conditions for any children.
+     */
     public void postLayout();
 }
-- 
cgit v1.2.3


From c7aaa0413f63d938791e760b23fb3f609f285aa0 Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Fri, 20 Sep 2013 15:32:12 +0300
Subject: Don't try to cast a connector to Widget. Fixes #12619

Change-Id: I0fe98ca90ed3969f1af1be60668b4c1c561675eb
---
 .../com/vaadin/client/ui/dd/VTargetInSubtree.java  |  4 +-
 uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html   | 51 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html

diff --git a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
index e9061114aa..c3f56b410d 100644
--- a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
+++ b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java
@@ -32,7 +32,7 @@ final public class VTargetInSubtree extends VAcceptCriterion {
     protected boolean accept(VDragEvent drag, UIDL configuration) {
 
         VTree tree = (VTree) VDragAndDropManager.get().getCurrentDropHandler()
-                .getConnector();
+                .getConnector().getWidget();
         TreeNode treeNode = tree.getNodeByKey((String) drag.getDropDetails()
                 .get("itemIdOver"));
         if (treeNode != null) {
@@ -53,4 +53,4 @@ final public class VTargetInSubtree extends VAcceptCriterion {
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html
new file mode 100644
index 0000000000..844636cb02
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/dd/DnDOnSubtree.html
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link rel="selenium.base" href="http://localhost:8888/"/>
+    <title>DnDOnSubtree</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+    <thead>
+    <tr>
+        <td rowspan="1" colspan="3">New Test</td>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td>open</td>
+        <td>/run/com.vaadin.tests.dd.DDTest8?restartApplication</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>drag</td>
+        <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[3]</td>
+        <td>11,8</td>
+    </tr>
+    <!-- Drop on Bar5, which is a subtree target -->
+    <tr>
+        <td>drop</td>
+        <td>vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[6]</td>
+        <td>34,9</td>
+    </tr>
+    <tr>
+        <td>mouseClick</td>
+        <td>
+            vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/expand
+        </td>
+        <td>10,8</td>
+    </tr>
+    <!-- Assert that the dragged & dropped node is now a child of Bar5 -->
+    <tr>
+        <td>assertElementPresent</td>
+        <td>
+            vaadin=runcomvaadintestsddDDTest8::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VTree[0]#n[5]/n[0]
+        </td>
+        <td></td>
+    </tr>
+    </tbody>
+</table>
+</body>
+</html>
-- 
cgit v1.2.3