summaryrefslogtreecommitdiff
path: root/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch')
-rw-r--r--dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
deleted file mode 100644
index 0045cd195b0..00000000000
--- a/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ru commons-logging-1.1-src/build.xml commons-logging-1.1-src-patched/build.xml
---- commons-logging-1.1-src/build.xml 2006-05-09 17:45:08.000000000 -0400
-+++ commons-logging-1.1-src-patched/build.xml 2006-10-20 01:16:51.000000000 -0400
-@@ -274,6 +274,10 @@
- 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"/>
-@@ -303,6 +307,13 @@
- -->
- </target>
-
-+ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
-+ <echo>
-+ *** WARNING ***
-+ ServletAPI not found: Cannot Build ServletContextCleaner
-+ </echo>
-+ </target>
-+
- <target name="logkit-warning" unless='logkit.present' depends='init,discovery'>
- <echo>
- *** WARNING ***
-@@ -332,7 +343,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"/>
-@@ -360,6 +371,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"
-Only in commons-logging-1.1-src-patched/: target