Subversion Repositories DevTools

Rev

Rev 1864 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1864 Rev 1866
Line 43... Line 43...
43 
			</classpath>
 43 
			</classpath>
44 
	</taskdef>
 44 
	</taskdef>
45
45
46 
	<macrodef name="run-junitee-tests">
 46 
	<macrodef name="run-junitee-tests">
47
47
48 
		<attribute name="jar"       default="${ant.project.name}.jar"/>
 48 
		<attribute name="jar"       	default="${ant.project.name}.jar"/>
- 
 
 49 
		<attribute name="war"		default="unit-test.war"/>
49 
		<attribute name="appxml"    default="${basedir}/src/etc/application.xml"/>
 50 
		<attribute name="appxml"    	default="${basedir}/src/etc/application.xml"/>
50 
		<element   name="junitee-war"/>
 51 
		<element   name="junitee-war"/>
51 
		<element   name="dependencies"/>
 52 
		<element   name="dependencies" optional="true"/>
52
53
53 
		<sequential>
 54 
		<sequential>
54 
 
 55 
 
55 
			<mkdir dir="${basedir}/build/jar"/>
 56 
			<mkdir dir="${basedir}/build/jar"/>
56
57
57 
			<juniteewar destFile="${basedir}/build/jar/${ant.project.name}-junitee.war">
 58 
			<juniteewar destFile="${basedir}/build/jar/@{war}">
58 
				<lib dir="${using.junitee.basedir}/jar"     includes="junitee.jar"/>
 59 
				<lib dir="${using.junitee.basedir}/jar"     includes="junitee.jar"/>
59 
				<lib dir="${using.junit.basedir}/jar"       includes="junit.jar"/>
 60 
				<lib dir="${using.junit.basedir}/jar"       includes="junit.jar"/>
60 
				<junitee-war/>
 61 
				<junitee-war/>
61 
			</juniteewar>
 62 
			</juniteewar>
62
63
63 
			<ear destfile="${basedir}/build/jar/${ant.project.name}-junitee.ear" appxml="@{appxml}">
 64 
			<ear destfile="${basedir}/build/jar/${ant.project.name}-junitee.ear" appxml="@{appxml}">
64 
				<fileset dir="${basedir}/build/pkg/jar">
 65 
				<fileset dir="${basedir}/build/pkg/jar">
65 
					<include name="@{jar}" />
 66 
					<include name="@{jar}" />
66 
				</fileset>
 67 
				</fileset>
67 
				<fileset dir="${basedir}/build/jar">
 68 
				<fileset dir="${basedir}/build/jar">
68 
					<include name="${ant.project.name}-junitee.war" />
 69 
					<include name="@{war}" />
69 
				</fileset>
 70 
				</fileset>
70 
				<dependencies/>
 71 
				<dependencies/>
71 
			</ear>
 72 
			</ear>
72
73
73 
			<!-- 	This is the trick bit. If you just use antcall to -runservertests, it will complain that -junitee-deploy does not exist in the project.
74 
			<!-- 	This is the trick bit. If you just use antcall to -runservertests, it will complain that -junitee-deploy does not exist in the project.