You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/03/22 06:08:12 UTC
cvs commit: jakarta-slide build.xml
remm 01/03/21 21:08:12
Modified: . build.xml
Log:
- Update the build file.
- Add compilation flag for JDOM.
- Building Slide against the 2.3 servlet API will fail (because the facades for the logger
are written for v2.2, which is a fair asumption at least until the new Servlet API
is released).
Revision Changes Path
1.77 +30 -13 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- build.xml 2001/02/20 08:26:30 1.76
+++ build.xml 2001/03/22 05:08:10 1.77
@@ -14,6 +14,8 @@
<property name="catalina.build" value="../jakarta-tomcat-4.0/catalina/build" />
<property name="catalina.dist" value="../jakarta-tomcat-4.0/dist" />
<property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar" />
+ <property name="jdom.home" value="./lib"/>
+ <property name="jdom.jar" value="${jdom.home}/jdom.jar"/>
<property name="jaxp.home" value="../jaxp"/>
<property name="xmlapi.jar" value="${jaxp.home}/crimson.jar"/>
<property name="xmlparser.jar" value="${jaxp.home}/crimson.jar"/>
@@ -82,6 +84,12 @@
<!-- =================================================================== -->
<target name="setenv">
+ <available property="servlet.present"
+ classname="javax.servlet.Servlet"
+ classpath="${servlet.jar}" />
+ <available property="servlet23.present"
+ classname="javax.servlet.Filter"
+ classpath="${servlet.jar}" />
<available property="jaxp10.present"
classname="javax.xml.parsers.DocumentBuilder"
classpath="${jaxp.jar}" />
@@ -113,22 +121,26 @@
classpath="${catalina.build}/classes" />
<available property="xsl.present"
classname="org.apache.tools.ant.taskdefs.optional.XalanLiaison" />
+ <available property="jdom.present" classname="org.jdom.Element"
+ classpath="${jdom.jar}" />
<echo message="--- Build environment for ${final.name} ---" />
<echo message="--- Flags (Note: If the {property name} is displayed, then the component is not present)" />
- <echo message="jaxp10.present=${jaxp10.present}" />
- <echo message="jaxp11.present=${jaxp11.present}" />
- <echo message="dom.present=${dom.present}" />
- <echo message="sax.present=${sax.present}" />
- <echo message="jta.present=${jta.present}" />
- <echo message="jmx.present=${jmx.present}" />
- <echo message="avalon.present=${avalon.present}" />
- <echo message="junit.present=${junit.present}" />
- <echo message="catalina.present=${catalina.present}" />
- <echo message="xsl.present=${xsl.present}" />
- <echo message="log4j.present=${log4j.present}" />
+ <echo message="servlet.present (must be present) = ${servlet.present}" />
+ <echo message="servlet23.present (must be absent) = ${servlet23.present}" />
+ <echo message="jaxp10.present (must be present) = ${jaxp10.present}" />
+ <echo message="jaxp11.present (optional) = ${jaxp11.present}" />
+ <echo message="dom.present (must be present) = ${dom.present}" />
+ <echo message="sax.present (must be present) = ${sax.present}" />
+ <echo message="jta.present (must be present) = ${jta.present}" />
+ <echo message="jmx.present (optional) = ${jmx.present}" />
+ <echo message="junit.present (optional) = ${junit.present}" />
+ <echo message="catalina.present (optional) = ${catalina.present}" />
+ <echo message="xsl.present (optional) = ${xsl.present}" />
+ <echo message="log4j.present (optional) = ${log4j.present}" />
+ <echo message="jdom.present (optional) = ${jdom.present}" />
<echo message="--- Property values" />
@@ -204,10 +216,12 @@
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
debug="on" deprecation="on"
- classpath="${jta.jar}:${jmx.jar}"
+ classpath="${jta.jar}:${jmx.jar}:${jdom.jar}:${servlet.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
+ <exclude name="**/logger/XMLTestCaseGenerator.java"
+ unless="jdom.present" />
</javac>
<copy todir="${slide.build}/classes">
<fileset dir="src/share">
@@ -279,10 +293,13 @@
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="off" deprecation="off" classpath="${jta.jar}:${jmx.jar}"
+ debug="off" deprecation="off"
+ classpath="${jta.jar}:${jmx.jar}:${jdom.jar}:${servlet.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
+ <exclude name="**/logger/XMLTestCaseGenerator.java"
+ unless="jdom.present" />
</javac>
<copy todir="${slide.build}/classes">
<fileset dir="src/share">