external/apache-commons/patches/logging.patch

   1 --- misc/commons-logging-1.1.1-src/build.xml   2007-11-22 00:27:52.000000000 +0100
   2 +++ misc/build/commons-logging-1.1.1-src/build.xml     2008-06-24 14:23:56.316301736 +0200
   3 @@ -129,12 +129,6 @@
   4
   5  <!-- ========== Compiler Defaults ========================================= -->
   6
   7 -  <!-- Version of java class files to generate. -->
   8 -  <property name="target.version" value="1.2"/>
   9 -
  10 -  <!-- Version of java source to accept -->
  11 -  <property name="source.version" value="1.2"/>
  12 -
  13    <!-- Should Java compilations set the 'debug' compiler option? -->
  14    <property name="compile.debug"           value="true"/>
  15
  16 @@ -283,6 +277,10 @@
  17                 classpathref="compile.classpath"
  18                 classname="org.apache.avalon.framework.logger.Logger"/>
  19
  20 +    <available property="servlet-api.present"
  21 +               classpathref="compile.classpath"
  22 +               classname="javax.servlet.ServletContextListener"/>
  23 +
  24      <available file="${log4j12.jar}" property="log4j12.present"/>
  25      <available file="${log4j13.jar}" property="log4j13.present"/>
  26      <available file="${build.home}/docs" property="maven.generated.docs.present"/>
  27 @@ -362,8 +360,8 @@
  28             debug="${compile.debug}"
  29             deprecation="${compile.deprecation}"
  30             optimize="${compile.optimize}"
  31 -           source="${source.version}"
  32 -           target="${target.version}">
  33 +           source="${ant.build.javac.source}"
  34 +           target="${ant.build.javac.target}">
  35
  36        <classpath refid="compile.classpath"/>
  37
  38 @@ -373,6 +371,8 @@
  39                 unless="logkit.present"/>
  40        <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"
  41                 unless="avalon-framework.present"/>
  42 +      <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
  43 +               unless="servlet-api.present"/>
  44      </javac>
  45    </target>
  46