Revision 5311
Added by daigle about 14 years ago
| build.xml | ||
|---|---|---|
| 59 | 59 |
</and> |
| 60 | 60 |
</condition> |
| 61 | 61 |
|
| 62 |
<target name="config"> |
|
| 63 |
<!-- Find the servlet-api.jar, depending on the tomcat version. --> |
|
| 64 |
<property name="t5.jar" |
|
| 65 |
value="${build.tomcat.dir}/common/lib/servlet-api.jar"/>
|
|
| 66 |
<property name="t6.jar" |
|
| 67 |
value="${build.tomcat.dir}/lib/servlet-api.jar"/>
|
|
| 68 |
<available file="${t5.jar}" property="jsdk" value="${t5.jar}"/>
|
|
| 69 |
<available file="${t6.jar}" property="jsdk" value="${t6.jar}"/>
|
|
| 62 |
<available file="${build.tomcat.dir}/common/lib/servlet-api.jar"
|
|
| 63 |
property="tomcat.common.exists" /> |
|
| 70 | 64 |
|
| 65 |
<target name="config" depends="setTomcatCommon, setTomcatNoCommon"> |
|
| 71 | 66 |
<!-- usr for client testing, generally you don't need change--> |
| 72 | 67 |
<property name="mcuser" |
| 73 | 68 |
value="uid=kepler,o=unaffiliated,dc=ecoinformatics,dc=org" /> |
| ... | ... | |
| 90 | 85 |
|
| 91 | 86 |
<echo>*********** set jsdk to ${jsdk}</echo>
|
| 92 | 87 |
</target> |
| 93 |
|
|
| 88 |
|
|
| 89 |
<target name="setTomcatCommon" if="tomcat.common.exists" > |
|
| 90 |
<property name="jsdk" |
|
| 91 |
value="${build.tomcat.dir}/common/lib/servlet-api.jar" />
|
|
| 92 |
</target> |
|
| 93 |
|
|
| 94 |
<target name="setTomcatNoCommon" unless="tomcat.common.exists" > |
|
| 95 |
<property name="jsdk" |
|
| 96 |
value="${build.tomcat.dir}/lib/servlet-api.jar" />
|
|
| 97 |
</target> |
|
| 98 |
|
|
| 94 | 99 |
<target name="init" depends="config"> |
| 95 | 100 |
<path id="compile.classpath"> |
| 96 | 101 |
<pathelement location="${jsdk}" />
|
| ... | ... | |
| 118 | 123 |
</fileset> |
| 119 | 124 |
|
| 120 | 125 |
</path> |
| 126 |
|
|
| 127 |
<path id="test.classpath"> |
|
| 128 |
<pathelement location="${jsdk}" />
|
|
| 129 |
<pathelement location="lib" /> |
|
| 130 |
<fileset dir="lib"> |
|
| 131 |
<include name="*.jar" /> |
|
| 132 |
<exclude name="maven-ant-tasks-2.1.0.jar" /> |
|
| 133 |
</fileset> |
|
| 134 |
<fileset dir="lib"> |
|
| 135 |
<include name="xalan.jar" /> |
|
| 136 |
</fileset> |
|
| 137 |
<fileset dir="lib/lsid_lib"> |
|
| 138 |
<include name="*.jar" /> |
|
| 139 |
</fileset> |
|
| 121 | 140 |
|
| 141 |
<!-- Include geoserver, geotools, et. al. --> |
|
| 142 |
<fileset dir="lib/spatial/geoserver/WEB-INF/lib"> |
|
| 143 |
<include name="*.jar" /> |
|
| 144 |
</fileset> |
|
| 145 |
<pathelement |
|
| 146 |
location="lib/spatial/geoserver/WEB-INF/classes" /> |
|
| 147 |
|
|
| 148 |
<!-- Include OAI-PMH --> |
|
| 149 |
<fileset dir="lib/oaipmh"> |
|
| 150 |
<include name="*.jar" /> |
|
| 151 |
</fileset> |
|
| 152 |
|
|
| 153 |
</path> |
|
| 154 |
|
|
| 122 | 155 |
<!-- It is less likely you'll need to make any changes from here down, |
| 123 | 156 |
but customization is possible --> |
| 124 | 157 |
<property name="name" value="metacat" /> |
| ... | ... | |
| 1040 | 1073 |
haltonerror="no"> |
| 1041 | 1074 |
<jvmarg value="-Djava.protocol.handler.pkgs=HTTPClient" /> |
| 1042 | 1075 |
<classpath> |
| 1043 |
<path refid="compile.classpath" />
|
|
| 1076 |
<path refid="test.classpath" />
|
|
| 1044 | 1077 |
<fileset dir="${build.dir}">
|
| 1045 | 1078 |
<include name="${name}.jar" />
|
| 1046 | 1079 |
<include name="${name}-client.jar" />
|
| ... | ... | |
| 1071 | 1104 |
haltonerror="no" showoutput="yes"> |
| 1072 | 1105 |
<!--<jvmarg value="-Djava.protocol.handler.pkgs=HTTPClient"/>--> |
| 1073 | 1106 |
<classpath> |
| 1074 |
<path refid="compile.classpath" />
|
|
| 1107 |
<path refid="test.classpath" />
|
|
| 1075 | 1108 |
<fileset dir="${build.dir}">
|
| 1076 | 1109 |
<include name="${name}.jar" />
|
| 1077 | 1110 |
<include name="${name}-client.jar" />
|
Also available in: Unified diff
Merge 1.9.2 changes back into the trunk