46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
--- build.xml.orig2 2008-02-06 16:13:45.000000000 +0100
|
|
+++ build.xml 2008-02-06 16:16:48.000000000 +0100
|
|
@@ -276,6 +276,11 @@
|
|
classpathref="compile.classpath"
|
|
classname="org.apache.log.Logger"/>
|
|
|
|
+ <available property="servletapi.present"
|
|
+ classpathref="compile.classpath"
|
|
+ classname="javax.servlet.ServletContextEvent"/>
|
|
+
|
|
+
|
|
<available property="avalon-framework.present"
|
|
classpathref="compile.classpath"
|
|
classname="org.apache.avalon.framework.logger.Logger"/>
|
|
@@ -312,6 +317,13 @@
|
|
</echo>
|
|
</target>
|
|
|
|
+ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
|
|
+ <echo>
|
|
+ *** WARNING ***
|
|
+ ServletAPI not found: Cannot Build ServletContextCleaner
|
|
+ </echo>
|
|
+ </target>
|
|
+
|
|
<target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
|
|
<echo>
|
|
*** WARNING ***
|
|
@@ -334,7 +346,7 @@
|
|
</target>
|
|
|
|
<target name='warning'
|
|
- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
|
|
+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
|
|
|
|
<target name="compile-only"
|
|
depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
|
|
@@ -362,6 +374,8 @@
|
|
|
|
<exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
|
|
|
|
+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
|
|
+ unless="servletapi.present"/>
|
|
<exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
|
|
unless="jdk.1.4.present"/>
|
|
<exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
|