| 1 |
fordfrog 08/02/06 15:25:31 |
| 2 |
|
| 3 |
Added: commons-logging-1.1.1-gentoo.patch |
| 4 |
commons-logging-1.1.1-manifest |
| 5 |
commons-logging-1.1.1-servletapi.patch |
| 6 |
Log: |
| 7 |
Version bump |
| 8 |
(Portage version: 2.1.4.1) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: commons-logging-1.1.1-gentoo.patch |
| 17 |
=================================================================== |
| 18 |
--- build.xml.orig 2008-02-06 16:09:59.000000000 +0100 |
| 19 |
+++ build.xml 2008-02-06 16:10:48.000000000 +0100 |
| 20 |
@@ -785,4 +785,23 @@ |
| 21 |
</fail> |
| 22 |
</target> |
| 23 |
|
| 24 |
+ <target name="javadoc" description="o Generate javadoc" depends=""> |
| 25 |
+ <mkdir dir="${build.home}/docs"> |
| 26 |
+ </mkdir> |
| 27 |
+ <tstamp> |
| 28 |
+ <format pattern="2001-yyyy" property="year"> |
| 29 |
+ </format> |
| 30 |
+ </tstamp> |
| 31 |
+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> |
| 32 |
+ </property> |
| 33 |
+ <property name="title" value="Logging 1.1 API"> |
| 34 |
+ </property> |
| 35 |
+ <javadoc use="true" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.logging.*"> |
| 36 |
+ <classpath> |
| 37 |
+ <path refid="javadoc.classpath"> |
| 38 |
+ </path> |
| 39 |
+ </classpath> |
| 40 |
+ </javadoc> |
| 41 |
+ </target> |
| 42 |
+ |
| 43 |
</project> |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 dev-java/commons-logging/files/commons-logging-1.1.1-manifest |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.1.1-manifest?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.1.1-manifest?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: commons-logging-1.1.1-manifest |
| 53 |
=================================================================== |
| 54 |
Manifest-Version: 1.0 |
| 55 |
Bundle-ManifestVersion: 2 |
| 56 |
Bundle-Name: %bundleName |
| 57 |
Bundle-Vendor: %vendorName |
| 58 |
Bundle-Localization: plugin |
| 59 |
Bundle-SymbolicName: org.apache.commons.logging |
| 60 |
Bundle-Version: 1.1.1 |
| 61 |
Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1" |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1 dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch?rev=1.1&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch?rev=1.1&content-type=text/plain |
| 69 |
|
| 70 |
Index: commons-logging-1.1.1-servletapi.patch |
| 71 |
=================================================================== |
| 72 |
--- build.xml.orig2 2008-02-06 16:13:45.000000000 +0100 |
| 73 |
+++ build.xml 2008-02-06 16:16:48.000000000 +0100 |
| 74 |
@@ -276,6 +276,11 @@ |
| 75 |
classpathref="compile.classpath" |
| 76 |
classname="org.apache.log.Logger"/> |
| 77 |
|
| 78 |
+ <available property="servletapi.present" |
| 79 |
+ classpathref="compile.classpath" |
| 80 |
+ classname="javax.servlet.ServletContextEvent"/> |
| 81 |
+ |
| 82 |
+ |
| 83 |
<available property="avalon-framework.present" |
| 84 |
classpathref="compile.classpath" |
| 85 |
classname="org.apache.avalon.framework.logger.Logger"/> |
| 86 |
@@ -312,6 +317,13 @@ |
| 87 |
</echo> |
| 88 |
</target> |
| 89 |
|
| 90 |
+ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery"> |
| 91 |
+ <echo> |
| 92 |
+ *** WARNING *** |
| 93 |
+ ServletAPI not found: Cannot Build ServletContextCleaner |
| 94 |
+ </echo> |
| 95 |
+ </target> |
| 96 |
+ |
| 97 |
<target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'> |
| 98 |
<echo> |
| 99 |
*** WARNING *** |
| 100 |
@@ -334,7 +346,7 @@ |
| 101 |
</target> |
| 102 |
|
| 103 |
<target name='warning' |
| 104 |
- depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/> |
| 105 |
+ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/> |
| 106 |
|
| 107 |
<target name="compile-only" |
| 108 |
depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/> |
| 109 |
@@ -362,6 +374,8 @@ |
| 110 |
|
| 111 |
<exclude name="org/apache/commons/logging/impl/Log4J*.java"/> |
| 112 |
|
| 113 |
+ <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java" |
| 114 |
+ unless="servletapi.present"/> |
| 115 |
<exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java" |
| 116 |
unless="jdk.1.4.present"/> |
| 117 |
<exclude name="org/apache/commons/logging/impl/Jdk14Logger.java" |
| 118 |
|
| 119 |
|
| 120 |
|
| 121 |
-- |
| 122 |
gentoo-commits@l.g.o mailing list |
Archives