juergen 01/03/29 05:16:35
Modified: . build.xml
Log:
the log4JLogger now depends on log4j.present (Remy, you are currently editing this
file, I have changed only one single line)
Revision Changes Path
1.81 +18 -18 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml 2001/03/23 07:41:45 1.80
+++ build.xml 2001/03/29 13:16:35 1.81
@@ -111,10 +111,10 @@
<available property="avalon.present"
classname="org.apache.avalon.blocks.Block" />
<available property="junit.present"
- classname="junit.framework.TestCase"
+ classname="junit.framework.TestCase"
classpath="${junit.jar}" />
<available property="log4j.present"
- classname="org.apache.log4j.Category"
+ classname="org.apache.log4j.Category"
classpath="${log4j.jar}" />
<available property="catalina.present"
classname="org.apache.catalina.Container"
@@ -127,9 +127,9 @@
<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="--- Required Libraries ---" />
-
+
<echo message="servlet.present (must be present) = ${servlet.present}" />
<echo message="servlet23.present (must NOT be present) = ${servlet23.present}"
/>
<echo message="jaxp10.present (must be present) = ${jaxp10.present}" />
@@ -137,9 +137,9 @@
<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="--- Optional Libraries ---" />
-
+
<echo message="jaxp11.present (optional) = ${jaxp11.present}" />
<echo message="jmx.present (optional) = ${jmx.present}" />
<echo message="junit.present (optional) = ${junit.present}" />
@@ -202,14 +202,14 @@
<!-- Build Utils -->
<!-- =================================================================== -->
<target name="util" depends="prepare">
-
+
<echo message="Building Utils" />
<javac srcdir="src/util" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
+ debug="off" deprecation="off"
classpath="${xmlapi.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
</javac>
-
+
</target>
@@ -220,7 +220,7 @@
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="on" deprecation="on"
+ debug="on" deprecation="on"
classpath="${jta.jar}:${jmx.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<exclude name="**/Slide.java" unless="jmx.present" />
@@ -239,7 +239,7 @@
<echo message="Building Standard Stores" />
<javac srcdir="src/stores" destdir="${slide.build}/classes"
- debug="on" deprecation="on"
+ debug="on" deprecation="on"
classpath="${jta.jar}:${slide.build}/classes"
excludes="**/CVS/**,**/package.html" />
@@ -296,7 +296,7 @@
<echo message="Building Slide Core API" />
<javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
+ debug="off" deprecation="off"
classpath="${jta.jar}:${jmx.jar}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<exclude name="**/Slide.java" unless="jmx.present" />
@@ -315,7 +315,7 @@
<echo message="Building Standard Stores" />
<javac srcdir="src/stores" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
+ debug="off" deprecation="off"
classpath="${jta.jar}:${slide.build}/classes"
excludes="**/CVS/**,**/package.html" />
@@ -344,20 +344,20 @@
<!-- Prepare WebDAV client -->
<!-- =================================================================== -->
<target name="webdav-client-prepare" depends="util">
-
+
<mkdir dir="${webdavclient.build}" />
<mkdir dir="${webdavclient.build}/bin" />
<mkdir dir="${webdavclient.build}/classes" />
<mkdir dir="${webdavclient.build}/conf" />
<mkdir dir="${webdavclient.build}/logs" />
<mkdir dir="${slide.build}/doc/clientjavadoc" />
-
+
<copy todir="${webdavclient.build}/classes">
<fileset dir="${slide.build}/classes">
<include name="**/org/apache/util/**" />
</fileset>
</copy>
-
+
</target>
@@ -494,7 +494,7 @@
<!-- =================================================================== -->
<!-- Build some tests -->
<!-- =================================================================== -->
- <target name="tests" depends="main, webdav-client-dist"
+ <target name="tests" depends="main, webdav-client-dist"
if="junit.present">
<javac srcdir="src/tests" destdir="${slide.build}/tests"
debug="on" deprecation="on" excludes="**/CVS/**"
@@ -708,7 +708,7 @@
<!-- Build Log4j related components -->
<!-- This target requires Log4j -->
<!-- =================================================================== -->
- <target name="log4j-wrapper" depends="wrappers" if="catalina.present">
+ <target name="log4j-wrapper" depends="wrappers" if="log4j.present">
<copy file="src/etc/MANIFEST.MF"
tofile="${slide.build}/classes/MANIFEST.MF" />
