Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474tags/7.1.0
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-all" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib"> | |||
<project name="vaadin-all" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib"> | |||
<description> | |||
Compiles a zip containing all jars + dependencies | |||
</description> | |||
@@ -11,13 +10,11 @@ | |||
<!-- global properties --> | |||
<property name="module.name" value="vaadin-all" /> | |||
<property name="result.dir" value="result" /> | |||
<property name="javadoc.jar" | |||
location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" /> | |||
<property name="javadoc.jar" location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" /> | |||
<property name="temp.dir" location="${result.dir}/temp" /> | |||
<property name="temp.deps.dir" value="${temp.dir}/lib" /> | |||
<property name="javadoc.temp.dir" location="${result.dir}/javadoc-temp" /> | |||
<property name="zip.file" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" /> | |||
<property name="zip.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.zip" /> | |||
<path id="classpath.javadoc"> | |||
<fileset dir="${temp.deps.dir}" includes="*.jar"> | |||
@@ -26,17 +23,14 @@ | |||
<target name="fetch.module.and.dependencies"> | |||
<fail unless="module" message="No 'module' parameter given" /> | |||
<ivy:cachepath pathid="module.and.deps" inline="true" | |||
organisation="com.vaadin" module="vaadin-${module}" | |||
revision="${vaadin.version}" /> | |||
<ivy:cachepath pathid="module.and.deps" inline="true" organisation="com.vaadin" module="vaadin-${module}" revision="${vaadin.version}" /> | |||
<copy todir="${temp.dir}" flatten="true"> | |||
<path refid="module.and.deps" /> | |||
</copy> | |||
</target> | |||
<target name="unzip.to.javadoctemp"> | |||
<property name="file" | |||
location="${temp.dir}/vaadin-${module}-${vaadin.version}.jar" /> | |||
<property name="file" location="${temp.dir}/vaadin-${module}-${vaadin.version}.jar" /> | |||
<unzip src="${file}" dest="${javadoc.temp.dir}" /> | |||
</target> | |||
@@ -45,14 +39,11 @@ | |||
<antcall target="common.filter.webcontent" /> | |||
<!-- Unpack all source files to javadoc.temp.dir --> | |||
<antcontrib:foreach list="${modules.to.publish.to.maven}" | |||
target="unzip.to.javadoctemp" param="module" /> | |||
<antcontrib:foreach list="${modules.to.publish.to.maven}" target="unzip.to.javadoctemp" param="module" /> | |||
<property name="javadoc.dir" location="${result.dir}/javadoc" /> | |||
<property name="title" value="Vaadin ${vaadin.version} API" /> | |||
<javadoc maxmemory="1024m" destdir="${javadoc.dir}" | |||
author="true" version="true" use="true" windowtitle="${title}" | |||
encoding="utf-8"> | |||
<javadoc maxmemory="1024m" destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${title}" encoding="utf-8"> | |||
<packageset dir="${javadoc.temp.dir}"> | |||
<!-- TODO Javadoc throws ClassCastException if this is included | |||
(#9660) --> | |||
@@ -61,11 +52,8 @@ | |||
<doctitle><h1>${title}</h1></doctitle> | |||
<!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> | |||
<bottom>${javadoc.bottom}</bottom> | |||
<link offline="true" | |||
href="http://docs.oracle.com/javase/6/docs/api/" | |||
packagelistLoc="build/javadoc/j2se-1.6.0" /> | |||
<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" | |||
packagelistLoc="build/javadoc/j2ee-1.4" /> | |||
<link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" /> | |||
<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> | |||
<classpath refid="classpath.javadoc" /> | |||
</javadoc> | |||
@@ -80,8 +68,7 @@ | |||
<target name="copy-jars"> | |||
<delete dir="${temp.dir}" /> | |||
<antcontrib:foreach list="${modules.to.publish.to.maven}" | |||
target="fetch.module.and.dependencies" param="module" /> | |||
<antcontrib:foreach list="${modules.to.publish.to.maven}" target="fetch.module.and.dependencies" param="module" /> | |||
<!-- All jars are now in temp.dir. Still need to separate vaadin | |||
and deps --> | |||
<move todir="${temp.deps.dir}"> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin" basedir="." default="package" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin" basedir="." default="package" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<include file="common.xml" as="common" /> | |||
<path id="vaadin.buildhelpers.classpath" location="${vaadin.basedir}/buildhelpers/result/classes" /> | |||
@@ -9,9 +8,7 @@ | |||
<!-- ================================= target: all ================================= --> | |||
<!--<target name="all" description="Compiles all parts of the project" | |||
depends="buildhelpers,theme-compiler,shared,server,client"> --> | |||
<target name="package" | |||
description="Compiles and packages all modules in the project" | |||
depends="buildorder"> | |||
<target name="package" description="Compiles and packages all modules in the project" depends="buildorder"> | |||
<subant buildpathref="build-path" target="publish-local"> | |||
</subant> | |||
</target> | |||
@@ -47,15 +44,13 @@ | |||
<subant buildpathref="build-path" target="test" /> | |||
</target> | |||
<target name="test-all" depends="buildorder"> | |||
<property name="war.file" | |||
location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> | |||
<property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> | |||
<parallel> | |||
<sequential> | |||
<!-- Sleep before running integration tests so testbench | |||
tests have time to compile and start --> | |||
<sleep minutes="4" /> | |||
<ant antfile="uitest/integration_tests.xml" target="integration-test-all" | |||
inheritall="false" inheritrefs="false"> | |||
<ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> | |||
<property name="demo.war" value="${war.file}" /> | |||
</ant> | |||
</sequential> | |||
@@ -70,8 +65,7 @@ | |||
<condition property="java.version.matches"> | |||
<equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" /> | |||
</condition> | |||
<fail unless="java.version.matches" | |||
message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." /> | |||
<fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." /> | |||
<echo>Java version is ${ant.java.version} as required.</echo> | |||
</target> | |||
@@ -1,17 +1,13 @@ | |||
<?xml version="1.0"?> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" | |||
xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" | |||
name="common" basedir="../" default="init-deps"> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="common" basedir="../" default="init-deps"> | |||
<property name="ivy.install.version" value="2.2.0" /> | |||
<property name="ivy.jar.name" value="ivy-${ivy.install.version}.jar" /> | |||
<property name="ivy.jar.dir" value="${user.home}/.ant/lib" /> | |||
<property name="ivy.jar.file" value="${ivy.jar.dir}/${ivy.jar.name}" /> | |||
<target name="init-deps" | |||
description="Configure Ivy dependency management and load common task definitions" | |||
depends="init-taskdefs" unless="deps.initialized"> | |||
<target name="init-deps" description="Configure Ivy dependency management and load common task definitions" depends="init-taskdefs" unless="deps.initialized"> | |||
<property name="deps.initialized" value="1" /> | |||
</target> | |||
@@ -23,26 +19,20 @@ | |||
<target name="ivy-download" unless="ivy.installed"> | |||
<mkdir dir="${ivy.jar.dir}" /> | |||
<get | |||
src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" | |||
dest="${ivy.jar.file}" usetimestamp="true" /> | |||
<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" /> | |||
</target> | |||
<target name="ivy-configure" depends="check-ivy-installed" | |||
unless="deps.initialized"> | |||
<target name="ivy-configure" depends="check-ivy-installed" unless="deps.initialized"> | |||
<!-- Ivy task definitions --> | |||
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" | |||
classpath="${ivy.jar.file}" /> | |||
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" /> | |||
<!-- Ivy settings --> | |||
<property name="ivy.settings.file" | |||
value="${project.root}/build/ivy/ivysettings.xml" /> | |||
<property name="ivy.settings.file" value="${project.root}/build/ivy/ivysettings.xml" /> | |||
<ivy:configure /> | |||
</target> | |||
<target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized"> | |||
<echo>Loading Ant tasks</echo> | |||
<ivy:resolve file="${project.root}/build/ivy/ivy.xml" | |||
conf="taskdefs" /> | |||
<ivy:resolve file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" /> | |||
<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> | |||
<taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" /> | |||
@@ -50,16 +40,13 @@ | |||
override) --> | |||
<!-- Note that we have to use a namespace to avoid clash when running | |||
sub-ant. --> | |||
<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" | |||
classpathref="taskdefs.classpath" /> | |||
<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> | |||
<!-- ant contrib for Maven integration --> | |||
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" | |||
uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> | |||
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> | |||
<!-- jarjar --> | |||
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" | |||
classpathref="taskdefs.classpath" /> | |||
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="taskdefs.classpath" /> | |||
</target> | |||
@@ -1,9 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" | |||
xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" | |||
name="Build script for IDE users" basedir=".." | |||
default="theme-and-default-widgetset"> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="Build script for IDE users" basedir=".." default="theme-and-default-widgetset"> | |||
<include file="${basedir}/gwt-files.xml" /> | |||
<property name="gwt.dev.classes" location="${gwt.eclipse.basedir}/dev/bin" /> | |||
@@ -73,8 +70,7 @@ | |||
</target> | |||
<target name="compile-theme"> | |||
<java classname="com.vaadin.buildhelpers.CompileTheme" | |||
failonerror="yes" fork="yes"> | |||
<java classname="com.vaadin.buildhelpers.CompileTheme" failonerror="yes" fork="yes"> | |||
<classpath refid="classpath" /> | |||
<jvmarg value="-Djava.awt.headless=true" /> | |||
<arg value="--theme" /> | |||
@@ -94,8 +90,7 @@ | |||
<target name="testing-widgetset"> | |||
<antcall target="compile-widgetset"> | |||
<param name="widgetset" | |||
value="com.vaadin.tests.widgetset.TestingWidgetSet" /> | |||
<param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" /> | |||
</antcall> | |||
</target> | |||
@@ -116,8 +111,7 @@ | |||
revision="1.0.0.GA"/> --> | |||
<!-- compile the module --> | |||
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath" | |||
failonerror="yes" fork="yes" maxmemory="512m"> | |||
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m"> | |||
<arg value="-workDir" /> | |||
<arg value="${work.dir}" /> | |||
<arg value="-logLevel" /> | |||
@@ -144,12 +138,9 @@ | |||
<target name="vaadinPush.js"> | |||
<property name="vaadinPush.js.output" location="WebContent/VAADIN/vaadinPush.js" /> | |||
<loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js" | |||
property="jquery.js.contents" /> | |||
<loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js" | |||
property="jquery.atmosphere.js.contents" /> | |||
<loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl" | |||
property="vaadinPush.js.contents"> | |||
<loadfile srcfile="WebContent/VAADIN/jquery-1.7.2.js" property="jquery.js.contents" /> | |||
<loadfile srcfile="WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> | |||
<loadfile srcfile="WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> | |||
<filterchain> | |||
<replacetokens begintoken="@" endtoken="@"> | |||
<token key="jquery.js" value="${jquery.js.contents}" /> |
@@ -2,7 +2,8 @@ | |||
<project name="vaadin-buildhelpers" basedir="." default="publish-local"> | |||
<description> | |||
Compiles build helpers used when building other modules. | |||
Compiles build helpers used when building other | |||
modules. | |||
</description> | |||
<include file="../build.xml" as="vaadin" /> | |||
<include file="../common.xml" as="common" /> | |||
@@ -38,8 +39,7 @@ | |||
<target name="fetch-release-notes-tickets"> | |||
<antcall target="common.exec-buildhelper"> | |||
<param name="main.class" | |||
value="com.vaadin.buildhelpers.FetchReleaseNotesTickets" /> | |||
<param name="main.class" value="com.vaadin.buildhelpers.FetchReleaseNotesTickets" /> | |||
<param name="output" value="${output}" /> | |||
</antcall> | |||
</target> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-client-compiled" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-client-compiled" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Compiled (JS+HTML) version of client side | |||
</description> | |||
@@ -17,10 +16,8 @@ | |||
<property name="gwtar.dir" location="${result.dir}/gwtar" /> | |||
<property name="work.dir" location="${result.dir}/work" /> | |||
<property name="module.output.dir" location="${result.dir}/VAADIN/widgetsets" /> | |||
<property name="compiled.jar" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> | |||
<property name="compiled-cache.jar" | |||
location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" /> | |||
<property name="compiled.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> | |||
<property name="compiled-cache.jar" location="${result.dir}/lib/${module.name}-cache-${vaadin.version}.jar" /> | |||
<union id="jar.includes"> | |||
<fileset dir="${result.dir}"> | |||
@@ -42,17 +39,13 @@ | |||
<target name="compile-module-cache"> | |||
<fail unless="module" | |||
message="You must give the module to compile in the 'module' parameter" /> | |||
<fail unless="module" message="You must give the module to compile in the 'module' parameter" /> | |||
<ivy:resolve resolveid="common" conf="compile-module" /> | |||
<ivy:cachepath pathid="classpath.compile.widgetset" | |||
conf="compile-module" /> | |||
<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" /> | |||
<echo>Creating gwtar files for ${module} in ${gwtar.dir}</echo> | |||
<!-- Produce gwtar files for the separate JAR --> | |||
<java classname="com.google.gwt.dev.CompileModule" | |||
classpathref="classpath.compile.widgetset" failonerror="yes" | |||
fork="yes" maxmemory="512m"> | |||
<java classname="com.google.gwt.dev.CompileModule" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m"> | |||
<arg value="-out" /> | |||
<arg value="${gwtar.dir}" /> | |||
<arg value="-strict" /> | |||
@@ -65,23 +58,20 @@ | |||
</target> | |||
<target name="compile-module"> | |||
<fail unless="module" | |||
message="You must give the module to compile in the 'module' parameter" /> | |||
<fail unless="module" message="You must give the module to compile in the 'module' parameter" /> | |||
<property name="style" value="OBF" /> | |||
<property name="localWorkers" value="2" /> | |||
<property name="extraParams" value="" /> | |||
<ivy:resolve resolveid="common" conf="compile-module" /> | |||
<ivy:cachepath pathid="classpath.compile.widgetset" | |||
conf="compile-module" /> | |||
<ivy:cachepath pathid="classpath.compile.widgetset" conf="compile-module" /> | |||
<mkdir dir="${module.output.dir}" /> | |||
<echo>Compiling ${module} to ${module.output.dir}</echo> | |||
<!-- compile the module --> | |||
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset" | |||
failonerror="yes" fork="yes" maxmemory="512m"> | |||
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.widgetset" failonerror="yes" fork="yes" maxmemory="512m"> | |||
<classpath location="${compiled-cache.jar}" /> | |||
<arg value="-workDir" /> | |||
<arg value="${work.dir}" /> |
@@ -1,9 +1,9 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-client-compiler" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-client-compiler" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Compiles build helpers used when building other modules. | |||
Compiles build helpers used when building other | |||
modules. | |||
</description> | |||
<include file="../common.xml" as="common" /> | |||
<include file="../build.xml" as="vaadin" /> | |||
@@ -26,8 +26,7 @@ | |||
<target name="jar"> | |||
<!-- Get Git revision --> | |||
<exec executable="git" outputproperty="git.revision" | |||
failifexecutionfails="false" errorproperty=""> | |||
<exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty=""> | |||
<arg value="describe" /> | |||
<arg value="--tags" /> | |||
<arg value="--always" /> |
@@ -1,9 +1,9 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-client" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-client" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Compiles build helpers used when building other modules. | |||
Compiles build helpers used when building other | |||
modules. | |||
</description> | |||
<include file="../common.xml" as="common" /> | |||
<include file="../build.xml" as="vaadin" /> | |||
@@ -22,25 +22,21 @@ | |||
<path id="classpath.test.custom" /> | |||
<target name="jar"> | |||
<property name="jar.file" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> | |||
<property name="jar.file" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> | |||
<antcall target="common.jar"> | |||
<reference refid="client.gwt.includes" torefid="extra.jar.includes" /> | |||
</antcall> | |||
<jar destfile="${jar.file}" update="true"> | |||
<manifest> | |||
<attribute name="Vaadin-Package-Version" | |||
value="1" /> | |||
<attribute name="Vaadin-Package-Version" value="1" /> | |||
<attribute name="Vaadin-Widgetsets" value="com.vaadin.DefaultWidgetSet" /> | |||
</manifest> | |||
</jar> | |||
<!-- Hack to add validation dependency with source classifier --> | |||
<property name="pom.xml" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> | |||
<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> | |||
<copy file="${pom.xml}" tofile="${temp.pom}"> | |||
<filterchain> | |||
<replacestring from=" </dependencies>" | |||
to=" <dependency> | |||
<replacestring from=" </dependencies>" to=" <dependency> | |||
<groupId>javax.validation</groupId> | |||
<artifactId>validation-api</artifactId> | |||
<version>1.0.0.GA</version> |
@@ -1,7 +1,5 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<project name="common" basedir="." default="" | |||
xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" | |||
xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> | |||
<project name="common" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> | |||
<tstamp> | |||
<format property="build.date" pattern="yyyy-MM-dd" /> | |||
@@ -11,50 +9,35 @@ | |||
<property name="gwt.basedir" location="${vaadin.basedir}/../gwt" /> | |||
<property file="${vaadin.basedir}/build.properties" /> | |||
<property name="modules.to.publish.to.maven" | |||
value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes,push" /> | |||
<property name="modules.to.publish.to.maven" value="shared,server,client,client-compiler,client-compiled,theme-compiler,themes,push" /> | |||
<property name="modules.to.publish.to.download" value="${modules.to.publish.to.maven},all" /> | |||
<ivy:settings file="${vaadin.basedir}/ivysettings.xml" /> | |||
<ivy:settings file="${vaadin.basedir}/ivysettings.xml" | |||
id="ivysettings" /> | |||
<ivy:resolve file="${vaadin.basedir}/ivy-taskdefs.xml" | |||
conf="taskdefs" log="quiet" /> | |||
<ivy:settings file="${vaadin.basedir}/ivysettings.xml" id="ivysettings" /> | |||
<ivy:resolve file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" log="quiet" /> | |||
<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> | |||
<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" | |||
classpathref="taskdefs.classpath" /> | |||
<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> | |||
<!-- ant contrib for Maven integration --> | |||
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" | |||
uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> | |||
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> | |||
<!-- FIXME These are not available in other files --> | |||
<antcontrib:propertyregex property="vaadin.version.major" | |||
input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" | |||
select="\1" /> | |||
<antcontrib:propertyregex property="vaadin.version.minor" | |||
input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" | |||
select="\2" /> | |||
<antcontrib:propertyregex property="vaadin.version.revision" | |||
input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" | |||
select="\3" /> | |||
<antcontrib:propertyregex property="vaadin.version.major" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\1" /> | |||
<antcontrib:propertyregex property="vaadin.version.minor" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\2" /> | |||
<antcontrib:propertyregex property="vaadin.version.revision" input="${vaadin.version}" regexp="([^\.]*)\.([^\.]*)\.([^\.]*)" select="\3" /> | |||
<filterset begintoken="@" endtoken="@" id="filter-vaadin.version"> | |||
<filter token="version" value="${vaadin.version}" /> | |||
<filter token="version" value="${vaadin.version}" /> | |||
</filterset> | |||
<union id="empty.reference" /> | |||
<property name="filtered.webcontent.dir" | |||
location="${vaadin.basedir}/result/filteredWebContent" /> | |||
<property name="release-notes-tickets-file" | |||
location="${vaadin.basedir}/result/release-notes-tickets.html" /> | |||
<property name="filtered.webcontent.dir" location="${vaadin.basedir}/result/filteredWebContent" /> | |||
<property name="release-notes-tickets-file" location="${vaadin.basedir}/result/release-notes-tickets.html" /> | |||
<target name="filter.webcontent" unless="webcontent.filtered" | |||
depends="fetch-release-notes-tickets"> | |||
<target name="filter.webcontent" unless="webcontent.filtered" depends="fetch-release-notes-tickets"> | |||
<property name="webcontent.filtered" value="true" /> | |||
<!-- Running without build.release-notes will cause an error, which | |||
is ignored --> | |||
<loadfile property="release-notes-tickets" srcFile="${release-notes-tickets-file}" | |||
failonerror="false" /> | |||
<loadfile property="release-notes-tickets" srcFile="${release-notes-tickets-file}" failonerror="false" /> | |||
<delete dir="${filtered.webcontent.dir}" /> | |||
<copy todir="${filtered.webcontent.dir}"> | |||
@@ -77,8 +60,7 @@ | |||
<token key="version" value="${vaadin.version}" /> | |||
</replacetokens> | |||
<replacetokens begintoken="@" endtoken="@"> | |||
<token key="version-minor" | |||
value="${vaadin.version.major}.${vaadin.version.minor}" /> | |||
<token key="version-minor" value="${vaadin.version.major}.${vaadin.version.minor}" /> | |||
</replacetokens> | |||
<replacetokens begintoken="@" endtoken="@"> | |||
<token key="builddate" value="${build.date}" /> | |||
@@ -90,12 +72,9 @@ | |||
</copy> | |||
</target> | |||
<target name="fetch-release-notes-tickets" unless="built.release-notes" | |||
if="build.release-notes"> | |||
<target name="fetch-release-notes-tickets" unless="built.release-notes" if="build.release-notes"> | |||
<mkdir dir="${vaadin.basedir}/result" /> | |||
<subant buildpath="${vaadin.basedir}/buildhelpers" | |||
target="fetch-release-notes-tickets" antfile="build.xml" | |||
inheritall="true"> | |||
<subant buildpath="${vaadin.basedir}/buildhelpers" target="fetch-release-notes-tickets" antfile="build.xml" inheritall="true"> | |||
<property name="output" location="${release-notes-tickets-file}" /> | |||
</subant> | |||
<property name="built.release-notes" value="1" /> | |||
@@ -112,21 +91,17 @@ | |||
</fileset> | |||
<target name="pom.xml" | |||
description="Generates a pom.xml based on the Ivy configuration. Either for a snapshot or a release version" | |||
depends="pom.xml.release,pom.xml.snapshot"> | |||
<target name="pom.xml" description="Generates a pom.xml based on the Ivy configuration. Either for a snapshot or a release version" depends="pom.xml.release,pom.xml.snapshot"> | |||
</target> | |||
<target name="pom.xml.release" if="build.release"> | |||
<fail unless="result.dir" message="No result.dir parameter given" /> | |||
<property name="ivy.xml" location="${result.dir}/../ivy.xml" /> | |||
<property name="pom.xml" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> | |||
<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> | |||
<property name="conf" value="build, build-provided" /> | |||
<property name="vaadin.maven.version" value="${vaadin.version}" /> | |||
<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" | |||
ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}"> | |||
<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="${conf}"> | |||
<mapping conf="build" scope="compile" /> | |||
<mapping conf="build-provided" scope="provided" /> | |||
</ivy:makepom> | |||
@@ -135,22 +110,18 @@ | |||
<target name="pom.xml.snapshot" unless="build.release"> | |||
<fail unless="result.dir" message="No result.dir parameter given" /> | |||
<property name="ivy.xml" location="${result.dir}/../ivy.xml" /> | |||
<property name="pom.xml" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> | |||
<property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" /> | |||
<property name="temp.pom.xml" location="${pom.xml}.temp" /> | |||
<property name="conf" value="build, build-provided" /> | |||
<property name="vaadin.maven.version" | |||
value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" /> | |||
<property name="vaadin.maven.version" value="${vaadin.version.major}.${vaadin.version.minor}-SNAPSHOT" /> | |||
<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" | |||
ivyfile="${ivy.xml}" pomfile="${temp.pom.xml}" conf="${conf}"> | |||
<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${temp.pom.xml}" conf="${conf}"> | |||
<mapping conf="build" scope="compile" /> | |||
<mapping conf="build-provided" scope="provided" /> | |||
</ivy:makepom> | |||
<copy file="${temp.pom.xml}" tofile="${pom.xml}"> | |||
<filterchain> | |||
<replacestring from="${vaadin.version}" | |||
to="${vaadin.maven.version}" /> | |||
<replacestring from="${vaadin.version}" to="${vaadin.maven.version}" /> | |||
</filterchain> | |||
</copy> | |||
<delete file="${temp.pom.xml}" /> | |||
@@ -162,8 +133,7 @@ | |||
<fail unless="module.name" message="No module.name parameter given" /> | |||
<fail unless="src" message="No src directory parameter given" /> | |||
<property name="sources.jar" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}-sources.jar" /> | |||
<property name="sources.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-sources.jar" /> | |||
<jar file="${sources.jar}" compress="true"> | |||
<fileset dir="${src}"> | |||
@@ -185,20 +155,15 @@ | |||
<fail unless="module.name" message="No module.name parameter given" /> | |||
<property name="src" location="{$result.dir}/../src" /> | |||
<property name="javadoc.dir" value="${result.dir}/javadoc" /> | |||
<property name="javadoc.jar" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" /> | |||
<property name="javadoc.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" /> | |||
<javadoc destdir="${javadoc.dir}" author="true" version="true" | |||
use="true" windowtitle="${module.name}"> | |||
<javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}"> | |||
<packageset dir="${src}" excludes="${classes.exclude}" /> | |||
<doctitle><h1>${module.name}</h1></doctitle> | |||
<!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> | |||
<bottom>${javadoc.bottom}</bottom> | |||
<link offline="true" | |||
href="http://docs.oracle.com/javase/6/docs/api/" | |||
packagelistLoc="build/javadoc/j2se-1.6.0" /> | |||
<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" | |||
packagelistLoc="build/javadoc/j2ee-1.4" /> | |||
<link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" /> | |||
<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> | |||
<classpath refid="classpath.compile.dependencies" /> | |||
</javadoc> | |||
@@ -214,16 +179,13 @@ | |||
<fail unless="result.dir" message="No result.dir parameter given" /> | |||
<fail unless="module.name" message="No module.name parameter given" /> | |||
<property name="result.jar" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> | |||
<property name="result.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}.jar" /> | |||
<property name="classes" location="{$result.dir}/classes" /> | |||
<property name="src" location="{$result.dir}/../src" /> | |||
<union id="jar.files"> | |||
<fileset dir="${classes}" excludes="${classes.exclude}" | |||
erroronmissingdir="false" /> | |||
<fileset dir="${src}" excludes="${jar.exclude}" | |||
erroronmissingdir="false" /> | |||
<fileset dir="${classes}" excludes="${classes.exclude}" erroronmissingdir="false" /> | |||
<fileset dir="${src}" excludes="${jar.exclude}" erroronmissingdir="false" /> | |||
<fileset refid="common.files.for.all.jars" /> | |||
<union refid="extra.jar.includes" /> | |||
</union> | |||
@@ -232,8 +194,7 @@ | |||
<manifest> | |||
<attribute name="Implementation-Vendor" value="${vaadin.vendor}" /> | |||
<attribute name="Implementation-URL" value="${vaadin.url}" /> | |||
<attribute name="Implementation-Version" | |||
value="${vaadin.version}" /> | |||
<attribute name="Implementation-Version" value="${vaadin.version}" /> | |||
</manifest> | |||
<union refid="jar.files" /> | |||
</jar> | |||
@@ -261,13 +222,11 @@ | |||
<jar file="${jar}" update="true"> | |||
<manifest> | |||
<attribute name="Bundle-Version" value="${bundle-version}" /> | |||
<attribute name="Bundle-ManifestVersion" | |||
value="${bundle-manifestversion}" /> | |||
<attribute name="Bundle-ManifestVersion" value="${bundle-manifestversion}" /> | |||
<attribute name="Bundle-Name" value="${bundle-name}" /> | |||
<attribute name="Bundle-SymbolicName" value="${bundle-symbolic}" /> | |||
<attribute name="Bundle-Vendor" value="${bundle-vendor}" /> | |||
<attribute name="Bundle-RequiredExecutionEnvironment" | |||
value="JavaSE-${vaadin.java.version}" /> | |||
<attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-${vaadin.java.version}" /> | |||
</manifest> | |||
</jar> | |||
@@ -276,8 +235,7 @@ | |||
<then> | |||
<jar file="${result.jar}" update="true"> | |||
<manifest> | |||
<attribute name="Import-Package" | |||
value="${import-package}" /> | |||
<attribute name="Import-Package" value="${import-package}" /> | |||
</manifest> | |||
</jar> | |||
</then> | |||
@@ -287,8 +245,7 @@ | |||
<then> | |||
<jar file="${result.jar}" update="true"> | |||
<manifest> | |||
<attribute name="Require-Bundle" | |||
value="${require-bundle}" /> | |||
<attribute name="Require-Bundle" value="${require-bundle}" /> | |||
</manifest> | |||
</jar> | |||
</then> | |||
@@ -298,16 +255,14 @@ | |||
<then> | |||
<jar file="${result.jar}" update="true"> | |||
<manifest> | |||
<attribute name="Export-Package" | |||
value="${export-package}" /> | |||
<attribute name="Export-Package" value="${export-package}" /> | |||
</manifest> | |||
</jar> | |||
</then> | |||
</antcontrib:if> | |||
<!-- Generate the Export-Package attribute in the manifest --> | |||
<java classname="com.vaadin.buildhelpers.GeneratePackageExports" | |||
failonerror="true" fork="yes"> | |||
<java classname="com.vaadin.buildhelpers.GeneratePackageExports" failonerror="true" fork="yes"> | |||
<arg value="${jar}" /> | |||
<arg line="com/vaadin com/google ${osgi.extra.package.prefixes}" /> | |||
<classpath refid="vaadin.buildhelpers.classpath" /> | |||
@@ -315,13 +270,10 @@ | |||
</java> | |||
</target> | |||
<target name="compile" description="Compiles the module" | |||
depends="dependencies, directories" if="src-exists"> | |||
<target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists"> | |||
<fail unless="module.name" message="No module name given" /> | |||
<javac srcdir="${src}" destdir="${classes}" source="${vaadin.java.version}" | |||
target="${vaadin.java.version}" debug="true" encoding="UTF-8" | |||
includeantruntime="false"> | |||
<javac srcdir="${src}" destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> | |||
<classpath refid="classpath.compile.dependencies" /> | |||
<classpath refid="classpath.compile.custom" /> | |||
</javac> | |||
@@ -330,8 +282,7 @@ | |||
<target name="exec-buildhelper" depends="compile"> | |||
<fail unless="main.class" message="No main class given in 'main.class'" /> | |||
<fail unless="output" message="No output file given in 'output'" /> | |||
<java classname="${main.class}" output="${output}" | |||
failonerror="true" fork="yes"> | |||
<java classname="${main.class}" output="${output}" failonerror="true" fork="yes"> | |||
<classpath refid="vaadin.buildhelpers.classpath" /> | |||
<classpath refid="classpath.compile.dependencies" /> | |||
<jvmarg value="-Dvaadin.version=${vaadin.version}" /> | |||
@@ -377,8 +328,7 @@ | |||
</junit> | |||
</target> | |||
<target name="test.compile" description="Compiles tests" | |||
depends="compile, dependencies.test"> | |||
<target name="test.compile" description="Compiles tests" depends="compile, dependencies.test"> | |||
<fail unless="module.name" message="No module name given" /> | |||
<property name="result.dir" location="result" /> | |||
<property name="base.dir" location="${result.dir}/.." /> | |||
@@ -389,9 +339,7 @@ | |||
<mkdir dir="${test.classes}" /> | |||
<javac srcdir="${test.src}" destdir="${test.classes}" | |||
source="${vaadin.java.version}" target="${vaadin.java.version}" | |||
debug="true" encoding="UTF-8" includeantruntime="false"> | |||
<javac srcdir="${test.src}" destdir="${test.classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> | |||
<classpath refid="classpath.test.dependencies" /> | |||
<classpath location="${classes}" /> | |||
<classpath refid="classpath.test.custom" /> | |||
@@ -406,14 +354,12 @@ | |||
<target name="dependencies" description="Resolves dependencies needed by this module"> | |||
<property name='conf' value="build, build-provided" /> | |||
<ivy:resolve resolveid="common" conf="${conf}" /> | |||
<ivy:cachepath pathid="classpath.compile.dependencies" | |||
conf="${conf}" /> | |||
<ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" /> | |||
</target> | |||
<target name="dependencies.test" description="Resolves dependencies needed by test"> | |||
<ivy:resolve resolveid="common" conf="test" /> | |||
<ivy:cachepath pathid="classpath.test.dependencies" | |||
conf="test" /> | |||
<ivy:cachepath pathid="classpath.test.dependencies" conf="test" /> | |||
</target> | |||
<target name="clean"> | |||
@@ -421,18 +367,15 @@ | |||
<delete dir="${result.dir}" /> | |||
</target> | |||
<target name="publish-local" | |||
description="Publishes the given module to the local repository"> | |||
<target name="publish-local" description="Publishes the given module to the local repository"> | |||
<fail unless="result.dir" message="No result.dir parameter given" /> | |||
<property name="conf" value="*(public)" /> | |||
<ivy:resolve conf="${conf}" /> | |||
<ivy:publish settingsref="ivysettings" conf="${conf}" | |||
resolver="build-temp" overwrite="true" forcedeliver="true"> | |||
<ivy:publish settingsref="ivysettings" conf="${conf}" resolver="build-temp" overwrite="true" forcedeliver="true"> | |||
<!-- <artifacts pattern="${result.dir}/[artifact]-[revision].[ext]" | |||
/> --> | |||
<artifacts | |||
pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" /> | |||
<artifacts pattern="${result.dir}/lib/[artifact]-[revision](-[classifier]).[ext]" /> | |||
</ivy:publish> | |||
</target> | |||
@@ -441,8 +384,7 @@ | |||
<property name="conf" value="*(public)" /> | |||
<ivy:resolve conf="${conf}" /> | |||
<ivy:publish conf="${conf}" resolver="local-maven" | |||
overwrite="true"> | |||
<ivy:publish conf="${conf}" resolver="local-maven" overwrite="true"> | |||
</ivy:publish> | |||
</target> | |||
@@ -450,8 +392,7 @@ | |||
<property name="cs.dir" location="${vaadin.basedir}/checkstyle" /> | |||
<property name="cs.xml" location="${cs.dir}/vaadin-checkstyle.xml" /> | |||
<property name="cs.header-file" location="${cs.dir}/header" /> | |||
<taskdef resource="checkstyletask.properties" uri="antlib:com.puppycrawl.tools.checkstyle" | |||
classpathref="taskdefs.classpath" /> | |||
<taskdef resource="checkstyletask.properties" uri="antlib:com.puppycrawl.tools.checkstyle" classpathref="taskdefs.classpath" /> | |||
<target name="checkstyle"> | |||
<fail unless="result.dir" message="No result.dir parameter given" /> | |||
@@ -463,13 +404,10 @@ | |||
<cs:checkstyle config="${cs.xml}" failOnViolation="false"> | |||
<fileset dir="${cs.src}" includes="**/*.java"> | |||
<exclude name="com/vaadin/sass/internal/parser/Parser.java" /> | |||
<exclude | |||
name="com/vaadin/sass/internal/parser/ParserConstants.java" /> | |||
<exclude | |||
name="com/vaadin/sass/internal/parser/ParserTokenManager.java" /> | |||
<exclude name="com/vaadin/sass/internal/parser/ParserConstants.java" /> | |||
<exclude name="com/vaadin/sass/internal/parser/ParserTokenManager.java" /> | |||
</fileset> | |||
<formatter type="xml" | |||
toFile="${result.dir}/checkstyle-errors.xml" /> | |||
<formatter type="xml" toFile="${result.dir}/checkstyle-errors.xml" /> | |||
<property key="checkstyle.header.file" file="${cs.header-file}" /> | |||
</cs:checkstyle> | |||
</target> |
@@ -25,12 +25,9 @@ | |||
<target name="unpack.gwt"> | |||
<fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar at ${gwt.dev.jar}" /> | |||
<fail unless="gwt.user.jar.found" | |||
message="Could not find gwt-user.jar at ${gwt.user.jar}" /> | |||
<fail unless="gwt.elemental.jar.found" | |||
message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" /> | |||
<fail unless="gwt.codeserver.jar.found" | |||
message="Could not find gwt-codeserver.jar at ${gwt.codeserver.jar}" /> | |||
<fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar at ${gwt.user.jar}" /> | |||
<fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" /> | |||
<fail unless="gwt.codeserver.jar.found" message="Could not find gwt-codeserver.jar at ${gwt.codeserver.jar}" /> | |||
<delete dir="${gwt.unpack.dir}" /> | |||
@@ -1,7 +1,5 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<project name="publish" basedir="." default="" | |||
xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" | |||
xmlns:artifact="antlib:org.apache.maven.artifact.ant"> | |||
<project name="publish" basedir="." default="" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant"> | |||
<include file="common.xml" as="common" /> | |||
<include file="build.xml" as="vaadin" /> | |||
@@ -18,17 +16,14 @@ | |||
<fail unless="ant-jsch.present" message="Please install ant-jsch.jar into ANT_HOME/lib" /> | |||
<fail unless="jsch.present" message="Please install jsch.jar into ANT_HOME/lib" /> | |||
<target name="nightly.publish" | |||
depends="nightly.download.publish, nightly.maven.publish"> | |||
<target name="nightly.publish" depends="nightly.download.publish, nightly.maven.publish"> | |||
</target> | |||
<!-- Copies the nightly build artifacts to the download server. --> | |||
<target name="nightly.tests.publish" if="nightly.tests.publish"> | |||
<property name="file.war" | |||
location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${version}.war" /> | |||
<property name="target" | |||
value="${nightly.tests.publish}/${vaadin.version.major}.${vaadin.version.minor}-${build.tag}.war" /> | |||
<property name="file.war" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${version}.war" /> | |||
<property name="target" value="${nightly.tests.publish}/${vaadin.version.major}.${vaadin.version.minor}-${build.tag}.war" /> | |||
<echo>Installing ${src} to ${target}</echo> | |||
@@ -37,22 +32,18 @@ | |||
</target> | |||
<target name="nightly.download.publish"> | |||
<antcontrib:foreach list="${modules.to.publish.to.download}" | |||
target="publish.module.to.download.site" param="module" /> | |||
<antcontrib:foreach list="${modules.to.publish.to.download}" target="publish.module.to.download.site" param="module" /> | |||
</target> | |||
<target name="nightly.maven.publish"> | |||
<antcontrib:foreach list="${modules.to.publish.to.maven}" | |||
target="publish.module.to.maven" param="module" /> | |||
<antcontrib:foreach list="${modules.to.publish.to.maven}" target="publish.module.to.maven" param="module" /> | |||
</target> | |||
<target name="publish.module.to.download.site"> | |||
<fail unless="module" message="No module to publish defined" /> | |||
<ivy:resolve file="${module}/ivy.xml" /> | |||
<ivy:publish publishivy="false" settingsref="publish.settings" | |||
conf="*(public)" resolver="sftp-publish"> | |||
<artifacts | |||
pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" /> | |||
<ivy:publish publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sftp-publish"> | |||
<artifacts pattern="${ivy.settings.dir}/result/artifacts/[revision]/[module]/[artifact]-[revision](-[classifier]).[ext]" /> | |||
</ivy:publish> | |||
</target> | |||
@@ -65,22 +56,17 @@ | |||
publishivy="false" settingsref="publish.settings" conf="*(public)" resolver="sonatype"> | |||
<artifacts pattern="${ivy.settings.dir}/result/artifacts/${vaadin.version}/[module]/[artifact]-${vaadin.version}(-[classifier]).[ext]" | |||
/> </ivy:publish> --> | |||
<property name="jar.file" | |||
location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" /> | |||
<property name="pom.file" | |||
location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" /> | |||
<property name="jar.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.jar" /> | |||
<property name="pom.file" location="result/artifacts/${vaadin.version}/vaadin-${module}/vaadin-${module}-${vaadin.version}.pom" /> | |||
<artifact:mvn failonerror="true"> | |||
<arg value="gpg:sign-and-deploy-file" /> | |||
<sysproperty key="file" value="${jar.file}" /> | |||
<sysproperty key="pomFile" value="${pom.file}" /> | |||
<sysproperty key="repositoryId" | |||
value="${maven.snapshot.repository.id}" /> | |||
<sysproperty key="url" | |||
value="${maven.snapshot.repository.url}" /> | |||
<sysproperty key="repositoryId" value="${maven.snapshot.repository.id}" /> | |||
<sysproperty key="url" value="${maven.snapshot.repository.url}" /> | |||
<sysproperty key="gpg.passphrase" value="${gpg.passphrase}" /> | |||
<sysproperty key="retryFailedDeploymentCount" | |||
value="10" /> | |||
<sysproperty key="retryFailedDeploymentCount" value="10" /> | |||
</artifact:mvn> | |||
</target> | |||
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-push" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-push" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Meta package which defines dependencies needed for push | |||
</description> | |||
@@ -28,18 +27,11 @@ | |||
<target name="vaadinPush.js"> | |||
<mkdir dir="${result.dir}/js/VAADIN" /> | |||
<property name="vaadinPush.js.output" location="${result.dir}/js/VAADIN/vaadinPush.js" /> | |||
<property name="vaadinPush.js.combined.output" | |||
location="${result.dir}/js/VAADIN/push.combined.js" /> | |||
<property name="vaadinPush.js.combined.output" location="${result.dir}/js/VAADIN/push.combined.js" /> | |||
<loadfile | |||
srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery-${jquery.version}.js" | |||
property="jquery.js.contents" /> | |||
<loadfile | |||
srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery.atmosphere.js" | |||
property="jquery.atmosphere.js.contents" /> | |||
<loadfile | |||
srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" | |||
property="vaadinPush.js.contents"> | |||
<loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery-${jquery.version}.js" property="jquery.js.contents" /> | |||
<loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/jquery.atmosphere.js" property="jquery.atmosphere.js.contents" /> | |||
<loadfile srcfile="${vaadin.basedir}/WebContent/VAADIN/vaadinPush.js.tpl" property="vaadinPush.js.contents"> | |||
<filterchain> | |||
<replacetokens begintoken="@" endtoken="@"> | |||
<token key="jquery.js" value="${jquery.js.contents}" /> | |||
@@ -50,9 +42,7 @@ | |||
<echo file="${vaadinPush.js.combined.output}">${vaadinPush.js.contents}</echo> | |||
<!-- Minify --> | |||
<ivy:retrieve organisation="com.yahoo.platform.yui" | |||
module="yuicompressor" revision="2.4.7" inline="true" type="jar" | |||
pattern="${result.dir}/compressor.jar" /> | |||
<ivy:retrieve organisation="com.yahoo.platform.yui" module="yuicompressor" revision="2.4.7" inline="true" type="jar" pattern="${result.dir}/compressor.jar" /> | |||
<java jar="${result.dir}/compressor.jar" fork="true"> | |||
<arg value="-v" /> | |||
<arg value="-o" /> | |||
@@ -63,8 +53,7 @@ | |||
<target name="jar" depends="vaadinPush.js"> | |||
<antcall target="common.jar"> | |||
<param name="require-bundle" | |||
value="org.atmosphere.atmosphere-runtime;bundle-version="${atmosphere.version}";visibility:=reexport" /> | |||
<param name="require-bundle" value="org.atmosphere.atmosphere-runtime;bundle-version="${atmosphere.version}";visibility:=reexport" /> | |||
<reference torefid="extra.jar.includes" refid="jar.includes" /> | |||
</antcall> | |||
</target> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-server" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-server" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Compiles build helpers used when building other modules. | |||
</description> | |||
@@ -24,10 +23,8 @@ | |||
</union> | |||
<target name="jar"> | |||
<property name="server.osgi.import" | |||
value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> | |||
<property name="server.osgi.require" | |||
value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional" /> | |||
<property name="server.osgi.import" value="javax.servlet;version="2.4.0",javax.servlet.http;version="2.4.0",org.jsoup;version="1.6.3",org.jsoup.parser;version="1.6.3",org.jsoup.nodes;version="1.6.3",org.jsoup.helper;version="1.6.3",org.jsoup.safety;version="1.6.3",org.json;version="0.0.20080701"" /> | |||
<property name="server.osgi.require" value="com.vaadin.shared;bundle-version="${vaadin.version}",com.vaadin.push;bundle-version="${vaadin.version}";resolution:=optional" /> | |||
<antcall target="common.jar"> | |||
<param name="require-bundle" value="${server.osgi.require}" /> | |||
<param name="import-package" value="${server.osgi.import}" /> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-shared" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-shared" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Compiles build helpers used when building other modules. | |||
</description> | |||
@@ -19,8 +18,7 @@ | |||
<target name="jar"> | |||
<property name="shared.osgi.import" | |||
value="org.json;version="0.0.20080701", com.google.gwt.thirdparty.guava.common.annotations;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base.internal;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.cache;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.collect;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.eventbus;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.io;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.net;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.primitives;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.util.concurrent;version="10.0.1.rebased", com.google.gwt.thirdparty.streamhtmlparser;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.impl;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.util;version="0.1.5.r10-rebased", org.w3c.flute.parser;version="1.3.0.gg2", org.w3c.flute.parser.selectors;version="1.3.0.gg2", org.w3c.flute.util;version="1.3.0.gg2"" /> | |||
<property name="shared.osgi.import" value="org.json;version="0.0.20080701", com.google.gwt.thirdparty.guava.common.annotations;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.base.internal;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.cache;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.collect;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.eventbus;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.io;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.net;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.primitives;version="10.0.1.rebased", com.google.gwt.thirdparty.guava.common.util.concurrent;version="10.0.1.rebased", com.google.gwt.thirdparty.streamhtmlparser;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.impl;version="0.1.5.r10-rebased", com.google.gwt.thirdparty.streamhtmlparser.util;version="0.1.5.r10-rebased", org.w3c.flute.parser;version="1.3.0.gg2", org.w3c.flute.parser.selectors;version="1.3.0.gg2", org.w3c.flute.util;version="1.3.0.gg2"" /> | |||
<delete dir="${src.filtered}" /> | |||
<!-- Update version in Version.java --> | |||
<copy todir="${src.filtered}"> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-theme-compiler" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-theme-compiler" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Compiles build helpers used when building other modules. | |||
</description> | |||
@@ -13,8 +12,7 @@ | |||
<property name="module.name" value="vaadin-theme-compiler" /> | |||
<property name="module.symbolic" value="com.vaadin.theme-compiler" /> | |||
<property name="result.dir" value="result" /> | |||
<property name="sass.parser.jj" | |||
location="src/com/vaadin/sass/internal/parser/Parser.jj" /> | |||
<property name="sass.parser.jj" location="src/com/vaadin/sass/internal/parser/Parser.jj" /> | |||
<path id="classpath.compile.custom"> | |||
</path> | |||
<path id="classpath.test.custom" /> | |||
@@ -26,9 +24,7 @@ | |||
<!-- Copy javacc-5.0.jar to ${result.dir}/javacc/javacc.jar as the | |||
javacc task requires the jar to be named javacc.jar --> | |||
<property name="javacc.home" location="${result.dir}/javacc" /> | |||
<ivy:retrieve organisation="net.java.dev.javacc" | |||
module="javacc" revision="5.0" inline="true" type="jar" | |||
pattern="${javacc.home}/[artifact].[ext]" /> | |||
<ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0" inline="true" type="jar" pattern="${javacc.home}/[artifact].[ext]" /> | |||
<javacc target="${sass.parser.jj}" javacchome="${javacc.home}"> | |||
</javacc> | |||
</target> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-themes" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-themes" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Themes compiled to CSS | |||
</description> | |||
@@ -24,8 +23,7 @@ | |||
<target name="compile-themes"> | |||
<ivy:resolve resolveid="common" conf="build" /> | |||
<ivy:cachepath pathid="classpath.compile.theme" | |||
conf="build" /> | |||
<ivy:cachepath pathid="classpath.compile.theme" conf="build" /> | |||
<antcall target="compile-theme"> | |||
<param name="theme" value="base" /> | |||
@@ -52,15 +50,14 @@ | |||
</target> | |||
<target name="copy-theme"> | |||
<fail unless="theme" | |||
message="You must give the theme name to copy n the 'theme' parameter" /> | |||
<fail unless="theme" message="You must give the theme name to copy n the 'theme' parameter" /> | |||
<property name="theme.source.dir" location="../WebContent/VAADIN/themes" /> | |||
<copy todir="${theme.result.dir}"> | |||
<fileset dir="${theme.source.dir}"> | |||
<include name="${theme}/**/*.scss" /> | |||
</fileset> | |||
<filterset refid="filter-vaadin.version"/> | |||
<filterset refid="filter-vaadin.version" /> | |||
</copy> | |||
<copy todir="${theme.result.dir}"> | |||
<fileset dir="${theme.source.dir}"> | |||
@@ -70,22 +67,17 @@ | |||
</target> | |||
<target name="compile-theme" depends="copy-theme"> | |||
<fail unless="theme" | |||
message="You must give the theme name to compile in the 'theme' parameter" /> | |||
<fail unless="theme" message="You must give the theme name to compile in the 'theme' parameter" /> | |||
<ivy:resolve resolveid="common" conf="compile-theme" /> | |||
<ivy:cachepath pathid="classpath.compile.theme" | |||
conf="compile-theme" /> | |||
<ivy:cachepath pathid="classpath.runtime.theme" | |||
conf="build" /> | |||
<ivy:cachepath pathid="classpath.compile.theme" conf="compile-theme" /> | |||
<ivy:cachepath pathid="classpath.runtime.theme" conf="build" /> | |||
<echo>Compiling ${theme}</echo> | |||
<mkdir dir="${theme.result.dir}" /> | |||
<!-- compile the theme --> | |||
<java classname="com.vaadin.buildhelpers.CompileTheme" | |||
classpathref="classpath.compile.theme" failonerror="yes" | |||
fork="yes" maxmemory="512m"> | |||
<java classname="com.vaadin.buildhelpers.CompileTheme" classpathref="classpath.compile.theme" failonerror="yes" fork="yes" maxmemory="512m"> | |||
<arg value="--theme" /> | |||
<arg value="${theme}" /> | |||
<arg value="--theme-folder" /> |
@@ -1,7 +1,6 @@ | |||
<?xml version="1.0"?> | |||
<project name="vaadin-uitest" basedir="." default="publish-local" | |||
xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<project name="vaadin-uitest" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant"> | |||
<description> | |||
Provides a uitest WAR containing Vaadin UI tests | |||
</description> | |||
@@ -11,8 +10,7 @@ | |||
<!-- global properties --> | |||
<property name="module.name" value="vaadin-uitest" /> | |||
<property name="result.dir" value="result" /> | |||
<property name="result.war" | |||
location="${result.dir}/lib/${module.name}-${vaadin.version}.war" /> | |||
<property name="result.war" location="${result.dir}/lib/${module.name}-${vaadin.version}.war" /> | |||
<path id="classpath.compile.custom"> | |||
</path> | |||
@@ -22,12 +20,10 @@ | |||
to the source path --> | |||
<ivy:resolve resolveid="common" conf="build, build-provided" /> | |||
<ivy:cachepath pathid="classpath.compile.dependencies" | |||
conf="build, build-provided" /> | |||
<ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" /> | |||
</target> | |||
<target name="compile" description="Compiles the module" | |||
depends="dependencies"> | |||
<target name="compile" description="Compiles the module" depends="dependencies"> | |||
<fail unless="module.name" message="No module name given" /> | |||
<property name="result.dir" location="result" /> | |||
@@ -37,21 +33,16 @@ | |||
<mkdir dir="${classes}" /> | |||
<!-- TODO: Get rid of this --> | |||
<javac destdir="${classes}" source="${vaadin.java.version}" | |||
target="${vaadin.java.version}" debug="true" encoding="UTF-8" | |||
includeantruntime="false"> | |||
<javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> | |||
<src path="${server.test.sources}" /> | |||
<include name="com/vaadin/tests/data/bean/**" /> | |||
<include name="com/vaadin/tests/VaadinClasses.java" /> | |||
<include | |||
name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" /> | |||
<include name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" /> | |||
<classpath refid="classpath.compile.dependencies" /> | |||
<classpath refid="classpath.compile.custom" /> | |||
</javac> | |||
<javac destdir="${classes}" source="${vaadin.java.version}" | |||
target="${vaadin.java.version}" debug="true" encoding="UTF-8" | |||
includeantruntime="false"> | |||
<javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> | |||
<src path="${src}" /> | |||
<classpath location="${classes}" /> | |||
<classpath refid="classpath.compile.dependencies" /> | |||
@@ -60,8 +51,7 @@ | |||
</target> | |||
<target name="testing-widgetset" depends="dependencies,compile"> | |||
<property name="module" | |||
value="com.vaadin.tests.widgetset.TestingWidgetSet" /> | |||
<property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet" /> | |||
<property name="style" value="OBF" /> | |||
<property name="localWorkers" value="2" /> | |||
<property name="extraParams" value="" /> | |||
@@ -73,8 +63,7 @@ | |||
<echo>Compiling ${module} to ${module.output.dir}</echo> | |||
<!-- compile the module --> | |||
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies" | |||
failonerror="yes" fork="yes" maxmemory="512m"> | |||
<java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies" failonerror="yes" fork="yes" maxmemory="512m"> | |||
<classpath location="src" /> | |||
<classpath location="${classes}" /> | |||
<arg value="-workDir" /> | |||
@@ -109,8 +98,7 @@ | |||
<property name="src" location="${result.dir}/../src" /> | |||
<ivy:resolve resolveid="common" conf="build" /> | |||
<ivy:cachepath pathid="classpath.runtime.dependencies" | |||
conf="build" /> | |||
<ivy:cachepath pathid="classpath.runtime.dependencies" conf="build" /> | |||
<delete dir="${deps.dir}" /> | |||
<mkdir dir="${deps.dir}" /> |
@@ -1,21 +1,16 @@ | |||
<?xml version="1.0"?> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" name="Vaadin Integration Tests" | |||
basedir="." default="integration-test-all"> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" name="Vaadin Integration Tests" basedir="." default="integration-test-all"> | |||
<!-- Import common targets --> | |||
<import file="../common.xml" /> | |||
<dirname file="${ant.file.Vaadin Integration Tests}" | |||
property="integration_test.dir" /> | |||
<dirname file="${ant.file.Vaadin Integration Tests}" property="integration_test.dir" /> | |||
<!-- Target deploying demo.war --> | |||
<fail unless="test.integration.server" | |||
message="test.integration.server must be set for integration tests to run" /> | |||
<fail unless="test.integration.server" message="test.integration.server must be set for integration tests to run" /> | |||
<fail unless="test.integration.user" | |||
message="test.integration.user must be set for integration tests to run" /> | |||
<fail unless="test.integration.antfile" | |||
message="test.integration.antfile must be set for integration tests to run" /> | |||
<fail unless="test.integration.user" message="test.integration.user must be set for integration tests to run" /> | |||
<fail unless="test.integration.antfile" message="test.integration.antfile must be set for integration tests to run" /> | |||
<!-- Test with these browsers --> | |||
<property name="test_browsers" value="winxp-firefox17-esr" /> | |||
@@ -39,28 +34,21 @@ | |||
<!-- Upload war to deploy to ssh host --> | |||
<target name="integration-test-upload-demo"> | |||
<scp file="${demo.war}" | |||
todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" | |||
keyfile="${sshkey.file}" passphrase="${passphrase}" /> | |||
<scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" /> | |||
</target> | |||
<!-- Run basic integration test test --> | |||
<target name="integration-test-servlet"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="integration-test-${server-name}-servlet.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-servlet.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<subant target="run-tests" failonerror="false" antfile="test.xml"> | |||
<property name="com.vaadin.testbench.lib.dir" | |||
value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" | |||
value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" | |||
value="${deployment.url}" /> | |||
<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" /> | |||
<property name="server.start.succeeded" value="1" /> | |||
<property name="browsers" value="${test_browsers}" /> | |||
<property name="testfiles" value="${testfiles}" /> | |||
<property name="test-output-dir" | |||
value="${integration_test.dir}/result/integration-test-output/${server-name}" /> | |||
<property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" /> | |||
<property name="retries" value="0" /> | |||
<fileset dir="." includes="test.xml" /> | |||
@@ -68,21 +56,16 @@ | |||
</target> | |||
<target name="integration-test-push-servlet"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="integration-test-${server-name}-push-servlet.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-push-servlet.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<subant target="run-tests" failonerror="false" antfile="test.xml"> | |||
<property name="com.vaadin.testbench.lib.dir" | |||
value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" | |||
value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" | |||
value="${deployment.url}" /> | |||
<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" /> | |||
<property name="server.start.succeeded" value="1" /> | |||
<property name="browsers" value="${test_browsers}" /> | |||
<property name="testfiles" value="${testfiles}" /> | |||
<property name="test-output-dir" | |||
value="${integration_test.dir}/result/integration-test-output/${server-name}" /> | |||
<property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" /> | |||
<property name="retries" value="0" /> | |||
<fileset dir="." includes="test.xml" /> | |||
@@ -91,16 +74,12 @@ | |||
<target name="integration-test-theme"> | |||
<subant target="run-tests" failonerror="false" antfile="test.xml"> | |||
<property name="com.vaadin.testbench.lib.dir" | |||
value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" | |||
value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" | |||
value="${deployment.url}" /> | |||
<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" /> | |||
<property name="server.start.succeeded" value="1" /> | |||
<property name="testfiles" value="${testfiles-theme}" /> | |||
<property name="test-output-dir" | |||
value="${integration_test.dir}/result/integration-test-output/${server-name}" /> | |||
<property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" /> | |||
<fileset dir="." includes="test.xml" /> | |||
</subant> | |||
@@ -108,30 +87,24 @@ | |||
<!-- Run integration test on GAE --> | |||
<target name="integration-test-test-GAE"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="GoogleAppEngine/integration-test-GAE.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="GoogleAppEngine/integration-test-GAE.html" /> | |||
<pathconvert pathsep=" " property="test-GAE" refid="html-test-files" /> | |||
<subant target="run-tests" failonerror="false" antfile="test.xml"> | |||
<property name="com.vaadin.testbench.lib.dir" | |||
value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" | |||
value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" | |||
value="http://vaadin-integration-test.appspot.com/" /> | |||
<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" /> | |||
<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" /> | |||
<property name="com.vaadin.testbench.deployment.url" value="http://vaadin-integration-test.appspot.com/" /> | |||
<property name="server.start.succeeded" value="1" /> | |||
<property name="browsers" value="${test_browsers}" /> | |||
<property name="testfiles" value="${test-GAE}" /> | |||
<property name="test-output-dir" | |||
value="../build/integration-test-gae-output" /> | |||
<property name="test-output-dir" value="../build/integration-test-gae-output" /> | |||
<fileset dir="." includes="test.xml" /> | |||
</subant> | |||
</target> | |||
<target name="integration-test-deploy-to-GAE"> | |||
<sshexec host="${test.integration.server}" username="${user}" | |||
keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" /> | |||
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} deploy-to-GAE" /> | |||
</target> | |||
@@ -224,8 +197,7 @@ | |||
<target name="integration-test-liferay6"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="Liferay-6/integration-test-liferay-6.0.5.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/integration-test-liferay-6.0.5.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
@@ -236,14 +208,11 @@ | |||
</target> | |||
<target name="integration-test-liferay6-theme"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="Liferay-6/Liferay6-and-6EE-theme-deploy.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/Liferay6-and-6EE-theme-deploy.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<fileset dir="integration-testscripts" id="html-theme-files" | |||
includes="Liferay-6/Liferay6-theme.html" /> | |||
<pathconvert pathsep=" " property="testfiles-theme" | |||
refid="html-theme-files" /> | |||
<fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6/Liferay6-theme.html" /> | |||
<pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
@@ -254,8 +223,7 @@ | |||
</target> | |||
<target name="integration-test-liferay5"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-5/integration-test-liferay-5.2.3-portlet2.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
@@ -266,8 +234,7 @@ | |||
</target> | |||
<target name="integration-test-liferay6ee"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="Liferay-6EE/integration-test-liferay-6ee.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6EE/integration-test-liferay-6ee.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
@@ -278,14 +245,11 @@ | |||
</target> | |||
<target name="integration-test-liferay6ee-theme"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="Liferay-6/Liferay6-and-6EE-theme-deploy.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="Liferay-6/Liferay6-and-6EE-theme-deploy.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<fileset dir="integration-testscripts" id="html-theme-files" | |||
includes="Liferay-6EE/Liferay6EE-theme.html" /> | |||
<pathconvert pathsep=" " property="testfiles-theme" | |||
refid="html-theme-files" /> | |||
<fileset dir="integration-testscripts" id="html-theme-files" includes="Liferay-6EE/Liferay6EE-theme.html" /> | |||
<pathconvert pathsep=" " property="testfiles-theme" refid="html-theme-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="600" /> | |||
@@ -295,8 +259,7 @@ | |||
</target> | |||
<target name="integration-test-gatein3"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="GateIn-3/integration-test-GateIn-3.1.0-portlet2.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="600" /> | |||
@@ -306,8 +269,7 @@ | |||
</target> | |||
<target name="integration-test-exo3"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="eXo-3/integration-test-eXo-3.0.3-portlet2.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-portlet2.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="600" /> | |||
@@ -342,8 +304,7 @@ | |||
<target name="integration-test-weblogicPortal"> | |||
<fileset dir="integration-testscripts" id="html-test-files" | |||
includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" /> | |||
<fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<antcall target="run-generic-integration-test"> | |||
<param name="startDelay" value="600" /> | |||
@@ -362,8 +323,7 @@ | |||
<target name="integration-test-all"> | |||
<property name="passphrase" value="${passphrase}" /> | |||
<fail unless="sshkey.file" message="You must define an ssh.keyfile parameter" /> | |||
<fail unless="com.vaadin.testbench.screenshot.directory" | |||
message="You must define a com.vaadin.testbench.screenshot.directory parameter" /> | |||
<fail unless="com.vaadin.testbench.screenshot.directory" message="You must define a com.vaadin.testbench.screenshot.directory parameter" /> | |||
<parallel> | |||
<antcontrib:trycatch property="tried"> | |||
<try> | |||
@@ -423,8 +383,7 @@ | |||
<antcontrib:if> | |||
<isset property="startDelay" /> | |||
<then> | |||
<antcontrib:math result="sleepTime" | |||
datatype="int"> | |||
<antcontrib:math result="sleepTime" datatype="int"> | |||
<op op="rint"> | |||
<op op="*"> | |||
<num value="${startDelay}" /> | |||
@@ -438,8 +397,7 @@ | |||
</then> | |||
</antcontrib:if> | |||
<scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" | |||
trust="yes" passphrase="${passphrase}"> | |||
<scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}"> | |||
<fileset dir="integration_base_files"> | |||
<include name="*" /> | |||
</fileset> | |||
@@ -451,22 +409,16 @@ | |||
<try> | |||
<!-- timeout in one hour (remote end should timeout in 55 | |||
minutes) --> | |||
<sshexec host="${target-host}" outputproperty="lock-output" | |||
timeout="3600000" username="${user}" keyfile="${sshkey.file}" | |||
trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" /> | |||
<sshexec host="${target-host}" outputproperty="lock-output" timeout="3600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" /> | |||
<antcall target="echo-prefix"> | |||
<param name="prefix" value="${target-server}: " /> | |||
<param name="message" value="${lock-output}" /> | |||
</antcall> | |||
<scp file="${demo.war}" todir="${user}@${target-host}:demo.war" | |||
keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" /> | |||
<scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" /> | |||
<!-- timeout in 15 minutes --> | |||
<sshexec host="${target-host}" outputproperty="start-output" | |||
timeout="900000" username="${user}" keyfile="${sshkey.file}" | |||
trust="yes" command="ant -f deploy.xml startup-and-deploy" | |||
failonerror="false" /> | |||
<sshexec host="${target-host}" outputproperty="start-output" timeout="900000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" failonerror="false" /> | |||
<antcall target="echo-prefix"> | |||
<param name="prefix" value="${target-server}: " /> | |||
<param name="message" value="${start-output}" /> | |||
@@ -475,20 +427,15 @@ | |||
<fail message="${start-output}"> | |||
<condition> | |||
<not> | |||
<contains string="${start-output}" | |||
substring="Demo deployed successfully" /> | |||
<contains string="${start-output}" substring="Demo deployed successfully" /> | |||
</not> | |||
</condition> | |||
</fail> | |||
<copy | |||
file="integration-testscripts/common/integration_test.tpl" | |||
tofile="integration-testscripts/integration-test-${target-server}-servlet.html" | |||
overwrite="true" /> | |||
<copy file="integration-testscripts/common/integration_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-servlet.html" overwrite="true" /> | |||
<antcall target="integration-test-servlet"> | |||
<param name="server-name" value="${target-server}" /> | |||
<param name="deployment.url" | |||
value="http://${target-host}:${target-port}" /> | |||
<param name="deployment.url" value="http://${target-host}:${target-port}" /> | |||
</antcall> | |||
<!-- Run theme tests in all browsers if there's a property | |||
@@ -498,21 +445,16 @@ | |||
<antcontrib:then> | |||
<antcall target="integration-test-theme"> | |||
<param name="server-name" value="${target-server}" /> | |||
<param name="deployment.url" | |||
value="http://${target-host}:${target-port}" /> | |||
<param name="deployment.url" value="http://${target-host}:${target-port}" /> | |||
</antcall> | |||
</antcontrib:then> | |||
</antcontrib:if> | |||
<!-- Run integration tests with push --> | |||
<copy | |||
file="integration-testscripts/common/integration_push_test.tpl" | |||
tofile="integration-testscripts/integration-test-${target-server}-push-servlet.html" | |||
overwrite="true" /> | |||
<copy file="integration-testscripts/common/integration_push_test.tpl" tofile="integration-testscripts/integration-test-${target-server}-push-servlet.html" overwrite="true" /> | |||
<antcall target="integration-test-push-servlet"> | |||
<param name="server-name" value="${target-server}" /> | |||
<param name="deployment.url" | |||
value="http://${target-host}:${target-port}" /> | |||
<param name="deployment.url" value="http://${target-host}:${target-port}" /> | |||
</antcall> | |||
<!-- Run theme tests in all browsers if there's a property | |||
@@ -522,17 +464,13 @@ | |||
<antcontrib:then> | |||
<antcall target="integration-test-theme"> | |||
<param name="server-name" value="${target-server}" /> | |||
<param name="deployment.url" | |||
value="http://${target-host}:${target-port}" /> | |||
<param name="deployment.url" value="http://${target-host}:${target-port}" /> | |||
</antcall> | |||
</antcontrib:then> | |||
</antcontrib:if> | |||
<!-- timeout in five minutes --> | |||
<sshexec host="${target-host}" outputproperty="stop-output" | |||
timeout="600000" username="${user}" keyfile="${sshkey.file}" | |||
trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" | |||
failonerror="false" /> | |||
<sshexec host="${target-host}" outputproperty="stop-output" timeout="600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" /> | |||
<antcall target="echo-prefix"> | |||
<param name="prefix" value="${target-server}: " /> | |||
<param name="message" value="${stop-output}" /> | |||
@@ -545,9 +483,7 @@ | |||
</target> | |||
<target name="echo-prefix"> | |||
<antcontrib:propertyregex property="message-prefixed" | |||
input="${prefix}${message}" regexp="\n" replace="\0${prefix}" | |||
global="true" defaultValue="${prefix}${message}" /> | |||
<antcontrib:propertyregex property="message-prefixed" input="${prefix}${message}" regexp="\n" replace="\0${prefix}" global="true" defaultValue="${prefix}${message}" /> | |||
<echo message="${message-prefixed}" /> | |||
</target> | |||
@@ -559,8 +495,7 @@ | |||
<antcall target="do-run-generic-test" /> | |||
</try> | |||
<catch> | |||
<antcontrib:antcallback target="teamcity-escape" | |||
return="tried-escaped"> | |||
<antcontrib:antcallback target="teamcity-escape" return="tried-escaped"> | |||
<param name="returnTo" value="tried-escaped" /> | |||
<param name="message" value="${tried}" /> | |||
</antcontrib:antcallback> | |||
@@ -580,15 +515,9 @@ | |||
<!-- Should also perform other escaping (\u0085, \u2028 and \u2029) | |||
- see http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity --> | |||
<!-- Immutable properties -> needs to create a new one every time --> | |||
<antcontrib:propertyregex property="details-escaped1" | |||
input="${message}" regexp="['|\[\]]" replace="|\0" global="true" | |||
defaultValue="${message}" /> | |||
<antcontrib:propertyregex property="details-escaped2" | |||
input="${details-escaped1}" regexp="\n" replace="|n" global="true" | |||
defaultValue="${details-escaped1}" /> | |||
<antcontrib:propertyregex property="details-escaped3" | |||
input="${details-escaped2}" regexp="\r" replace="|r" global="true" | |||
defaultValue="${details-escaped2}" /> | |||
<antcontrib:propertyregex property="details-escaped1" input="${message}" regexp="['|\[\]]" replace="|\0" global="true" defaultValue="${message}" /> | |||
<antcontrib:propertyregex property="details-escaped2" input="${details-escaped1}" regexp="\n" replace="|n" global="true" defaultValue="${details-escaped1}" /> | |||
<antcontrib:propertyregex property="details-escaped3" input="${details-escaped2}" regexp="\r" replace="|r" global="true" defaultValue="${details-escaped2}" /> | |||
<property name="${returnTo}" value="${details-escaped3}" /> | |||
</target> | |||
@@ -601,8 +530,7 @@ | |||
<antcall target="integration-test-${target-server}" /> | |||
</try> | |||
<catch> | |||
<antcallback target="teamcity-escape" | |||
return="tried-escaped"> | |||
<antcallback target="teamcity-escape" return="tried-escaped"> | |||
<param name="returnTo" value="tried-escaped" /> | |||
<param name="message" value="${tried}" /> | |||
</antcallback> | |||
@@ -617,18 +545,15 @@ | |||
</target> | |||
<target name="integration-test-get-lock"> | |||
<sshexec host="${test.integration.server}" username="${user}" | |||
keyfile="${sshkey.file}" command="ant -f ${ant.hub} get-lock" /> | |||
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} get-lock" /> | |||
</target> | |||
<target name="integration-test-release-lock"> | |||
<sshexec host="${test.integration.server}" username="${user}" | |||
keyfile="${sshkey.file}" command="ant -f ${ant.hub} release-lock" /> | |||
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} release-lock" /> | |||
</target> | |||
<!-- Remove demo.war --> | |||
<target name="integration-test-clean"> | |||
<sshexec host="${test.integration.server}" username="${user}" | |||
keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" /> | |||
<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} clean" /> | |||
</target> | |||
</project> |
@@ -1,6 +1,5 @@ | |||
<?xml version="1.0"?> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" | |||
name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up"> | |||
<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up"> | |||
<include file="../common.xml" /> | |||
<dirname property="test.xml.dir" file="${ant.file.Run Vaadin Testbench Tests}" /> | |||
@@ -9,12 +8,9 @@ | |||
<!-- Configuration --> | |||
<!-- ================================================================== --> | |||
<!-- Browsers to use for testing --> | |||
<property name="browsers-windows" | |||
value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr,winxp-safari5,winxp-googlechrome21,winxp-opera12" /> | |||
<property name="browsers-linux" | |||
value="linux-firefox3,linux-opera10,linux-googlechrome8" /> | |||
<property name="browsers-mac" | |||
value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" /> | |||
<property name="browsers-windows" value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr,winxp-safari5,winxp-googlechrome21,winxp-opera12" /> | |||
<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" /> | |||
<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" /> | |||
<property name="browsers" value="${browsers-windows}" /> | |||
@@ -22,26 +18,22 @@ | |||
<property name="retries" value="2" /> | |||
<!-- Screen shot base directory --> | |||
<fail unless="com.vaadin.testbench.screenshot.directory" | |||
message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.screenshot.directory" message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." /> | |||
<!-- Screen shot resolution --> | |||
<property name="com.vaadin.testbench.screenshot.resolution" | |||
value="1500x850" /> | |||
<property name="com.vaadin.testbench.screenshot.resolution" value="1500x850" /> | |||
<!-- Host running Testbench Hub --> | |||
<property name="com.vaadin.testbench.tester.host" value="testbench-hub.intra.itmill.com" /> | |||
<property name="com.vaadin.testbench.screenshot.block.error" | |||
value="0.025" /> | |||
<property name="com.vaadin.testbench.screenshot.block.error" value="0.025" /> | |||
<property name="com.vaadin.testbench.debug" value="false" /> | |||
<target name="initialize"> | |||
<!-- classpath must include test bench jar and its dependencies --> | |||
<path id="classpath"> | |||
<fileset dir="${com.vaadin.testbench.lib.dir}" | |||
includes="**/*.jar" /> | |||
<fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" /> | |||
</path> | |||
</target> | |||
@@ -55,16 +47,13 @@ | |||
file for each browser is created. --> | |||
<target name="create-tests" depends="initialize, remove-temp-testclasses"> | |||
<!-- Temporary output directory, created and removed by this script --> | |||
<fail unless="test-output-dir" | |||
message="The 'test-output-dir' property must be defined." /> | |||
<fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." /> | |||
<property name="class-dir" value="${test-output-dir}/classes" /> | |||
<pathconvert pathsep=" " property="testfiles" refid="html-test-files" /> | |||
<java classname="com.vaadin.testbench.util.TestConverter" | |||
classpathref="classpath" fork="true"> | |||
<sysproperty key="com.vaadin.testbench.test.retries" | |||
value="${retries}" /> | |||
<java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath" fork="true"> | |||
<sysproperty key="com.vaadin.testbench.test.retries" value="${retries}" /> | |||
<jvmarg value="-Duser.language=en" /> | |||
<jvmarg value="-Duser.country=US" /> | |||
<arg value="${test-output-dir}" /> | |||
@@ -77,9 +66,7 @@ | |||
<!-- This target complies the generated java junit tests. --> | |||
<target name="compile-tests" depends="create-tests"> | |||
<mkdir dir="${class-dir}" /> | |||
<javac includeantruntime="false" srcdir="${test-output-dir}" | |||
destdir="${class-dir}" debug="on" fork="yes" failonerror="false" | |||
encoding="UTF8"> | |||
<javac includeantruntime="false" srcdir="${test-output-dir}" destdir="${class-dir}" debug="on" fork="yes" failonerror="false" encoding="UTF8"> | |||
<classpath> | |||
<path refid="classpath" /> | |||
</classpath> | |||
@@ -91,12 +78,9 @@ | |||
<!-- ================================================================== --> | |||
<target name="check-parameters"> | |||
<fail unless="com.vaadin.testbench.lib.dir" | |||
message="The 'com.vaadin.testbench.lib.dir' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.tester.host" | |||
message="The 'com.vaadin.testbench.tester.host' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.deployment.url" | |||
message="The 'com.vaadin.testbench.deployment.url' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." /> | |||
</target> | |||
<target name="run-tests" depends="compile-tests"> | |||
@@ -104,8 +88,7 @@ | |||
<include name="**/**.java" /> | |||
</fileset> | |||
<antcontrib:for threadCount="30" parallel="true" | |||
keepgoing="true" param="target"> | |||
<antcontrib:for threadCount="30" parallel="true" keepgoing="true" param="target"> | |||
<path> | |||
<fileset refid="tests-fileset" /> | |||
</path> | |||
@@ -128,32 +111,23 @@ | |||
<formatter usefile="false" type="plain" /> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" /> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" /> | |||
<!-- Define where the reference screenshots and diff files are | |||
saved --> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" /> | |||
<!-- Resolution for screenshots --> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" /> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.debug=${com.vaadin.testbench.debug}" /> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.screenshot.block.error=${com.vaadin.testbench.screenshot.block.error}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.debug=${com.vaadin.testbench.debug}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.screenshot.block.error=${com.vaadin.testbench.screenshot.block.error}" /> | |||
<jvmarg value="-Djava.awt.headless=true" /> | |||
<!-- true/false system arguments --> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.screenshot.softfail=${com.vaadin.testbench.screenshot.softfail}" /> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" /> | |||
<jvmarg | |||
value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.screenshot.softfail=${com.vaadin.testbench.screenshot.softfail}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" /> | |||
<jvmarg value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" /> | |||
<batchtest> | |||
<filelist dir="${test-output-dir}" files="${target}" /> | |||
@@ -176,8 +150,7 @@ | |||
<target name="remove-error-screens"> | |||
<mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" /> | |||
<delete> | |||
<fileset | |||
dir="${com.vaadin.testbench.screenshot.directory}/errors"> | |||
<fileset dir="${com.vaadin.testbench.screenshot.directory}/errors"> | |||
<include name="**/**.*" /> | |||
</fileset> | |||
</delete> | |||
@@ -188,38 +161,29 @@ | |||
<!-- ================================================================== --> | |||
<!-- The default target. --> | |||
<target name="run-and-clean-up" | |||
depends="check-parameters,remove-error-screens,run-tests" /> | |||
<target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tests" /> | |||
<!-- Starts the server and runs all TestBench tests --> | |||
<target name="test-package"> | |||
<fail unless="war.file" message="No 'war.file' parameter given." /> | |||
<property name="test-output-dir" | |||
location="${test.xml.dir}/result/testbench-junit-classes" /> | |||
<property name="test-output-dir" location="${test.xml.dir}/result/testbench-junit-classes" /> | |||
<property name="retries" value="2" /> | |||
<!-- Parameters for the test.xml script. --> | |||
<fail unless="com.vaadin.testbench.tester.host" | |||
message="The 'com.vaadin.testbench.tester.host' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.deployment.url" | |||
message="The 'com.vaadin.testbench.deployment.url' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.lib.dir" | |||
message="The 'com.vaadin.testbench.lib.dir' property must be defined." /> | |||
<property name="com.vaadin.testbench.screenshot.block.error" | |||
value="0.025" /> | |||
<fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." /> | |||
<fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined." /> | |||
<property name="com.vaadin.testbench.screenshot.block.error" value="0.025" /> | |||
<property name="com.vaadin.testbench.debug" value="false" /> | |||
<parallel> | |||
<daemons> | |||
<ant antfile="${test.xml.dir}/vaadin-server.xml" | |||
inheritall="true" inheritrefs="true" target="deploy-and-start" /> | |||
<ant antfile="${test.xml.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> | |||
</daemons> | |||
<sequential> | |||
<ant antfile="${test.xml.dir}/vaadin-server.xml" | |||
target="wait-for-startup" /> | |||
<antcall inheritall="true" inheritrefs="true" | |||
target="run-and-clean-up" /> | |||
<ant antfile="${test.xml.dir}/vaadin-server.xml" target="wait-for-startup" /> | |||
<antcall inheritall="true" inheritrefs="true" target="run-and-clean-up" /> | |||
<echo message="All TestBench tests have been run" /> | |||
</sequential> | |||
</parallel> |
@@ -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" /> |