Revision 1822
Added by Matt Jones over 20 years ago
| build.xml | ||
|---|---|---|
| 87 | 87 |
<property name="mcanotherpassword" value=""/> |
| 88 | 88 |
|
| 89 | 89 |
<!-- Tomcat version, if you use tomcat 3, please fill it "tomcat3". If you using tomcat4, please fill it "tomcat4"--> |
| 90 |
<property name="tomcatversion" value="tomcat4"/>
|
|
| 90 |
<property name="tomcatversion" value="tomcat3"/>
|
|
| 91 | 91 |
|
| 92 |
<property name="server" value="pine.nceas.ucsb.edu:8443"/>
|
|
| 93 |
<property name="systemidserver" value="http://pine.nceas.ucsb.edu:8080" />
|
|
| 92 |
<property name="server" value="dev.nceas.ucsb.edu"/>
|
|
| 93 |
<property name="systemidserver" value="http://dev.nceas.ucsb.edu" />
|
|
| 94 | 94 |
<property name="datafilepath" value="/usr/local/devtools/jakarta-tomcat/data/tao/data" /> |
| 95 | 95 |
<property name="inlinedatafilepath" value="/usr/local/devtools/jakarta-tomcat/data/tao/inlinedata" /> |
| 96 | 96 |
<property name="debuglevel" value="55" /> |
| ... | ... | |
| 108 | 108 |
<!-- Make sure these paths match the location of the jar files |
| 109 | 109 |
on your system, the defaults should usually work --> |
| 110 | 110 |
<property name="jsdk" |
| 111 |
value="${tomcat}/common/lib/servlet.jar" />
|
|
| 111 |
value="${tomcat}/lib/common/servlet.jar" />
|
|
| 112 | 112 |
<property name="xmlp" |
| 113 | 113 |
value="lib/xercesImpl.jar" /> |
| 114 | 114 |
<property name="srb" |
| ... | ... | |
| 241 | 241 |
</copy> |
| 242 | 242 |
</target> |
| 243 | 243 |
|
| 244 |
<target name="compile" depends="prepare"> |
|
| 244 |
<target name="compile" depends="prepare,utilities">
|
|
| 245 | 245 |
<javac srcdir="${build.src}"
|
| 246 | 246 |
destdir="${build.dest}"
|
| 247 | 247 |
classpath="${cpath}"
|
| ... | ... | |
| 445 | 445 |
|
| 446 | 446 |
</target> |
| 447 | 447 |
|
| 448 |
<target name="testprep" depends="install">
|
|
| 448 |
<target name="testprep" depends="jar,clientjar">
|
|
| 449 | 449 |
<mkdir dir="${build.tests}"/>
|
| 450 | 450 |
<copy todir="${build.tests}" filtering="yes">
|
| 451 | 451 |
<fileset dir="${testdir}">
|
| 452 | 452 |
<include name="edu/**"/> |
| 453 | 453 |
</fileset> |
| 454 | 454 |
</copy> |
| 455 |
</target> |
|
| 456 |
|
|
| 457 |
<target name="test" depends="testprep"> |
|
| 458 | 455 |
<!-- copy and compile the tests into a jar file --> |
| 459 | 456 |
<javac srcdir="${build.tests}"
|
| 460 | 457 |
destdir="${build.tests}"
|
| 461 |
classpath="${cpath}:${build.dir}/${name}.jar"
|
|
| 458 |
classpath="${cpath}:${build.dir}/${name}.jar:${build.dir}/${name}-client.jar"
|
|
| 462 | 459 |
debug="on" |
| 463 | 460 |
includes="**/*.java" /> |
| 464 | 461 |
|
| 465 | 462 |
<jar jarfile="${build.dir}/${name}-junittests.jar"
|
| 466 | 463 |
basedir="${build.tests}"
|
| 467 | 464 |
includes="**/*.class" /> |
| 465 |
</target> |
|
| 468 | 466 |
|
| 467 |
<target name="test" depends="testprep"> |
|
| 468 |
|
|
| 469 | 469 |
<!-- use the ant "junit" task to run JUnit tests. --> |
| 470 | 470 |
<junit printsummary="yes" haltonfailure="no" fork="yes" |
| 471 | 471 |
haltonerror="no"> |
| ... | ... | |
| 485 | 485 |
</target> |
| 486 | 486 |
|
| 487 | 487 |
<target name="runonetest" depends="testprep"> |
| 488 |
<!-- copy and compile the tests into a jar file --> |
|
| 489 |
<!--<property name="testtorun" value="SubTreeTest"/> --> |
|
| 490 | 488 |
<echo>testtorun: ${testtorun}</echo>
|
| 491 |
<javac srcdir="${build.tests}"
|
|
| 492 |
destdir="${build.tests}"
|
|
| 493 |
classpath="${cpath}:${build.dir}/${name}.jar"
|
|
| 494 |
debug="on" |
|
| 495 |
includes="**/*.java" /> |
|
| 496 | 489 |
|
| 497 |
<jar jarfile="${build.dir}/${name}-junittests.jar"
|
|
| 498 |
basedir="${build.tests}"
|
|
| 499 |
includes="**/*.class" /> |
|
| 500 |
|
|
| 501 | 490 |
<!-- use the ant "junit" task to run JUnit tests. --> |
| 502 | 491 |
<junit printsummary="yes" haltonfailure="no" fork="yes" |
| 503 | 492 |
haltonerror="no"> |
| ... | ... | |
| 566 | 555 |
|
| 567 | 556 |
<target name="clean" depends="init"> |
| 568 | 557 |
<delete dir="${build.dir}" />
|
| 558 |
<delete file="lib/httpclient.jar" /> |
|
| 559 |
<delete file="lib/utilities.jar" /> |
|
| 569 | 560 |
</target> |
| 570 | 561 |
|
| 571 | 562 |
<target name="jdoc" depends="prepare"> |
Also available in: Unified diff
Modified metacat to now provide the session identifier in the response
xml message when a login is called. This has not been fully tested.
I removed the HttpMessage class from metacat in favor of using the version
of that class that is found in the utilities module. This may cause some
unforeseen problems. We'll see.