|
@@ -16,12 +16,14 @@
|
|
|
|
|
|
|
|
<property prefix="build" file="${ant.conf.dir}/build.properties"/>
|
|
<property prefix="build" file="${ant.conf.dir}/build.properties"/>
|
|
|
<property name="build.lib" value="${lib.dir}/war/"/>
|
|
<property name="build.lib" value="${lib.dir}/war/"/>
|
|
|
- <property name="build.warfile" value="${build.dir}/${app.name}-${build.version}.war"/>
|
|
|
|
|
|
|
+ <property name="build.warfile"
|
|
|
|
|
+ value="${build.dir}/${app.name}-${build.version}.war"/>
|
|
|
<tstamp>
|
|
<tstamp>
|
|
|
<format property="build.time" pattern="MM/dd/yyyy hh:mm aa z" />
|
|
<format property="build.time" pattern="MM/dd/yyyy hh:mm aa z" />
|
|
|
</tstamp>
|
|
</tstamp>
|
|
|
|
|
|
|
|
- <property name="test.failure.halt" value="no"/>
|
|
|
|
|
|
|
+ <property name="test.halt.failure" value="off"/>
|
|
|
|
|
+ <property name="test.halt.error" value="off"/>
|
|
|
<property name="test.lib" value="${lib.dir}/test/"/>
|
|
<property name="test.lib" value="${lib.dir}/test/"/>
|
|
|
<property name="test.target.dir" value="${build.dir}/tests"/>
|
|
<property name="test.target.dir" value="${build.dir}/tests"/>
|
|
|
|
|
|
|
@@ -139,7 +141,8 @@
|
|
|
</javac>
|
|
</javac>
|
|
|
</target>
|
|
</target>
|
|
|
|
|
|
|
|
- <target name="war" depends="compile.server,ivy.resolve.war" description="Create application WAR">
|
|
|
|
|
|
|
+ <target name="war" depends="compile.server,ivy.resolve.war"
|
|
|
|
|
+ description="Create application WAR">
|
|
|
<mkdir dir="${build.dir}"/>
|
|
<mkdir dir="${build.dir}"/>
|
|
|
<war warfile="${build.warfile}" webxml="${app.conf.dir}/web.xml">
|
|
<war warfile="${build.warfile}" webxml="${app.conf.dir}/web.xml">
|
|
|
<lib dir="${build.lib}"/>
|
|
<lib dir="${build.lib}"/>
|
|
@@ -154,16 +157,21 @@
|
|
|
<target name="test.server"
|
|
<target name="test.server"
|
|
|
description="Run all unit tests on server"
|
|
description="Run all unit tests on server"
|
|
|
depends="compile.server,compile.tests,test.load">
|
|
depends="compile.server,compile.tests,test.load">
|
|
|
- <junit printsummary="yes" haltonfailure="${test.failure.halt}">
|
|
|
|
|
|
|
+ <junit printsummary="yes"
|
|
|
|
|
+ haltonfailure="${test.halt.failure}"
|
|
|
|
|
+ haltonerror="${test.halt.error}">
|
|
|
<classpath>
|
|
<classpath>
|
|
|
- <fileset dir="${test.lib}" includes="*.jar"/>
|
|
|
|
|
- <path refid="compile.classpath"/>
|
|
|
|
|
|
|
+ <path refid="compile.classpath"/>
|
|
|
|
|
+ <fileset dir="${test.lib}" includes="*.jar"/>
|
|
|
|
|
+ <fileset dir="${lib.dir" includes="*.jar"/>
|
|
|
<pathelement location="${test.target.dir}"/>
|
|
<pathelement location="${test.target.dir}"/>
|
|
|
|
|
+ <pathelement location="conf/test/app/"/>
|
|
|
</classpath>
|
|
</classpath>
|
|
|
<batchtest fork="yes">
|
|
<batchtest fork="yes">
|
|
|
- <fileset dir="${test.target.dir}">
|
|
|
|
|
|
|
+ <fileset dir="${test.dir}">
|
|
|
<include name="**/*.java"/>
|
|
<include name="**/*.java"/>
|
|
|
</fileset>
|
|
</fileset>
|
|
|
|
|
+ <formatter type="plain" usefile="false"/>
|
|
|
</batchtest>
|
|
</batchtest>
|
|
|
</junit>
|
|
</junit>
|
|
|
</target>
|
|
</target>
|