remm 01/02/11 21:50:21
Modified: . build.xml
Log:
- Update the build script to build the new Log4J wrapper whenever Log4J is
present.
- Add some additional flags.
Revision Changes Path
1.72 +56 -3 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- build.xml 2001/02/10 19:23:43 1.71
+++ build.xml 2001/02/12 05:50:21 1.72
@@ -21,6 +21,7 @@
<property name="jmx.jar" value="${jmx.home}/lib/jmxri.jar"/>
<property name="junit.jar" value="./lib/junit.jar"/>
<property name="jta.jar" value="./lib/jta.jar"/>
+ <property name="log4j.jar" value="./lib/log4j.jar"/>
<property name="tomcat.build" value="../jakarta-tomcat-4.0/build" />
<property name="avalon.dist" value="../dist/avalon" />
<property name="slide.build" value="./build" />
@@ -28,7 +29,7 @@
<property name="dav.dist" value="../dist/dav" />
<property name="webapp.dist" value="${slide.dist}/webapp" />
<property name="slide.release" value="./release" />
- <property name="slide.archive" value="${slide.release}/${final.name}" />
+ <property name="slide.archive" value="./${final.name}" />
<property name="webdavclient.build" value="${slide.build}/client" />
<property name="webdavclient.dist" value="${slide.dist}/client" />
@@ -80,6 +81,18 @@
<!-- =================================================================== -->
<target name="setenv">
+ <available property="jaxp10.present"
+ classname="javax.xml.parsers.DocumentBuilder"
+ classpath="${jaxp.jar}" />
+ <available property="jaxp11.present"
+ classname="javax.xml.transform.TransformFactory"
+ classpath="${jaxp.jar}" />
+ <available property="dom.present"
+ classname="org.w3c.dom.Document"
+ classpath="${xmlapi.jar}" />
+ <available property="sax.present"
+ classname="org.xml.sax.helpers.DefaultHandler"
+ classpath="${xmlapi.jar}" />
<available property="jta.present"
classname="javax.transaction.UserTransaction"
classpath="${jta.jar}" />
@@ -91,6 +104,9 @@
<available property="junit.present"
classname="junit.framework.TestCase"
classpath="${junit.jar}" />
+ <available property="log4j.present"
+ classname="org.apache.log4j.Category"
+ classpath="${log4j.jar}" />
<available property="catalina.present"
classname="org.apache.catalina.Container"
classpath="${catalina.build}/classes" />
@@ -98,14 +114,23 @@
classname="org.apache.tools.ant.taskdefs.optional.XalanLiaison" />
<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="--- Property values" />
+
<echo message="ant.home=${ant.home}" />
<echo message="catalina.build=${catalina.build}" />
<echo message="catalina.dist=${catalina.dist}" />
@@ -116,6 +141,7 @@
<echo message="jmx.home=${jmx.home}" />
<echo message="jmx.jar=${jmx.jar}" />
<echo message="junit.jar=${junit.jar}" />
+ <echo message="log4j.jar=${log4j.jar}" />
<echo message="jta.jar=${jta.jar}" />
<echo message="tomcat.build=${tomcat.build}" />
<echo message="slide.build=${slide.build}" />
@@ -608,8 +634,9 @@
debug="off" deprecation="off"
includes="**"
excludes="**/CVS/**"
- classpath="${slide.build}/classes:${catalina.build}/classes:${jta.jar}">
+
classpath="${slide.build}/classes:${catalina.build}/classes:${jta.jar}:${log4j.jar}">
<exclude name="**/SlideRealm*.*" unless="catalina.present" />
+ <exclude name="**/log4j/**" unless="log4j.present" />
</javac>
</target>
@@ -642,6 +669,32 @@
<!-- =================================================================== -->
+ <!-- Build Log4j related components -->
+ <!-- This target requires Log4j -->
+ <!-- =================================================================== -->
+ <target name="log4j-wrapper" depends="wrappers" if="catalina.present">
+
+ <copy file="src/etc/MANIFEST.MF"
+ tofile="${slide.build}/classes/MANIFEST.MF" />
+ <replace file="${slide.build}/classes/MANIFEST.MF"
+ token="$$VERSION$$" value="${version}" />
+ <copy todir="${slide.build}/classes">
+ <fileset dir="src/etc">
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="CHANGELOG" />
+ </fileset>
+ </copy>
+
+ <jar jarfile="${slide.dist}/wrappers/log4jwrapper.jar"
+ basedir="${slide.build}/classes"
+ manifest="${slide.build}/classes/MANIFEST.MF"
+ includes="LICENSE,README,CHANGELOG,**/log4j/**" />
+
+ </target>
+
+
+ <!-- =================================================================== -->
<!-- Build an Avalon wrapper -->
<!-- This target requires Avalon -->
<!-- =================================================================== -->
@@ -663,7 +716,7 @@
<!-- Full distribution -->
<!-- =================================================================== -->
<target name="full-dist" depends="dist, webdav-client-dist, webapp-dist,
- catalina-wrapper, avalon-wrapper, jmx-wrapper" />
+ catalina-wrapper, log4j-wrapper, avalon-wrapper, jmx-wrapper" />
<!-- =================================================================== -->
