monsieurp 15/04/22 21:50:06
Added: commons-logging-1.2-gentoo.patch
commons-logging-1.2-servletapi.patch
Log:
Version bump courtesy of Andreas Sturmlechner
<[email protected]>. Fix bug 496036.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path
1.1
dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch?rev=1.1&content-type=text/plain
Index: commons-logging-1.2-gentoo.patch
===================================================================
--- a/build.xml 2013-05-16 22:04:22.000000000 +0200
+++ b/build.xml 2013-12-25 23:58:47.447266535 +0100
@@ -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>
1.1
dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch?rev=1.1&content-type=text/plain
Index: commons-logging-1.2-servletapi.patch
===================================================================
--- 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"
