diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-java/commons-logging/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-java/commons-logging/files')
-rw-r--r-- | dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch | 26 | ||||
-rw-r--r-- | dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch | 42 |
2 files changed, 68 insertions, 0 deletions
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch new file mode 100644 index 000000000000..a654ce1fc763 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch @@ -0,0 +1,26 @@ +--- a/build.xml ++++ b/build.xml +@@ -773,4 +773,23 @@ + </fail> + </target> + ++ <target depends="" name="javadoc" description="o Generate javadoc" > ++ <mkdir dir="${build.home}/docs" > ++ </mkdir> ++ <tstamp > ++ <format pattern="2001-yyyy" property="year" > ++ </format> ++ </tstamp> ++ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved." > ++ </property> ++ <property name="title" value="Logging 1.1 API" > ++ </property> ++ <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" > ++ <classpath > ++ <path refid="javadoc.classpath" > ++ </path> ++ </classpath> ++ </javadoc> ++ </target> ++ + </project> 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..a9fccba8d5c1 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch @@ -0,0 +1,42 @@ +--- a/build.xml ++++ b/build.xml +@@ -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" |