summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2008-02-06 15:25:30 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2008-02-06 15:25:30 +0000
commit5013f3d77a9dc5c3bd0953e3a33baf0cd03aa901 (patch)
tree84e193e8cb18df346086ec19362bd3be9a4969c2 /dev-java/commons-logging/files
parentadding new snapshot 5.2.5_p20080206 for security bug 209148 (diff)
downloadhistorical-5013f3d77a9dc5c3bd0953e3a33baf0cd03aa901.tar.gz
historical-5013f3d77a9dc5c3bd0953e3a33baf0cd03aa901.tar.bz2
historical-5013f3d77a9dc5c3bd0953e3a33baf0cd03aa901.zip
Version bump
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'dev-java/commons-logging/files')
-rw-r--r--dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch26
-rw-r--r--dev-java/commons-logging/files/commons-logging-1.1.1-manifest8
-rw-r--r--dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch46
3 files changed, 80 insertions, 0 deletions
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch
new file mode 100644
index 000000000000..6d468735d0e7
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1.1-gentoo.patch
@@ -0,0 +1,26 @@
+--- build.xml.orig 2008-02-06 16:09:59.000000000 +0100
++++ build.xml 2008-02-06 16:10:48.000000000 +0100
+@@ -785,4 +785,23 @@
+ </fail>
+ </target>
+
++ <target name="javadoc" description="o Generate javadoc" depends="">
++ <mkdir dir="${build.home}/docs">
++ </mkdir>
++ <tstamp>
++ <format pattern="2001-yyyy" property="year">
++ </format>
++ </tstamp>
++ <property name="copyright" value="Copyright &amp;copy; The Apache Software Foundation. All Rights Reserved.">
++ </property>
++ <property name="title" value="Logging 1.1 API">
++ </property>
++ <javadoc use="true" private="true" destdir="${build.home}/docs" author="true" version="true" sourcepath="src/java" 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.1.1-manifest b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
new file mode 100644
index 000000000000..382da7a047e5
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1.1-manifest
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %bundleName
+Bundle-Vendor: %vendorName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Version: 1.1.1
+Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.commons.logging.impl;version="1.1.1"
diff --git a/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
new file mode 100644
index 000000000000..2c29fa544019
--- /dev/null
+++ b/dev-java/commons-logging/files/commons-logging-1.1.1-servletapi.patch
@@ -0,0 +1,46 @@
+--- build.xml.orig2 2008-02-06 16:13:45.000000000 +0100
++++ build.xml 2008-02-06 16:16:48.000000000 +0100
+@@ -276,6 +276,11 @@
+ 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"/>
+@@ -312,6 +317,13 @@
+ </echo>
+ </target>
+
++ <target name="servletapi-warning" unless='servletapi.present' depends="init,discovery">
++ <echo>
++ *** WARNING ***
++ ServletAPI not found: Cannot Build ServletContextCleaner
++ </echo>
++ </target>
++
+ <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
+ <echo>
+ *** WARNING ***
+@@ -334,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"/>
+@@ -362,6 +374,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"