diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-05-10 16:53:33 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-05-10 16:53:33 +0300 |
| commit | 42d94768bfacb3d831e125ae33eeb4b9fa1d8a53 (patch) | |
| tree | a09cd9d99d1be99dd6600a90db07fb08d15af28a /uitest/vaadin-server.xml | |
| parent | 762c924a8bf05f57b8af7108d7bb6a9c59dcc6c6 (diff) | |
| parent | 19e27a15ca765de477fbe929a1cb6a7412c523f7 (diff) | |
| download | vaadin-framework-42d94768bfacb3d831e125ae33eeb4b9fa1d8a53.tar.gz vaadin-framework-42d94768bfacb3d831e125ae33eeb4b9fa1d8a53.zip | |
Merge changes from origin/7.0
7d9f544 Test for #11396 (merged from 6.8 branch). Depends on a blur event so cannot be autotested with TB.
1b18807 Remove pre-loader element after pre-loading, fixes #10863
ce9c818 Instead of applying workaround to the root panel, apply it to the sub window content element instead to prevent scrolling of the document when a sub window is removed. #11713 (#10776)
3f5d022 Liferay 6.2 compatibility (#11751)
ffd1c1b Don't ignore child component margins in AbstractOrderedLayout (#11553)
62ae5e1 More verbose output from running Jetty
21d9b67 Add a large number of debug calls to VFilterSelect (disabled by default)
bdb7931 Merge test for #11623 to 7.0.
19e27a1 Move suggestion popup width calculation from connector to VFilterSelect
Change-Id: I2d980126599e55fa5e4f6ec523dca16ba54107b5
Diffstat (limited to 'uitest/vaadin-server.xml')
| -rw-r--r-- | uitest/vaadin-server.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml index e02fab8564..5741d78525 100644 --- a/uitest/vaadin-server.xml +++ b/uitest/vaadin-server.xml @@ -8,7 +8,7 @@ <ivy:resolve file="${dir}/ivy.xml" /> <ivy:cachepath pathid="classpath.jetty" conf="jetty-run" /> - <java classname="org.mortbay.jetty.runner.Runner" fork="yes"> + <java classname="org.mortbay.jetty.runner.Runner" fork="yes" output="${vaadin.basedir}/result/jetty.java.out" resultproperty="resultCode"> <arg value="--port" /> <arg value="8888" /> <arg value="--out" /> @@ -19,6 +19,7 @@ <classpath refid="classpath.jetty" /> <jvmarg value="-ea" /> </java> + <echo message="Jetty process ended with result code ${resultCode}" /> </target> |