Revision 5914
Added by ben leinfelder over 12 years ago
build.xml | ||
---|---|---|
357 | 357 |
<condition property="utilities.required"> |
358 | 358 |
<or> |
359 | 359 |
<not> |
360 |
<available file="lib/httpclient.jar" /> |
|
361 |
</not> |
|
362 |
<not> |
|
363 | 360 |
<available file="lib/utilities.jar" /> |
364 | 361 |
</not> |
365 | 362 |
<not> |
... | ... | |
469 | 466 |
if="utilities.required"> |
470 | 467 |
<ant dir="${utilitiesdir}" target="clean" inheritAll="false" /> |
471 | 468 |
<ant dir="${utilitiesdir}" target="jar" inheritAll="false" /> |
472 |
<copy file="${utilitiesdir}/lib/httpclient.jar" todir="lib" /> |
|
473 | 469 |
<copy file="${utilitiesdir}/build/utilities.jar" todir="lib" /> |
474 | 470 |
</target> |
475 | 471 |
|
... | ... | |
1141 | 1137 |
<!-- use the ant "junit" task to run JUnit tests. --> |
1142 | 1138 |
<junit printsummary="yes" haltonfailure="no" fork="yes" |
1143 | 1139 |
haltonerror="no" showoutput="yes"> |
1144 |
<!--<jvmarg value="-Djava.protocol.handler.pkgs=HTTPClient"/>--> |
|
1145 | 1140 |
<jvmarg value="-Dfile.encoding=UTF-8"/> |
1146 | 1141 |
<classpath> |
1147 | 1142 |
<path refid="test.classpath" /> |
... | ... | |
1185 | 1180 |
</junit> |
1186 | 1181 |
</target> |
1187 | 1182 |
|
1188 |
<target name="gethttpclient" depends="prepare" |
|
1189 |
description="checks out and compiles morpho httpclient code"> |
|
1190 |
<!--mkdir dir="${morphosourcedir}" --> |
|
1191 |
<cvs cvsRoot="${cvsroot}" package="morpho" dest="." /> |
|
1192 |
<ant dir="${morphosourcedir}" inheritAll="false" target="jar" /> |
|
1193 |
</target> |
|
1194 |
|
|
1195 | 1183 |
<!-- run this target, we need to check out a another morpho souce dir was checked out. --> |
1196 | 1184 |
<target name="nettest" depends="install" |
1197 | 1185 |
description="compiles and runs the metacatnettest code"> |
... | ... | |
1251 | 1239 |
|
1252 | 1240 |
<target name="localclean" depends="clean" |
1253 | 1241 |
description="deletes even jars that depend on external sources such as stylesheets and jars"> |
1254 |
<delete file="lib/httpclient.jar" /> |
|
1255 | 1242 |
<delete file="lib/utilities.jar" /> |
1256 | 1243 |
</target> |
1257 | 1244 |
|
... | ... | |
1466 | 1453 |
<!--<include name="GenCastor.class" />--> |
1467 | 1454 |
</patternset> |
1468 | 1455 |
<patternset id="lib.jars"> |
1469 |
<include name="httpclient.jar" /> |
|
1470 | 1456 |
<include name="log4j-1.2.12.jar" /> |
1471 | 1457 |
<include name="utilities.jar" /> |
1472 | 1458 |
<include name="xerces*.jar" /> |
Also available in: Unified diff
remove httpclient 3.1 and custom-built httpclient.jar
rework MetacatClient (and other classes) to use httpclient 4
updated build to not create httpclient.jar
encoding tests now pass.