diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch')
| -rw-r--r-- | dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch new file mode 100644 index 000000000000..96299c131f1b --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch @@ -0,0 +1,42 @@ +--- a/build.xml 2013-12-26 00:00:51.019721667 +0100 ++++ b/build.xml 2013-12-26 00:22:27.616511976 +0100 +@@ -279,6 +279,8 @@ + classpathref="compile.classpath" + classname="org.apache.log.Logger"/> + ++ <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available> ++ + <available property="avalon-framework.present" + classpathref="compile.classpath" + classname="org.apache.avalon.framework.logger.Logger"/> +@@ -315,6 +317,13 @@ + </echo> + </target> + ++ <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" > ++ <echo > ++ *** WARNING *** ++ ServletAPI not found: Cannot Build ServletContextCleaner ++ </echo> ++ </target> ++ + <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'> + <echo> + *** WARNING *** +@@ -337,7 +346,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"/> +@@ -365,6 +374,7 @@ + + <exclude name="org/apache/commons/logging/impl/Log4J*.java"/> + ++ <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude> + <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" + unless="jdk.1.4.present"/> + <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java" |