dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch

   1 --- a/build.xml
   2 +++ b/build.xml
   3 @@ -279,6 +279,8 @@
   4                 classpathref="compile.classpath"
   5                 classname="org.apache.log.Logger"/>
   6
   7 +    <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
   8 +
   9      <available property="avalon-framework.present"
  10                 classpathref="compile.classpath"
  11                 classname="org.apache.avalon.framework.logger.Logger"/>
  12 @@ -315,6 +317,13 @@
  13      </echo>
  14    </target>
  15
  16 +  <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
  17 +    <echo >
  18 +    *** WARNING ***
  19 +    ServletAPI not found: Cannot Build ServletContextCleaner
  20 +       </echo>
  21 +  </target>
  22 +
  23    <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
  24      <echo>
  25      *** WARNING ***
  26 @@ -337,7 +346,7 @@
  27    </target>
  28
  29    <target name='warning'
  30 -    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
  31 +    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
  32
  33    <target name="compile-only"
  34      depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
  35 @@ -365,6 +374,7 @@
  36
  37        <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
  38
  39 +         <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
  40        <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
  41                 unless="jdk.1.4.present"/>
  42        <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"