diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-10 20:15:35 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-10 20:21:56 +0300 |
| commit | 37bc9e41db0278f42263452e12a8b3fc87b664ba (patch) | |
| tree | ec48ab05ece102bd43e727da253030dac26475b3 /uitest/vaadin-server.xml | |
| parent | d9becf9523fdd71abb1b93072a76df163b9dd2c0 (diff) | |
| download | vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.tar.gz vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.zip | |
Reformatted using Ant editor (#12040)
Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474
Diffstat (limited to 'uitest/vaadin-server.xml')
| -rw-r--r-- | uitest/vaadin-server.xml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml index 4b32cebe26..f2c3c60959 100644 --- a/uitest/vaadin-server.xml +++ b/uitest/vaadin-server.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> -<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" - name="vaadin-server" default="deploy-and-start" basedir="."> +<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="vaadin-server" default="deploy-and-start" basedir="."> <include file="../common.xml" /> <dirname property="dir" file="${ant.file.vaadin-server}" /> @@ -9,9 +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" - output="${vaadin.basedir}/result/jetty.java.out" - resultproperty="resultCode"> + <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" /> @@ -28,8 +25,7 @@ <target name="wait-for-startup"> <echo>Waiting for Servlet Container to start up.</echo> - <waitfor maxwait="60" maxwaitunit="second" checkevery="5" - checkeveryunit="second" timeoutproperty="server.start.failed"> + <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="server.start.failed"> <http url="http://localhost:8888" /> </waitfor> <fail if="server.start.failed" message="Server startup failed" /> |