diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-10-25 16:29:07 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-10-25 16:29:07 +0000 |
| commit | 76da9212c513e0f5516cd8309450855f8702d64f (patch) | |
| tree | 02c4a9189e14e7a49a6a891db42637529d129688 /dev-java | |
| parent | Initial commit (diff) | |
| download | gentoo-2-76da9212c513e0f5516cd8309450855f8702d64f.tar.gz gentoo-2-76da9212c513e0f5516cd8309450855f8702d64f.tar.bz2 gentoo-2-76da9212c513e0f5516cd8309450855f8702d64f.zip | |
Forgot to include patch.
(Portage version: 2.1.2_pre3-r4)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-logging/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch | 47 |
2 files changed, 52 insertions, 1 deletions
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index ee6e66a90844..947068419f83 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-logging # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.41 2006/10/25 13:31:57 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.42 2006/10/25 16:29:07 nichoj Exp $ + + 25 Oct 2006; Joshua Nichols <nichoj@gentoo.org> + +files/commons-logging-1.1-servletapi.patch: + Forgot to include patch. *commons-logging-1.1-r2 (25 Oct 2006) 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 new file mode 100644 index 000000000000..0045cd195b0f --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.1-servletapi.patch @@ -0,0 +1,47 @@ +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 |