jefft 2002/07/20 02:31:48
Modified: logger build.xml
Log:
Add checks to ensure that logkit.jar was compiled with required optional bits.
This stops the build failing if, say, logkit.jar was compiled without servlet
support, but Excalibur Logger wants it enabled.
Revision Changes Path
1.21 +28 -2 jakarta-avalon-excalibur/logger/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 6 Jul 2002 05:44:26 -0000 1.20
+++ build.xml 20 Jul 2002 09:31:48 -0000 1.21
@@ -76,14 +76,40 @@
</available>
</target>
- <target name="dependencies.optional" if="servlet.present">
+ <!-- Check that if we want servlet logging support, our logkit.jar has
it enabled too -->
+ <target name="dependencies.servlet" if="servlet.present">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredClass">
<property name="name" value="logkit.jar"/>
<property name="class"
value="org.apache.log.output.ServletOutputLogTarget"/>
<property name="classpath" value="${cp}"/>
- <property name="remedy" value="Recompile LogKit with servlet
support enabled"/>
+ <property name="remedy" value="Recompile LogKit with servlet
support enabled, or disable servlet support in ${Name} by setting a blank
'servlet.jar' property in ant.properties"/>
+ </ant>
+ </target>
+
+ <!-- Check that if we want JDBC logging support, our logkit.jar has it
enabled too -->
+ <target name="dependencies.datasource" if="datasource.present">
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredClass">
+ <property name="name" value="logkit.jar"/>
+ <property name="class"
value="org.apache.log.output.db.ColumnInfo"/>
+ <property name="classpath" value="${cp}"/>
+ <property name="remedy" value="Recompile LogKit with JDBC
logging support enabled, or disable JDBC support in ${Name} by setting a blank
'jdbc.jar' property in ant.properties"/>
+ </ant>
+ <echo>hooray</echo>
+ </target>
+
+ <!-- Check that if we want JMS logging support, our logkit.jar has it
enabled too -->
+ <target name="dependencies.jms" if="jms.present">
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredClass">
+ <property name="name" value="logkit.jar"/>
+ <property name="class"
value="org.apache.log.output.jms.JMSQueueTarget"/>
+ <property name="classpath" value="${cp}"/>
+ <property name="remedy" value="Recompile LogKit with JMS
support enabled, or disable JMS support in ${Name} by setting a blank 'jms.jar'
property in ant.properties"/>
</ant>
</target>
+
+ <target name="dependencies.optional"
+
depends="check-environment,dependencies.servlet,dependencies.datasource,dependencies.jms"
+ description="Checks if dependencies for optional components are
present"/>
<target name="dependencies" depends="dependencies.optional"
description="Check dependencies" unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
