libreoffice/external/apache-commons/patches/logging.patch

--- misc/commons-logging-1.1.1-src/build.xml   2007-11-22 00:27:52.000000000 +0100
+++ misc/build/commons-logging-1.1.1-src/build.xml     2008-06-24 14:23:56.316301736 +0200
@@ -129,12 +129,6 @@
   
 <!-- ========== Compiler Defaults ========================================= -->
 
-  <!-- Version of java class files to generate. -->
-  <property name="target.version" value="1.2"/>
-
-  <!-- Version of java source to accept -->
-  <property name="source.version" value="1.2"/>
-
   <!-- Should Java compilations set the 'debug' compiler option? -->
   <property name="compile.debug"           value="true"/>
 
@@ -283,6 +277,10 @@
                classpathref="compile.classpath"
                classname="org.apache.avalon.framework.logger.Logger"/>
 
+    <available property="servlet-api.present"
+               classpathref="compile.classpath"
+               classname="javax.servlet.ServletContextListener"/>
+
     <available file="${log4j12.jar}" property="log4j12.present"/>
     <available file="${log4j13.jar}" property="log4j13.present"/>
     <available file="${build.home}/docs" property="maven.generated.docs.present"/>
@@ -362,8 +360,8 @@
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
            optimize="${compile.optimize}"
-           source="${source.version}"
-           target="${target.version}">
+           source="${ant.build.javac.source}"
+           target="${ant.build.javac.target}">
 
       <classpath refid="compile.classpath"/>
     
@@ -373,6 +371,8 @@
                unless="logkit.present"/>
       <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"
                unless="avalon-framework.present"/>
+      <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"
+               unless="servlet-api.present"/>
     </javac>
   </target>