|
52 | 52 | <mkdir dir="${build}" />
|
53 | 53 | </target>
|
54 | 54 |
|
55 |
| - <target name="compile" depends="init,init-build, copy-dependencies" description="Compiles the source into the build directory"> |
| 55 | + <target name="compile" depends="init,init-build" description="Compiles the source into the build directory"> |
56 | 56 | <mkdir dir="${build.classes}"/>
|
57 | 57 | <javac debug="true" source="1.4" srcdir="${src}" destdir="${build.classes}">
|
58 | 58 | <classpath refid="default-classpath" />
|
|
66 | 66 | <target name="test.init" depends="init" description="Makes directories needed for the test jsps">
|
67 | 67 | <tstamp />
|
68 | 68 | <mkdir dir="${test.lib}" />
|
69 |
| - <mkdir dir="${test.classes}" /> |
| 69 | + <mkdir dir="${test.classes}" /> |
| 70 | + <path id="test-classpath"> |
| 71 | + <fileset dir="${lib-test}"> |
| 72 | + <include name="*.jar"/> |
| 73 | + </fileset> |
| 74 | + </path> |
70 | 75 | </target>
|
71 | 76 |
|
72 |
| - <target name="setup-dependencies"> |
73 |
| - <path id="maven-ant-tasks.classpath" path="lib-ant/maven-ant-tasks-2.0.7.jar" /> |
74 |
| - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" |
75 |
| - uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> |
76 |
| - <artifact:pom id="maven.project" file="pom.xml" /> |
77 |
| - </target> |
78 |
| - |
79 |
| - <target name="check-dependencies" depends="init" |
80 |
| - description="Check if the dependencies present in ${lib-ext}"> |
81 |
| - <!-- In order to re-generate the ${lib-ext} directory, delete the {lib-ext}/dependencies file --> |
82 |
| - <available file="${lib-ext}/dependencies" type="file" property="dependencies.present"/> |
83 |
| - </target> |
84 |
| - |
85 |
| - <target name="copy-dependencies" depends="init,setup-dependencies,check-dependencies" |
86 |
| - unless="dependencies.present" |
87 |
| - description="Download and copy test dependencies to the ${lib-ext} directory (only once)"> |
88 |
| - <artifact:dependencies filesetId="dependencies.fileset" pathId="dependencies.path"> |
89 |
| - <pom refid="maven.project"/> |
90 |
| - </artifact:dependencies> |
91 |
| - <!-- <delete dir="${lib-ext}" includes="*"/> --> |
92 |
| - <copy todir="${lib-ext}" flatten="true"> |
93 |
| - <fileset refid="dependencies.fileset"/> |
94 |
| - </copy> |
95 |
| - <pathconvert refid="dependencies.path" property="dependencies.string"/> |
96 |
| - <echo file="${lib-ext}/dependencies"> ${dependencies.string} </echo> |
97 |
| - </target> |
98 |
| - |
99 |
| - <target name="compile.test" depends="test.init, dist, init, copy-dependencies" description="Compiles the testing classes"> |
| 77 | + |
| 78 | + <target name="compile.test" depends="test.init, dist, init" description="Compiles the testing classes"> |
100 | 79 | <javac debug="true" source="1.4" srcdir="${test.src}" destdir="${test.classes}">
|
101 |
| - <classpath refid="jarClasspath" /> |
| 80 | + <classpath> |
| 81 | + <path refid="jarClasspath" /> |
| 82 | + <path refid="test-classpath" /> |
| 83 | + </classpath> |
102 | 84 | </javac>
|
103 | 85 | </target>
|
104 | 86 |
|
|
110 | 92 | <path refid="default-classpath"/>
|
111 | 93 | <pathelement location="${build.classes}"/>
|
112 | 94 | <pathelement location="${test.classes}"/>
|
113 |
| - </classpath> |
| 95 | + <path refid="test-classpath" /> |
| 96 | + </classpath> |
114 | 97 | <formatter type="plain"/>
|
115 | 98 | <batchtest fork="yes" todir="${test.reports}">
|
116 | 99 | <fileset dir="${test.classes}">
|
|
0 commit comments