rlubke 02/01/22 06:42:56
Modified: . build.xml
Log:
- Servlet 2.2/JSP 1.1 classes are now necessary to build the compat tests.
Revision Changes Path
1.14 +10 -5 jakarta-watchdog-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-watchdog-4.0/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 22 Jan 2002 13:50:36 -0000 1.13
+++ build.xml 22 Jan 2002 14:42:56 -0000 1.14
@@ -11,19 +11,24 @@
<property name="compile.debug" value="true"/>
<property name="compile.deprecation" value="false"/>
<property name="compile.optimize" value="true"/>
- <property name="servlet.jar" value="${servletapi.home}/lib/servlet.jar"/>
+ <property name="servlet23.jar"
value="${servlet23api.home}/lib/servlet.jar"/>
+ <property name="servlet22.jar"
value="${servlet22api.home}/lib/servlet.jar"/>
<property name="watchdog.build" value="build"/>
<property name="watchdog.dist" value="dist"/>
<!-- Establish compilation classpath -->
<path id="compile.classpath">
- <pathelement location="${servlet.jar}"/>
+ <pathelement location="${servlet23.jar}"/>
+ </path>
+
+ <path id="compat.classpath">
+ <pathelement location="${servlet22.jar}"/>
</path>
<!-- Establish conversion classpath -->
<path id="convert.classpath">
<pathelement location="${watchdog.build}/classes"/>
- <pathelement location="${servlet.jar}"/>
+ <pathelement location="${servlet23.jar}"/>
</path>
<!-- Establish pattern sets -->
@@ -91,7 +96,7 @@
<fileset dir="${ant.home}/lib" includes="parser.jar"/>
</copy>
<copy tofile="${watchdog.build}/lib/servlet.jar"
- file="${servlet.jar}" />
+ file="${servlet23.jar}" />
<!-- Client golden files -->
<copy todir="${watchdog.build}/lib/jsp-golden">
@@ -162,7 +167,7 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
+ <classpath refid="compat.classpath"/>
<patternset refid="compat.servlet.tests"/>
</javac>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
