OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=61
This commit is contained in:
Fridrich Strba
Git OBS Bridge
commit
170b63c39b
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
295
apache-commons-logging.changes
Normal file
295
apache-commons-logging.changes
Normal file
@ -0,0 +1,295 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 9 08:05:34 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
|
||||
|
||||
- Upgrade to 1.3.3
|
||||
* Bug Fixes:
|
||||
+ * LOGGING-193: Update Log4j 2 OSGi imports #268.
|
||||
+ * Fix PMD UnnecessaryFullyQualifiedName in SimpleLog.
|
||||
+ * Fix NullPointerException in SimpleLog#write(Object) on null
|
||||
input.
|
||||
+ Fix NullPointerException in SimpleLog#write(StringBuffer) on
|
||||
null input.
|
||||
- Includes changes from 1.3.2
|
||||
* Fixed Bugs
|
||||
+ LOGGING-190: Add OSGi metadata to enable Service Loader
|
||||
Mediator #234.
|
||||
+ LOGGING-191: Apache commons logging shows 1.4 as latest
|
||||
release instead of 1.3.1.
|
||||
+ Deprecate
|
||||
org.apache.commons.logging.LogSource.jdk14IsAvailable.
|
||||
- Includes changes from 1.3.1
|
||||
* New features
|
||||
+ Add Maven property project.build.outputTimestamp for build
|
||||
reproducibility.
|
||||
* Fixed Bugs
|
||||
+ Remove references to very old JDK and Commons Logging
|
||||
versions #201.
|
||||
+ Update from Logj 1 to the Log4j 2 API compatibility layer
|
||||
#231.
|
||||
+ Allow Servlet 4 in OSGi environment #191.
|
||||
+ Fix generics warnings #213.
|
||||
+ LOGGING-189: Fix Import-Package entry for org.slf4j #188.
|
||||
- Includes changes from 1.3.0
|
||||
* New Features:
|
||||
+ Add support for Log4j API and SLF4J #177.
|
||||
+ Deprecate org.apache.commons.logging.impl.WeakHashtable
|
||||
without replacement. LOGGING-188: Deprecate and disable
|
||||
`Jdk13LumberjackLogger` and `Log4JLogger`. LOGGING-173:
|
||||
+ Deprecate and disable `AvalonLogger` and `LogKitLogger`.
|
||||
+ LOGGING-165: Add Automatic-Module-Name Manifest Header for
|
||||
Java 9 compatibility.
|
||||
* Fixed Bugs:
|
||||
+ LOGGING-163: BufferedReader is not closed properly.
|
||||
+ LOGGING-177: Remove redundant initializer #46
|
||||
+ Use a weak reference for the cached class loader #71.
|
||||
+ Add more entries to .gitignore file #25.
|
||||
+ Minor Improvements #34.
|
||||
+ [StepSecurity] ci: Harden GitHub Actions #145.
|
||||
+ LOGGING-185: Replace custom code with `ServiceLoader` call.
|
||||
+ Fix possible NPEs in LogFactoryImpl.
|
||||
+ LOGGING-185: Fix failing tests #180.
|
||||
+ Deprecate LogConfigurationException.cause in favor of
|
||||
getCause().
|
||||
+ Fix SpotBugs [ERROR] High: Found reliance on default encoding
|
||||
in org.apache.commons.logging.LogFactory.initDiagnostics():
|
||||
new java.io.PrintStream(OutputStream)
|
||||
[org.apache.commons.logging.LogFactory] At
|
||||
LogFactory.java:[line 1205] DM_DEFAULT_ENCODING.
|
||||
+ Fix SpotBugs [ERROR] Medium: Class
|
||||
org.apache.commons.logging.impl.WeakHashtable defines
|
||||
non-transient non-serializable instance field queue
|
||||
[org.apache.commons.logging.impl.WeakHashtable] In
|
||||
WeakHashtable.java SE_BAD_FIELD.
|
||||
+ Set java.logging as optional module #183.
|
||||
+ Fix SpotBugs [ERROR] Medium: Switch statement found in
|
||||
org.apache.commons.logging.impl.SimpleLog.log(int, Object,
|
||||
Throwable) where default case is missing
|
||||
[org.apache.commons.logging.impl.SimpleLog] At
|
||||
SimpleLog.java:[lines 505-522] SF_SWITCH_NO_DEFAULT.
|
||||
+ Deprecate
|
||||
org.apache.commons.logging.impl.Jdk13LumberjackLogger.dummyLevel
|
||||
without replacement.
|
||||
- Remove deprecated patch files:
|
||||
* commons-logging-1.1.3-src-junit.diff
|
||||
* commons-logging-1.2-sourcetarget.patch
|
||||
* commons-logging-manifests.patch
|
||||
* no-tests.patch
|
||||
- Reinstate ant build (removed upstream)
|
||||
* add build.xml
|
||||
* add build.properties
|
||||
- Remove unnecessary dependencies
|
||||
* add commons-logging-1.3.3-dependencies.patch
|
||||
- Add upstream dev's public key to apache-commons-logging.keyring
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 20 10:19:08 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %autosetup macro. Allows to eliminate the usage of deprecated
|
||||
%patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 22 19:04:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Do not build against the log4j12 packages, use the new reload4j
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 28 07:28:43 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Disable tests everywhere, not only for arm6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 24 09:22:40 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch
|
||||
* no-tests.patch
|
||||
+ ignore failing tests for arm6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 1 08:45:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against the new compatibility log4j12-mini package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 25 17:45:27 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Remove pom parent, since we don't use it when not building with
|
||||
maven
|
||||
- Use the pom.xml distributed with the package instead of
|
||||
downloading the same file as a separate source
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 06:47:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Build against glassfish-servlet-api
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 28 12:43:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* commons-logging-manifests.patch
|
||||
+ Different Bundle-SymbolicName for different jars
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Cleanup of maven pom files installation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
|
||||
|
||||
- Modified patch:
|
||||
* commons-logging-1.2-sourcetarget.patch
|
||||
+ Build with source and target 8 to prepare for a possible
|
||||
removal of 1.6 compatibility
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 7 12:07:36 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Added patch:
|
||||
* commons-logging-1.2-sourcetarget.patch
|
||||
- set java source and target versions to 1.6 in order to allow
|
||||
build with jdk9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 11:03:15 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Remove bootstrap conditional
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 10:51:10 UTC 2017 - pcervinka@suse.com
|
||||
|
||||
- New build dependency: javapackages-local
|
||||
- Fixed requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 24 13:55:36 UTC 2016 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 1.2
|
||||
see http://commons.apache.org/proper/commons-logging/changes-report.html
|
||||
or RELEASE-NOTES.txt for details
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 09:20:20 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Drop maven conditionals that were never triggered.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 09:16:56 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Drop gpg offline and rely on service
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 18 09:46:00 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Fix build with new javapackages-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 4 10:31:13 UTC 2015 - tchvatal@suse.com
|
||||
|
||||
- Use log4j-mini to hopefully avoid build-cycle
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 20 15:14:30 UTC 2015 - dmacvicar@suse.de
|
||||
|
||||
- add the log4j adapter to commons-logging-adapters
|
||||
(bnc#918852)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 12 11:10:06 UTC 2014 - lnussel@suse.de
|
||||
|
||||
- add bcond java_bootstrap to build without unit tests
|
||||
(commons-logging-1.1.3-src-junit.diff)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 27 13:22:19 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Provides obsoletes to be versioned
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 9 11:04:11 UTC 2013 - tchvatal@suse.com
|
||||
|
||||
- Move from jpackage-utils to javapackage-tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 27 08:51:35 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- update to 1.1.3 (bugfix release)
|
||||
see http://commons.apache.org/proper/commons-logging/changes-report.html
|
||||
or RELEASE-NOTES.txt for details
|
||||
- add gpg verification
|
||||
- use new add_maven_depmap from javapackages-tools
|
||||
- dropped unecessary patches/sources
|
||||
* build.xml.patch
|
||||
* commons-logging-eclipse-manifest.patch
|
||||
* commons-logging-maven-release-plugin.patch
|
||||
* and commons-logging.depmap
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 2 13:39:00 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- provide commons-logging
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 13:50:53 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- fix build cycle, do not require avalon-* for build and use servletapi5
|
||||
instead of tomcat6 package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 8 14:16:04 UTC 2012 - mvyskocil@suse.cz
|
||||
|
||||
- rename to apache-commons-logging to follow jpackage and Fedora
|
||||
- update to 1.1.1 (bugfix release)
|
||||
* usable under security policy (catches SecurityException)
|
||||
* show content of chained exceptions
|
||||
* fix unit tests on linux an java6
|
||||
* provide maven2 pom file
|
||||
* fix thread-safety bug
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 27 20:32:52 UTC 2011 - andrea.turrini@gmail.com
|
||||
|
||||
- fixed typos in jakarta-commons-logging.spec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 16 13:01:14 CEST 2008 - coolo@suse.de
|
||||
|
||||
- trying to reduce build requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 8 16:43:03 CEST 2007 - kesselborn@suse.de
|
||||
|
||||
- remove avalon references ... avalon is dropped and support for it hence not needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 25 13:26:40 CEST 2006 - skh@suse.de
|
||||
|
||||
- fix BuildRequires
|
||||
- don't use icecream
|
||||
- use source="1.4" and target="1.4" for build with java 1.5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:46:38 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 27 17:00:36 CEST 2005 - jsmeix@suse.de
|
||||
|
||||
- Adjustments in the spec file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 18 16:23:44 CEST 2005 - jsmeix@suse.de
|
||||
|
||||
- Current version 1.0.4 from JPackage.org
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 16 14:43:22 CEST 2004 - skh@suse.de
|
||||
|
||||
- Fix prerequires of javadoc subpackage
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 5 20:21:48 CEST 2004 - skh@suse.de
|
||||
|
||||
- Initial package created with version 1.0.4 (JPackage 1.5)
|
||||
|
||||
109
apache-commons-logging.keyring
Normal file
109
apache-commons-logging.keyring
Normal file
@ -0,0 +1,109 @@
|
||||
pub 4096R/99945293 2012-01-19
|
||||
uid Thomas Neidhart <thomas.neidhart@gmail.com>
|
||||
uid Thomas Neidhart (CODE SIGNING KEY) <tn@apache.org>
|
||||
sub 4096R/264EE073 2012-01-19
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
mQINBE8YNGIBEADEgcfvs8TL3X2Ql62HJ6SrXWAOoHw5CquJxUQkvBGesIT1Hk24
|
||||
exiPwrlNE1qUjbVlef1Cwk9ZfwMOpJdfP2MQQbx0nxxqv+JtsoeXUy9bTSvZYBUL
|
||||
9yCmLEVzzSt4VCStMdPmXQGLvn0JV0e6LmDFv5+UfOR+qxjyNXfeF93W7ndVFA/o
|
||||
YoYgMJN26Xneb+r9bx3rJcT1zbHYpqUqkswiQ9cZSApe5GHkDqOvu/lJnlFYfFiC
|
||||
+f0UiR2tEQtdIYy1Owkovcy81gMEKw5Mr49d6lrkQm+oES4ZHcCecZ3Y+z8V5Rqt
|
||||
qqlrV1IR960VxwhmUm1+VkxGeGClxCFF6Xo00wCWlcJ/BCAea7FXXr4QrF5a1oQb
|
||||
BDfoVDlXt2cl/0Qfo9gCivBbyZ2df883MmeG/Vc3IovAP7Snl0fkX4KgdrfWuISa
|
||||
nbARk5xsIxlfC0CsnFNU9CuNh+lg4gNV3E1BiCVEa+boy3XqvcfJIq4/ZiTUXyjq
|
||||
chI7QFHmBS+uhHGnTtqEAYzl8KgRQdHijgo2cUVw+it765tM17Ekk+NJV5oQ8C8u
|
||||
nlVS6YiWDiuaTfxZZicI3bOBq6kjTr/TZsv0ohhtbUh5JdSRKSxpK8vkWRnNP45W
|
||||
m9oFvUmI4X209lzFvu1t4/t33Xl0kzp+8q9Qs6tgnqCpSnxSbJY3MZb/QwARAQAB
|
||||
tCtUaG9tYXMgTmVpZGhhcnQgPHRob21hcy5uZWlkaGFydEBnbWFpbC5jb20+iQI6
|
||||
BBMBAgAkAhsDAh4BAheABQsJCAcDBRUKCQgLBRYCAwEABQJPGDXGAhkBAAoJEKQf
|
||||
E8mZlFKT/JkP/j77X9VQ7XjujaIPWTzgpZJx6aOzME48z6KPMDB+CE64Kd4nx3kD
|
||||
Z4HEK/5LJQaDp7lUMGeNR++5R73aYQ2aZCYiFT38PGPc3nuIv20IhYBuX9HiUcoo
|
||||
8dEmcd6zPRwZ/+5wiskr9OjF+QAjJmRmAYPMtCS5nCrXlNSYcV8nH091AdTj6d8l
|
||||
8G4u4SRswAI2HwfE1ynPWN2HxjgyoDQCD9H80OWGVP4PnScUrhwhqDJZgG0GXY/f
|
||||
VqcmGt91GSUAdKgaFHjorAuwRkV5yKZ+ZGCVKNFrEc7Yeai4cr0lj3fbDuCjYYmV
|
||||
1cS0qUV+UL1vdH08CmDko/8rZoblP/oY4q4LVqCudBdxnPBPdtUST2M7JSZ9npD/
|
||||
mKfaPApN6alrO1icJHI1CRoxj1QPzV1h7Gw1IdOOQMM4hxzH7Tcp/HK5cNXs7ASW
|
||||
fcX9Ad8Xp11eREzxun4u2kJ1EaA7tQAJySSK6oiQ2N9qHnGgMkQvGQn/foniXoqP
|
||||
d4vedSb+mYTulIE0YO05WGkgQb4sLDuRgzSG6CjJylRlSBZSuW7IuJTp+cvSfdRm
|
||||
HXow2xhtTb2YkAlZKo61T40o8l3yNgieMaotb5Fta6ZT2sfjVUV8jC2ETu4a1EQ+
|
||||
v6Og6MBoUMto/jWiar2xoF4fT/2ogL9KuOsgbQv4qP0kU1tAPd8RSW+AtDJUaG9t
|
||||
YXMgTmVpZGhhcnQgKENPREUgU0lHTklORyBLRVkpIDx0bkBhcGFjaGUub3JnPokC
|
||||
OAQTAQIAIgUCTxg1awIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQpB8T
|
||||
yZmUUpNI/xAAs7PW0CEi+tyCnqX6k1HtyR7D4gaMEkIvJlw7ecft3ucY5UIhNlYu
|
||||
lTr08TQ5iihRWAUcZQuZ8nhJSbX7hQwUuylpMeCvgH4QwDmADg/YwiwnMXOeutI4
|
||||
AF+Mo4mf93MS84cPLFsKdwjTHpQtL3tLajHZ5iFGYcVPzTUcqtcETvA5xB8TwugD
|
||||
KRTttb//5sJGmJdADZN6+SSRKq/apU33D868Q51XsBA24PUBwDz46p9rxsul5wLH
|
||||
SiYKqIeD2fzq4VmPBUBNp5lP2sEQ5uQSX9IsvWHFQnUYHZzEfijM6H+dE814O64v
|
||||
oSHqkyC5ZtUQURB8p8gUYNv4WQRKJ2sADsciOY4W6HDyns5uf9OAmvrTTr8iSDC8
|
||||
gBruX4CcIlIdALB6XX5uzIX0XeIafa3ZO3m5aoptHBDNtfTqBCXCvYyG4bf2ldsS
|
||||
CjDH2qR3BrdaFBbd9+0Ud+4HctnUkLDzwP1ufMotIQyyEi0vgq5j0JN9aeLu4zgC
|
||||
DXeknsviH8EQojwsVBOkMM/yT3/oPA2flQALX24qO//cSaWa69LCnNB19Vnxcb1M
|
||||
tikjn4zqjPtfozqowzGBY1BwJLZvJOZjVn2tzJK9DwlzQM68wXeHgtxBe1DT3tUh
|
||||
PcY3HDlhMkkJejbQa9xdqpSv2djanBrYc0Lnqe92H37nJJRPV5+jHFK5Ag0ETxg0
|
||||
YgEQALhmdEbatKzNuGj3hj1DKyNxvSlfYSyqohHTq7ODEKVy88BOgKX3Db93g6NG
|
||||
V/lP7bblRRuo5uxam4FD8HJzccUV0uUfEECgxmy2/UsMDT39nOt86d2MwNF7f960
|
||||
mfkpYAuMAvieqaKE7G4vPsOPx1S1TaCmKzu26Y9CDg6A6bKxYP9i4BdT65OrUSgD
|
||||
2cyc3s9t9wVZszmuYBMt4YwfvREm7gUyU3T9DVMN4iG6sZKkvAjW4brlg2JwrK/u
|
||||
HkmgGcJVWgreTxhUtjz1POZNRbfup9jAFQxvoOcenaAgHq7F25ePtZy4JkGupvfk
|
||||
T+ziYbLa+4n2JC2DpZrhCmaSiPoUQEuKkA8Ptb4aO7k9Gbrv9W9kTc6u/BnmJrRF
|
||||
bNOnYjsgUXFN+R2B1Bcunh5paD5Pd0tQfwn3eT5rGZPr2U6eSsuGwW51iC2X7/bN
|
||||
fJqUw90qL55JVNpG8UjT+ik5Mlt48A8z+SQA3NokSRVh+xmyLbfkSlogLrvYWf60
|
||||
qivtFMbkBVkObvJZxVVHwKmyzJBawiS0Mtc1odO1hFLmn9r0N7yFjz9m2+0y27MV
|
||||
X1NTh+m2h8UqX5FtqptdKqQC9BP6MtGyanMUkMS8zzPV1HIdMpVl0SOh9Jw/H0a5
|
||||
9ogKebQWGGJv3WV+9W89cLYVBi3gw71qKe+y2enkIn31tEHHABEBAAGJAh8EGAEC
|
||||
AAkFAk8YNGICGwwACgkQpB8TyZmUUpO/4g/7BH4Oorbk0FLr1NjcUUWqkJYnqHBB
|
||||
22EYp2Pdt7f/7CuPYB7uLVANy7uD7AfsmSLcZFd8RRwFF2LmhDxtCU6kgDsnRr+4
|
||||
4/XATnDfGAMyOPey8wDmZxSRyA0iHJ7ZY8ExNNeL9YdE5osv5/dQ0KAnrvQyjySm
|
||||
MUZrKEhJw58QJYFKJvPaO5LuQh3BB30wxJZiWW0Zlc/wjzT7Y6O8Pv/zYCGulJZu
|
||||
C2spdasCSGhz06d1ZM/RbUXLNgosf+5ll22ZoIKpsvIMidC335IzQpOPuOePthrJ
|
||||
UHf+EGpJDf56xoT12l5QwQSQCkhBYEWQX6gsNuZAHbuYOwMgwnpNxFBSpE/JYrcM
|
||||
HJ1Ab5FXPS4ClVr9PzU15m2ZHr3i6SIWLmPQzjEokYmSAj1zoFZrvMEW4UNWzB6D
|
||||
VX7G+VGgWIRB/LgDKsDs48z/kHwwvV/ciaGxUP62wwUbJWibDDskpeKvX55xbUW8
|
||||
BcTNbVHHk75fmzKRmKTugbMndok13bOAkOh9gxBHawKG/qj0GY9yxXPY671NNvQe
|
||||
i+reoOcEm7pv5Tnvg+HP9IcLe50Zp0X9xwPQ6ux3VnXoa4s1PqTGhb7++w+QF2Ja
|
||||
hE68a/9oR97XTe+8e1VFt+2eWD8lsvbx6avD2hwf9dvyqWO2sHjbmWE+Rn8VpJgX
|
||||
WVvXdM0hFPWrUzI=
|
||||
=ChmV
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
|
||||
pub 2048R/A11262CB 2011-04-12
|
||||
uid Gary David Gregory (Code signing key) <ggregory@apache.org>
|
||||
sig 3 A11262CB 2011-04-12 Gary David Gregory (Code signing key) <ggregory@apache.org>
|
||||
sub 2048R/AD3D7F94 2011-04-12
|
||||
sig A11262CB 2011-04-12 Gary David Gregory (Code signing key) <ggregory@apache.org>
|
||||
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1.4.11 (MingW32)
|
||||
|
||||
mQENBE2kzuwBCACYV+G9yxNkSjAKSji0B5ipMGM74JAL1Ogtcu+993pLHHYsdXri
|
||||
WWXi37x9PLjeHxw63mN26SFyrbMJ4A8erLB03PDjw0DEzAwiu9P2vSvL/RFxGBbk
|
||||
cM0BTNXNR1rk8DpIzvXtejp8IHtD1qcDLTlJ8D0W3USebShDPo6NmMxTNuH0u99B
|
||||
WHCMAdSa34wsg0ZpffwQmRxeA+ebrf2ydKupGkeZsKjkLlaXNkTVp1ghn5ts/lvg
|
||||
KeHv1SJivWKCRmFlbPhBK4+mxSUSOPdoBNAfxA51QzZoPizSk0VbRz3YufYRVLFy
|
||||
9vqPSorDmYJhCvn3f6+A38FS/j8VE+8obQ2rABEBAAG0O0dhcnkgRGF2aWQgR3Jl
|
||||
Z29yeSAoQ29kZSBzaWduaW5nIGtleSkgPGdncmVnb3J5QGFwYWNoZS5vcmc+iQE4
|
||||
BBMBAgAiBQJNpM7sAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCG/cfi
|
||||
oRJiy2vXCACU6jW2+XIWuWBKSmeowBMxlUMJFSq7QjLt+o6B1ZYClbzBLDKcxlnS
|
||||
dF6v0jLhp71LozTde+HFI4/qIv6OO4UaGHin8Z1rNU/i5L07HkhLxcrbDoWhaSGD
|
||||
buRsWCv9ljm5GCXyK9s6Uj7d4af9mDWaGhNFJJFIs+yqOvTwffoaB7y+2a1YWStZ
|
||||
ZXDJ0KiHdY7xQ7bbYR/61MgvJslF1uX+u4jLTNmbU0tCXLtUrLd2VbJiAMFezqy6
|
||||
hV/ZxQLZoBPpr3FYhR2SIzNhQ30nj9AVcPgCCuLD49nx6Ad5CpcP8sTwb4aWk9GK
|
||||
+Uu3Bfz4jTAvd9Q7TsRMt3NV+7sOGD4vuQENBE2kzuwBCACzeGpkd6X/xTfKDBWv
|
||||
XgHOOKIJ2pht9XmtZZKiIj7LIiSwvSds/ZkoZKxAm7AY+KPh8Xjf968FtoUBQJvH
|
||||
AG4rbowEqT7OOrJae2JcenH5qzaod7TpIPQVv+Ysz8I1wLlC6LzKRj1X99Hng6X+
|
||||
obsEasnPbmEEkuiZ/Sgi4vVC8SHkDmYt1Dx8jDgm53oUeWkEJO9LSI2zcrZhSgvg
|
||||
1xa4Q4gY5UUK7gE4LbmGCjFlATuuW/0sryxu8zxph15gkn4Nqgk0CPMSjesMYEGO
|
||||
sdDzfQXl2tXbt+Pe6mBoWh67MZ1v5zOq3EDtoSqDpWPxponAeaCuNDDFX44vGjfx
|
||||
GE0tABEBAAGJAR8EGAECAAkFAk2kzuwCGwwACgkQhv3H4qESYsvEMAf/VGyqIEcw
|
||||
4T2D3gZZ3ITkeoBevQdxBT/27xNvoWOZyGSzGYlRbRQrlo+uZsjfMc9MNvaSmxyy
|
||||
4gLVbcdvQr3PF//GxphJ98W8pk9l+M57jfyHnnCumn7MO4o9ed+WuigN5oeuNJ6B
|
||||
Iq3ff2o1DsrEvDChYOJEOeFuWxv+u7I2ABJJep7NbByM2n9PE8vlGU3zUBgWUBsk
|
||||
6jT+klKnEyHE76WzegPLz3jtElTuyB7jRhjyQJu1yiJEMbs2zH8aJGObi5f8Jum4
|
||||
tILZuEAdoI0M3c3VRq12cz/vLy+9VXa/s//8IsGn88kjyyYqOy8WJEjoOXFh++dp
|
||||
WiM7nZkgQcNi5A==
|
||||
=0UFs
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
104
apache-commons-logging.spec
Normal file
104
apache-commons-logging.spec
Normal file
@ -0,0 +1,104 @@
|
||||
#
|
||||
# spec file for package apache-commons-logging
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2000-2007, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define base_name logging
|
||||
%define short_name commons-%{base_name}
|
||||
Name: apache-%{short_name}
|
||||
Version: 1.3.4
|
||||
Release: 0
|
||||
Summary: Apache Commons Logging
|
||||
License: Apache-2.0
|
||||
URL: https://commons.apache.org/%{base_name}
|
||||
Source0: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
||||
Source1: https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
|
||||
Source2: %{name}.keyring
|
||||
Source5: build.xml
|
||||
Source6: build.properties
|
||||
Patch0: commons-logging-1.3.3-dependencies.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: glassfish-servlet-api
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: reload4j
|
||||
Requires: java >= 1.8
|
||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} < %{version}
|
||||
Provides: %{short_name} = %{version}-%{release}
|
||||
Obsoletes: %{short_name} < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
The commons-logging package provides a simple, component oriented
|
||||
interface (org.apache.commons.logging.Log) together with wrappers for
|
||||
logging systems. The user can choose at runtime which system they want
|
||||
to use. In addition, a small number of basic implementations are
|
||||
provided to allow users to use the package standalone.
|
||||
commons-logging was heavily influenced by Avalon's Logkit and Log4J. The
|
||||
commons-logging abstraction is meant to minimize the differences between
|
||||
the two, and to allow a developer to not tie himself to a particular
|
||||
logging implementation.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{short_name}-%{version}-src
|
||||
|
||||
cp %{SOURCE5} build.xml
|
||||
cp %{SOURCE6} build.properties
|
||||
|
||||
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
|
||||
|
||||
%pom_remove_parent .
|
||||
|
||||
%build
|
||||
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
||||
mkdir -p $MAVEN_REPO_LOCAL
|
||||
|
||||
export CLASSPATH=$(build-classpath \
|
||||
plexus/ \
|
||||
):target/classes:target/test-classes
|
||||
ant \
|
||||
-Dmaven.mode.offline=true -lib %{_javadir} \
|
||||
-Dlog4j12.jar=$(find-jar reload4j/reload4j) -Dservletapi.jar=$(find-jar glassfish-servlet-api) \
|
||||
dist
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -d -m 755 %{buildroot}%{_javadir}
|
||||
install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
install -p -m 644 target/%{short_name}-api-%{version}.jar %{buildroot}%{_javadir}/%{name}-api.jar
|
||||
install -p -m 644 target/%{short_name}-adapters-%{version}.jar %{buildroot}%{_javadir}/%{name}-adapters.jar
|
||||
|
||||
pushd %{buildroot}%{_javadir}
|
||||
for jar in %{name}*; do
|
||||
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
||||
done
|
||||
popd
|
||||
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
%{mvn_install_pom} pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}.pom
|
||||
%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}","apache:%{short_name}"
|
||||
%add_maven_depmap %{short_name}:%{short_name}::api:%{version} %{short_name}-api.jar -a "%{short_name}:%{short_name}-api","org.apache.commons:%{short_name}-api","apache:%{short_name}-api"
|
||||
%add_maven_depmap %{short_name}:%{short_name}::adapters:%{version} %{short_name}-adapters.jar -a "%{short_name}:%{short_name}-adapters","org.apache.commons:%{short_name}-adapters","apache:%{short_name}-adapters"
|
||||
|
||||
%files -f .mfiles
|
||||
%{_javadir}/%{name}*.jar
|
||||
%license LICENSE.txt
|
||||
%doc PROPOSAL.html RELEASE-NOTES.txt NOTICE.txt
|
||||
|
||||
%changelog
|
||||
59
build.properties
Normal file
59
build.properties
Normal file
@ -0,0 +1,59 @@
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed with
|
||||
# this work for additional information regarding copyright ownership.
|
||||
# The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
# (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
######################################################################
|
||||
#
|
||||
# TO USE:
|
||||
#
|
||||
# Copy this file to build.properties and either
|
||||
#
|
||||
# a) Use 'ant getlibs' to populate the default directory
|
||||
# with dependencies
|
||||
# or b) Change the property values to appropriate values
|
||||
#
|
||||
########################################################################
|
||||
|
||||
# Apache Log4j 1.2.x series
|
||||
log4j12.jar=lib/log4j-1.2.12.jar
|
||||
|
||||
# Apache Log4j 1.3.x series
|
||||
# Note: Log4j 1.3 support not available in the 1.1 release
|
||||
#log4j13.jar=lib/log4j-1.3.0.jar
|
||||
|
||||
# logkit.jar - Avalon LogKit classes (see http://jakarta.apache.org/avalon)
|
||||
logkit.jar=lib/logkit-1.0.1.jar
|
||||
|
||||
# Avalon framework - used for wrapper for avalon framework logger
|
||||
avalon-framework.jar=lib/avalon-framework-4.1.3.jar
|
||||
|
||||
# ServletApi - used to build ServletContextCleaner class
|
||||
servletapi.jar=lib/servletapi-2.3.jar
|
||||
|
||||
#
|
||||
# if you want to run the test cases, junit needs to be in the classpath.
|
||||
# the build.xml uses a default value so you might not need to set this property.
|
||||
# Note that version junit 3.8 is required and 3.8.1 recommended.
|
||||
#
|
||||
junit.jar=lib/junit-3.8.1.jar
|
||||
|
||||
# Maven properties (for web site build)
|
||||
# Those committers using agents may like to use
|
||||
#maven.username=rdonkin
|
||||
#logging.cvs=lserver:rdonkin@cvs.apache.org:/home/cvs
|
||||
|
||||
|
||||
# The path to a 1.4 JSDK javac
|
||||
# Optional - used when building with a 1.2 JVM for releases
|
||||
# executable.javac1.4=/opt/java/jdks/j2sdk1.4.2_10/bin/javac
|
||||
811
build.xml
Normal file
811
build.xml
Normal file
@ -0,0 +1,811 @@
|
||||
<!--
|
||||
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
this work for additional information regarding copyright ownership.
|
||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
(the "License"); you may not use this file except in compliance with
|
||||
the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
-->
|
||||
|
||||
<!--
|
||||
- Ant build file for commons-logging.
|
||||
-
|
||||
- Quick build instructions:
|
||||
- * ant getlibs
|
||||
- * cp build.properties.sample build.properties
|
||||
- * ant -lib lib/junit-3.8.1.jar dist
|
||||
-
|
||||
- Note that this build file uses the optional <junit> task. While the
|
||||
- task "adapter" class comes by default with ant 1.6+, the junit libraries
|
||||
- (3.8.1 or later) are also required to be made available to ant. This
|
||||
- requires that you do one of the following:
|
||||
- * create directory ~/.ant/lib and place the junit jar there
|
||||
- * put the junit jar in $ANT_HOME/lib
|
||||
- * run ant as "ant -lib path-to-junit-jar"
|
||||
- * put the junit jar in $CLASSPATH
|
||||
-
|
||||
- Note when building JCL for release it is strongly recommended that a 1.2 JVM
|
||||
- is used for the main compile and the home.jdk4 property used to specify
|
||||
- the path to a 1.4 J2SDK. This will be used to compile those classes
|
||||
- which require the 1.4 API.
|
||||
-
|
||||
- $Id: build.xml 1608092 2014-07-05 18:11:22Z tn $
|
||||
-->
|
||||
|
||||
<project name="Logging" default="all" basedir=".">
|
||||
|
||||
|
||||
<!-- ========== Initialize Properties ===================================== -->
|
||||
|
||||
|
||||
<property file="build.properties"/> <!-- Component local -->
|
||||
<property file="../build.properties"/> <!-- Commons local -->
|
||||
<property file="${user.home}/build.properties"/> <!-- User local -->
|
||||
|
||||
|
||||
<!-- ========== External Dependencies ===================================== -->
|
||||
|
||||
|
||||
<!-- The directories corresponding to your necessary dependencies -->
|
||||
<property name="junit.home" value="/usr/local/junit3.5"/>
|
||||
<property name="jakarta.home" value="../.."/>
|
||||
<property name="commons.home" value="../.."/>
|
||||
|
||||
<!--
|
||||
- The names of the unit tests to run. By default all tests are run, but
|
||||
- this can be overridden from the command line by something like:
|
||||
- ant -Dtestmatch=**/FooTestCase test
|
||||
-->
|
||||
<property name="testmatch" value="**/*TestCase"/>
|
||||
|
||||
|
||||
<!-- ========== Derived Values ============================================ -->
|
||||
|
||||
|
||||
<!-- The locations of necessary jar files -->
|
||||
<property name="junit.jar" value="junit-3.8.1.jar"/>
|
||||
<property name="log4j12.jar" value="log4j-1.2.17.jar"/>
|
||||
<property name="log4j13.jar" value="log4j-1.3.0.jar"/>
|
||||
<property name="logkit.jar" value="logkit-1.0.1.jar"/>
|
||||
<property name="avalon-framework.jar" value="avalon-framework-4.1.5.jar"/>
|
||||
<property name="servletapi.jar" value="servletapi-2.3.jar"/>
|
||||
|
||||
|
||||
<!-- ========== Component Declarations ==================================== -->
|
||||
|
||||
|
||||
<!-- The name of this component -->
|
||||
<property name="component.name" value="logging"/>
|
||||
|
||||
<!-- The primary package name of this component -->
|
||||
<property name="component.package" value="org.apache.commons.logging"/>
|
||||
|
||||
<!-- The title of this component -->
|
||||
<property name="component.title" value="Logging Wrapper Library"/>
|
||||
|
||||
<!-- The current version number of this component -->
|
||||
<property name="component.version" value="1.3.4"/>
|
||||
|
||||
<!-- The base directory for compilation targets -->
|
||||
<property name="build.home" value="${basedir}/target"/>
|
||||
|
||||
<!-- The base directory for component configuration files -->
|
||||
<property name="conf.home" value="src/conf"/>
|
||||
|
||||
<!-- The base directory for distribution targets -->
|
||||
<property name="dist.home" value="dist"/>
|
||||
|
||||
<!-- The base directory for releases -->
|
||||
<property name="artifacts.home" value="artifacts"/>
|
||||
|
||||
<!-- The base directory for component sources -->
|
||||
<property name="source.home" value="src/main/java"/>
|
||||
|
||||
<!-- The base directory for unit test sources -->
|
||||
<property name="test.home" value="src/test/java"/>
|
||||
|
||||
<!-- The base directory for unit test resources -->
|
||||
<property name="test.resources" value="src/test/resources"/>
|
||||
|
||||
<!-- jar names -->
|
||||
<property name="core.jar.name" value="commons-${component.name}-${component.version}.jar"/>
|
||||
<property name="api.jar.name" value="commons-${component.name}-api-${component.version}.jar"/>
|
||||
<property name="adapters.jar.name" value="commons-${component.name}-adapters-${component.version}.jar"/>
|
||||
<property name="src.ide.name" value="commons-${component.name}-${component.version}-ide.zip"/>
|
||||
|
||||
<!-- dist names -->
|
||||
<!-- TODO: don't need windows property -->
|
||||
<property name="windows.dist.name" value="commons-${component.name}-${component.version}.zip"/>
|
||||
<property name="nix.dist.name" value="commons-${component.name}-${component.version}.tar.gz"/>
|
||||
|
||||
<!-- ========== Compiler Defaults ========================================= -->
|
||||
|
||||
<!-- Version of java class files to generate. -->
|
||||
<property name="target.version" value="8"/>
|
||||
|
||||
<!-- Version of java source to accept -->
|
||||
<property name="source.version" value="8"/>
|
||||
|
||||
<!-- Should Java compilations set the 'debug' compiler option? -->
|
||||
<property name="compile.debug" value="true"/>
|
||||
|
||||
<!-- Should Java compilations set the 'deprecation' compiler option? -->
|
||||
<property name="compile.deprecation" value="false"/>
|
||||
|
||||
<!-- Should Java compilations set the 'optimize' compiler option? -->
|
||||
<property name="compile.optimize" value="false"/>
|
||||
|
||||
<!-- Construct compile classpath -->
|
||||
<path id="compile.classpath">
|
||||
<pathelement location="${build.home}/classes"/>
|
||||
<!-- TODO: REMOVE JUNIT? -->
|
||||
<pathelement location="${junit.jar}"/>
|
||||
<pathelement location="${logkit.jar}"/>
|
||||
<pathelement location="${avalon-framework.jar}"/>
|
||||
<pathelement location="${servletapi.jar}"/>
|
||||
</path>
|
||||
|
||||
|
||||
<!-- ========== Test Execution Defaults =================================== -->
|
||||
<!-- TODO: REMOVE TEST STUFF, retain javadoc classpath -->
|
||||
|
||||
|
||||
<!--
|
||||
- Construct unit test classpath (generic tests).
|
||||
-
|
||||
- Note that unit tests that use the PathableTestSuite approach don't need
|
||||
- any of this (except junit). However unit tests that don't use PathableTestSuite
|
||||
- to configure their classpath will need the basic classes to be provided
|
||||
- via this mechanism.
|
||||
-->
|
||||
<path id="test.classpath">
|
||||
<pathelement location="${build.home}/classes"/>
|
||||
<pathelement location="${build.home}/tests"/>
|
||||
<pathelement location="${junit.jar}"/>
|
||||
<pathelement location="${logkit.jar}"/>
|
||||
<pathelement location="${avalon-framework.jar}"/>
|
||||
<pathelement location="${conf.home}"/>
|
||||
<pathelement location="${servletapi.jar}"/>
|
||||
</path>
|
||||
|
||||
<!-- Construct unit test classpath (Log4J tests) -->
|
||||
<path id="test.classpath.log4j13">
|
||||
<pathelement location="${build.home}/classes"/>
|
||||
<pathelement location="${build.home}/tests"/>
|
||||
<pathelement location="${junit.jar}"/>
|
||||
<pathelement location="${log4j13.jar}"/>
|
||||
</path>
|
||||
|
||||
<!-- Construct unit test classpath (Log4J tests) -->
|
||||
<path id="test.classpath.log4j12">
|
||||
<pathelement location="${build.home}/classes"/>
|
||||
<pathelement location="${build.home}/tests"/>
|
||||
<pathelement location="${junit.jar}"/>
|
||||
<pathelement location="${log4j12.jar}"/>
|
||||
</path>
|
||||
|
||||
<!-- Construct javadoc classpath -->
|
||||
<path id="javadoc.classpath">
|
||||
<path refid="compile.classpath"/>
|
||||
<pathelement location="${log4j12.jar}"/>
|
||||
</path>
|
||||
|
||||
<!-- Should all tests fail if one does? -->
|
||||
<property name="test.failonerror" value="true"/>
|
||||
|
||||
<!-- The test runner to execute -->
|
||||
<property name="test.runner" value="junit.textui.TestRunner"/>
|
||||
|
||||
<!-- libs to pass to the tests -->
|
||||
<property name="test.sysprops.testclasses" value="${build.home}/tests"/>
|
||||
<property name="test.sysprops.log4j12" value="${log4j12.jar}"/>
|
||||
<property name="test.sysprops.log4j13" value="${log4j13.jar}"/>
|
||||
<property name="test.sysprops.logkit" value="${logkit.jar}"/>
|
||||
<property name="test.sysprops.servlet-api" value="${servletapi.jar}"/>
|
||||
<property name="test.sysprops.commons-logging" value="${build.home}/${core.jar.name}"/>
|
||||
<property name="test.sysprops.commons-logging-api" value="${build.home}/${api.jar.name}"/>
|
||||
<property name="test.sysprops.commons-logging-adapters" value="${build.home}/${adapters.jar.name}"/>
|
||||
<propertyset id="test-lib-props">
|
||||
<propertyref prefix="test.sysprops."/>
|
||||
<mapper type="glob" from="test.sysprops.*" to="*"/>
|
||||
</propertyset>
|
||||
|
||||
<!-- ========== Executable Targets ======================================== -->
|
||||
|
||||
|
||||
<!--
|
||||
- Running this target will download all the necessary dependencies into the "lib" subdirectory.
|
||||
-->
|
||||
<property name="getlibs.base" value="http://repo1.maven.org/maven"/>
|
||||
<target name="getlibs">
|
||||
<mkdir dir="lib"/>
|
||||
<get dest="lib/junit-3.8.1.jar" src="${getlibs.base}/junit/jars/junit-3.8.1.jar"/>
|
||||
<get dest="lib/logkit-1.0.1.jar" src="${getlibs.base}/logkit/jars/logkit-1.0.1.jar"/>
|
||||
<get dest="lib/avalon-framework-4.1.3.jar" src="${getlibs.base}/avalon-framework/jars/avalon-framework-4.1.3.jar"/>
|
||||
<get dest="lib/log4j-1.2.12.jar" src="${getlibs.base}/log4j/jars/log4j-1.2.12.jar"/>
|
||||
<get dest="lib/servletapi-2.3.jar" src="${getlibs.base}/servletapi/jars/servletapi-2.3.jar"/>
|
||||
</target>
|
||||
|
||||
<target name="init"
|
||||
description="Initialize and evaluate conditionals">
|
||||
<echo message="-------- ${component.title} ${component.version} --------"/>
|
||||
<filter token="name" value="${component.name}"/>
|
||||
<filter token="package" value="${component.package}"/>
|
||||
<filter token="version" value="${component.version}"/>
|
||||
</target>
|
||||
|
||||
<target name="prepare" depends="init"
|
||||
description="Prepare build directory">
|
||||
|
||||
<echo>
|
||||
Log4j12: ${log4j12.jar}
|
||||
<!-- Note: log4j13 support is not available in the 1.1 release. -->
|
||||
<!--Log4j13: ${log4j13.jar}-->
|
||||
LogKit: ${logkit.jar}
|
||||
Avalon-Framework: ${avalon-framework.jar}
|
||||
</echo>
|
||||
|
||||
<mkdir dir="${build.home}"/>
|
||||
<mkdir dir="${build.home}/classes"/>
|
||||
<mkdir dir="${build.home}/conf"/>
|
||||
<mkdir dir="${build.home}/tests"/>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="static" depends="prepare"
|
||||
description="Copy static files to build directory">
|
||||
<tstamp/>
|
||||
<copy todir="${build.home}/conf" filtering="on">
|
||||
<fileset dir="${conf.home}" includes="*.properties"/>
|
||||
</copy>
|
||||
<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/MANIFEST.MF" filtering="on">
|
||||
<filterset>
|
||||
<filter token="bsn-extension" value=""/>
|
||||
</filterset>
|
||||
</copy>
|
||||
<mkdir dir="${build.home}/conf/tests"/>
|
||||
<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/tests/MANIFEST.MF" filtering="on">
|
||||
<filterset>
|
||||
<filter token="bsn-extension" value=".tests"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
<mkdir dir="${build.home}/conf/api"/>
|
||||
<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/api/MANIFEST.MF" filtering="on">
|
||||
<filterset>
|
||||
<filter token="bsn-extension" value=".api"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
<mkdir dir="${build.home}/conf/adapters"/>
|
||||
<copy file="${conf.home}/MANIFEST.MF" toFile="${build.home}/conf/adapters/MANIFEST.MF" filtering="on">
|
||||
<filterset>
|
||||
<filter token="bsn-extension" value=".adapters"/>
|
||||
</filterset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="compile" depends="static,compile-only"
|
||||
description="Compile shareable components"/>
|
||||
|
||||
<target name='discovery' depends='init'>
|
||||
<available property="jdk.1.4.present"
|
||||
classname="java.util.logging.Logger"/>
|
||||
|
||||
<available property="logkit.present"
|
||||
classpathref="compile.classpath"
|
||||
classname="org.apache.log.Logger"/>
|
||||
|
||||
<available property="avalon-framework.present"
|
||||
classpathref="compile.classpath"
|
||||
classname="org.apache.avalon.framework.logger.Logger"/>
|
||||
|
||||
<available file="${log4j12.jar}" property="log4j12.present"/>
|
||||
<available file="${log4j13.jar}" property="log4j13.present"/>
|
||||
<available file="${build.home}/docs" property="maven.generated.docs.present"/>
|
||||
</target>
|
||||
|
||||
<target name="log4j12-warning" unless='log4j12.present' depends='init,discovery'>
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
Log4j 1.2 not found: Cannot Build Log4JLogger
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
<target name="log4j13-warning" unless='log4j13.present' depends='init,discovery'>
|
||||
<!--
|
||||
- Note: log4j13 support is not available in the 1.1 release.
|
||||
- If we add it in a future release, the code below should be uncommented.
|
||||
-->
|
||||
<!--
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
Log4j 1.3 not found: Cannot Build Log4J13Logger
|
||||
</echo>
|
||||
-->
|
||||
</target>
|
||||
|
||||
<target name="logkit-warning" unless='logkit.present' depends='init,discovery'>
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
LogKit not found: Cannot Build LogKitLogger
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
<target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
Avalon-Framework not found: Cannot Build AvalonLogger
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
<target name="jdk1.4-warning" unless='jdk.1.4.present' depends='init,discovery'>
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
JDK 1.4 not present: Cannot Build Jdk14Logger
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
<target name="log4j12-test-warning" unless='log4j12.jar' depends='init,discovery'>
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
Log4J 1.2.x Jar not found: Cannot execute 1.2.x tests
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
<target name='warning'
|
||||
depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
|
||||
|
||||
<target name="compile-only"
|
||||
depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
|
||||
|
||||
<target name="show-lib-presence">
|
||||
<echo message="jdk.1.4.present=${jdk.1.4.present}"/>
|
||||
<echo message="log4j12.present=${log4j12.present}"/>
|
||||
<!-- Note: log4j13 support is not available in the 1.1 release. -->
|
||||
<!--<echo message="log4j13.present=${log4j13.present}"/>-->
|
||||
<echo message="logkit.present=${logkit.present}"/>
|
||||
<echo message="avalon-framework.present=${avalon-framework.present}"/>
|
||||
</target>
|
||||
|
||||
<target name="compile-non-log4j" depends="prepare,discovery">
|
||||
<!-- compile everything except Log4J classes -->
|
||||
<javac srcdir="${source.home}"
|
||||
destdir="${build.home}/classes"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
|
||||
<classpath refid="compile.classpath"/>
|
||||
|
||||
<exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
|
||||
|
||||
<exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
|
||||
unless="jdk.1.4.present"/>
|
||||
<exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
|
||||
unless="jdk.1.4.present"/>
|
||||
<exclude name="org/apache/commons/logging/impl/LogKitLogger.java"
|
||||
unless="logkit.present"/>
|
||||
<exclude name="org/apache/commons/logging/impl/AvalonLogger.java"
|
||||
unless="avalon-framework.present"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="compile-1.4" depends="prepare,discovery,compile-non-log4j" if='executable.javac1.4'>
|
||||
<!--
|
||||
- Compiles those classes which require a 1.4+ JSDK.
|
||||
- This target will only be executed when ant is running a pre-1.4 JVM
|
||||
- and the home.jdk4 property is set.
|
||||
- This configuration is typically used to create a release only.
|
||||
-->
|
||||
<echo message=""/>
|
||||
<echo message="************************************************************"/>
|
||||
<echo message=" Compiling 1.4 only classes using compiler@${executable.javac1.4}"/>
|
||||
<echo message="************************************************************"/>
|
||||
<echo message=""/>
|
||||
<javac srcdir="${source.home}"
|
||||
destdir="${build.home}/classes"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}"
|
||||
compiler='javac1.4'
|
||||
fork='yes'
|
||||
executable='${executable.javac1.4}'>
|
||||
|
||||
<classpath refid="compile.classpath"/>
|
||||
|
||||
<include name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
|
||||
unless="jdk.1.4.present"/>
|
||||
<include name="org/apache/commons/logging/impl/Jdk14Logger.java"
|
||||
unless="jdk.1.4.present"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="compile-log4j12" depends="prepare,discovery">
|
||||
<!-- compile the log4j1.2 support classes -->
|
||||
<javac srcdir="${source.home}"
|
||||
destdir="${build.home}/classes"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
|
||||
<classpath refid="compile.classpath"/>
|
||||
<classpath>
|
||||
<!--
|
||||
<pathelement refid="compile.classpath"/>
|
||||
<classpath refid="compile.classpath"/>
|
||||
-->
|
||||
<pathelement location="${log4j12.jar}"/>
|
||||
</classpath>
|
||||
|
||||
<include name="org/apache/commons/logging/impl/Log4JLogger.java"
|
||||
if="log4j12.present"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="compile-log4j13" depends="prepare,discovery">
|
||||
<!-- compile the log4j1.3 support classes -->
|
||||
<javac srcdir="${source.home}"
|
||||
destdir="${build.home}/classes"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
|
||||
<classpath refid="compile.classpath"/>
|
||||
<classpath>
|
||||
<pathelement location="${log4j13.jar}"/>
|
||||
</classpath>
|
||||
|
||||
<!--
|
||||
- Note: log4j13 support not available in 1.1 release. However if we do add it
|
||||
- in a future release, this entry will pick it up. In the meantime, this
|
||||
- simply compiles no classes.
|
||||
-->
|
||||
<include name="org/apache/commons/logging/impl/Log4J13Logger.java"
|
||||
if="log4j13.present"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="build-jar">
|
||||
<copy todir="${build.home}/classes" filtering="on">
|
||||
<fileset dir="${source.home}" excludes="**/*.java"/>
|
||||
</copy>
|
||||
<mkdir dir="${build.home}/classes/META-INF"/>
|
||||
<copy file="LICENSE.txt"
|
||||
todir="${build.home}/classes/META-INF"/>
|
||||
<copy file="NOTICE.txt"
|
||||
todir="${build.home}/classes/META-INF"/>
|
||||
|
||||
<jar jarfile="${build.home}/${core.jar.name}"
|
||||
basedir="${build.home}/classes"
|
||||
manifest="${build.home}/conf/MANIFEST.MF">
|
||||
<include name="org/apache/commons/logging/**" />
|
||||
<include name="META-INF/LICENSE.txt"/>
|
||||
<include name="META-INF/NOTICE.txt"/>
|
||||
<exclude name="**/package.html"/>
|
||||
</jar>
|
||||
|
||||
<jar jarfile="${build.home}/${api.jar.name}"
|
||||
basedir="${build.home}/classes"
|
||||
manifest="${build.home}/conf/api/MANIFEST.MF">
|
||||
<include name="org/apache/commons/logging/*.class" />
|
||||
<include name="org/apache/commons/logging/impl/LogFactoryImpl*.class" />
|
||||
<include name="org/apache/commons/logging/impl/WeakHashtable*.class" />
|
||||
<include name="org/apache/commons/logging/impl/SimpleLog*.class" />
|
||||
<include name="org/apache/commons/logging/impl/NoOpLog*.class" />
|
||||
<include name="org/apache/commons/logging/impl/Jdk14Logger.class" />
|
||||
<include name="META-INF/LICENSE.txt"/>
|
||||
<include name="META-INF/NOTICE.txt"/>
|
||||
<exclude name="**/package.html"/>
|
||||
</jar>
|
||||
|
||||
<jar jarfile="${build.home}/${adapters.jar.name}"
|
||||
basedir="${build.home}/classes"
|
||||
manifest="${build.home}/conf/adapters/MANIFEST.MF">
|
||||
<include name="org/apache/commons/logging/impl/**.class" />
|
||||
<include name="META-INF/LICENSE.txt"/>
|
||||
<include name="META-INF/NOTICE.txt"/>
|
||||
<exclude name="org/apache/commons/logging/impl/WeakHashtable*.class" />
|
||||
<exclude name="org/apache/commons/logging/impl/LogFactoryImpl*.class" />
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name='compile.jdk1.4.tests' if='jdk.1.4.present'>
|
||||
<javac srcdir="${test.home}"
|
||||
destdir="${build.home}/tests"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
<classpath refid="test.classpath"/>
|
||||
<include name='**/jdk14/**'/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name='compile.log4j.tests' if='log4j12.present'>
|
||||
<javac srcdir="${test.home}"
|
||||
destdir="${build.home}/tests"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
<classpath refid="test.classpath.log4j12"/>
|
||||
<include name='**/log4j/**'/>
|
||||
<!-- NOTE -->
|
||||
<!--
|
||||
Pathable tests do not reference the Log4J Logger directly
|
||||
but try to load them by reflection from particular loaders.
|
||||
They will therefore fail unless this logger is available.
|
||||
-->
|
||||
<include name='**/pathable/**'/>
|
||||
<!-- END NOTE -->
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
|
||||
<target name='compile.avalon.tests' if='avalon-framework.present'>
|
||||
<javac srcdir="${test.home}"
|
||||
destdir="${build.home}/tests"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
<classpath refid="test.classpath"/>
|
||||
<include name='**/avalon/**'/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name='compile.logkit.tests' if='logkit.present'>
|
||||
<javac srcdir="${test.home}"
|
||||
destdir="${build.home}/tests"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
<classpath refid="test.classpath"/>
|
||||
<include name='**/logkit/**'/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="compile.tests" depends="compile"
|
||||
description="Compile unit test cases">
|
||||
<javac srcdir="${test.home}"
|
||||
destdir="${build.home}/tests"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"
|
||||
source="${source.version}"
|
||||
target="${target.version}">
|
||||
<classpath refid="test.classpath"/>
|
||||
<exclude name='**/jdk14/**'/>
|
||||
<exclude name='**/log4j/**'/>
|
||||
<!-- NOTE -->
|
||||
<!--
|
||||
Pathable tests do not reference the Log4J Logger directly
|
||||
but try to load them by reflection from particular loaders.
|
||||
They will therefore fail unless this logger is available.
|
||||
-->
|
||||
<exclude name='**/pathable/**'/>
|
||||
<!-- END NOTE -->
|
||||
<exclude name='**/avalon/**'/>
|
||||
<exclude name='**/logkit/**'/>
|
||||
</javac>
|
||||
<antcall target='compile.log4j.tests'/>
|
||||
<antcall target='compile.jdk1.4.tests'/>
|
||||
<antcall target='compile.avalon.tests'/>
|
||||
<antcall target='compile.logkit.tests'/>
|
||||
<copy todir="${build.home}/tests" filtering="on">
|
||||
<fileset dir="${test.resources}" excludes="**/*.java"/>
|
||||
</copy>
|
||||
<jar jarfile="${build.home}/commons-${component.name}-tests.jar"
|
||||
basedir="${build.home}/tests"
|
||||
manifest="${build.home}/conf/tests/MANIFEST.MF">
|
||||
<exclude name="org/apache/commons/logging/Wrapper.class"/>
|
||||
<exclude name="org/apache/commons/logging/jdk14/TestHandler.class"
|
||||
if="jdk.1.4.present"/>
|
||||
</jar>
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<target name="clean" description="Clean build and distribution directories">
|
||||
<mkdir dir='${build.home}'/>
|
||||
<delete includeemptydirs='yes'>
|
||||
<fileset dir="${build.home}" excludes='docs/**/*'/>
|
||||
</delete>
|
||||
<delete dir="${dist.home}"/>
|
||||
<delete dir="${artifacts.home}"/>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="all" depends="clean,compile"
|
||||
description="Clean and compile all components"/>
|
||||
|
||||
|
||||
<target name="maven-docs-warning" unless="maven.generated.docs.present" depends="discovery">
|
||||
<echo>
|
||||
*** WARNING ***
|
||||
Maven generated documentation not found: Documentation distribution will be empty
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="dist" depends="all,maven-docs-warning"
|
||||
description="Create binary distribution">
|
||||
|
||||
<!--
|
||||
- Maven is used to generate the documentation.
|
||||
- However, we cannot assume that it has been run.
|
||||
- So, create the appropriate directories.
|
||||
-->
|
||||
<mkdir dir='${build.home}'/>
|
||||
<mkdir dir='${build.home}/docs'/>
|
||||
<mkdir dir='${build.home}/docs/apidocs'/>
|
||||
|
||||
<!--
|
||||
- Create a dist directory to hold all the files that go into a distribution.
|
||||
- Copy the needed files from the build directory to the dist directory.
|
||||
-->
|
||||
<mkdir dir="${dist.home}"/>
|
||||
<copy todir="${dist.home}">
|
||||
<fileset dir=".">
|
||||
<include name="LICENSE.txt"/>
|
||||
<include name="NOTICE.txt"/>
|
||||
<include name="RELEASE-NOTES.txt"/>
|
||||
</fileset>
|
||||
<fileset dir="${build.home}">
|
||||
<include name="${core.jar.name}"/>
|
||||
<include name="${api.jar.name}"/>
|
||||
<include name="${adapters.jar.name}"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Copy documentation generated by maven -->
|
||||
<mkdir dir="${dist.home}/docs"/>
|
||||
<copy todir="${dist.home}/docs">
|
||||
<fileset dir="${build.home}/docs"/>
|
||||
</copy>
|
||||
|
||||
<!--
|
||||
- And copy the source too; we don't have separate source and binary distributions
|
||||
- for logging; the source is so small there's little point.
|
||||
-->
|
||||
<mkdir dir="${dist.home}/src"/>
|
||||
<copy todir="${dist.home}/src" filtering="on">
|
||||
<fileset dir="${source.home}"/>
|
||||
</copy>
|
||||
<zip destfile='${dist.home}/${src.ide.name}'>
|
||||
<zipfileset dir='${dist.home}/src'/>
|
||||
<zipfileset dir='${dist.home}/docs/apidocs'/>
|
||||
<zipfileset dir='${dist.home}' prefix='META-INF'>
|
||||
<include name="LICENSE.txt"/>
|
||||
<include name="NOTICE.txt"/>
|
||||
</zipfileset>
|
||||
</zip>
|
||||
|
||||
<!-- Create release artifacts in the artifacts directory -->
|
||||
<mkdir dir="${artifacts.home}"/>
|
||||
<fixcrlf srcdir='${dist.home}' eol='dos' includes='**/*.txt,**/*.java,**/*.html'/>
|
||||
<zip destfile='${artifacts.home}/${windows.dist.name}'>
|
||||
<zipfileset dir='${dist.home}' prefix='commons-${component.name}-${component.version}'/>
|
||||
</zip>
|
||||
<fixcrlf srcdir='${dist.home}' eol='unix' includes='**/*.txt,**/*.java,**/*.html'/>
|
||||
<tar compression="gzip" destfile='${artifacts.home}/${nix.dist.name}' longfile='gnu'>
|
||||
<tarfileset dir='${dist.home}' prefix='commons-${component.name}-${component.version}'/>
|
||||
</tar>
|
||||
<copy todir="${artifacts.home}">
|
||||
<fileset dir="${build.home}">
|
||||
<include name="${core.jar.name}"/>
|
||||
<include name="${api.jar.name}"/>
|
||||
<include name="${adapters.jar.name}"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
|
||||
<!-- ========== Unit Test Targets ========================================= -->
|
||||
|
||||
|
||||
<!--
|
||||
- Target to run all unit tests.
|
||||
-
|
||||
- The batchtest task auto-detects what tests are available without
|
||||
- any need to define TestSuite objects in the code to compose
|
||||
- sets of tests to be run.
|
||||
-
|
||||
- Details of the unit test results for each TestCase will appear in
|
||||
- a file in directory ${build.home}/test-reports, together with any
|
||||
- output to stdout or stderr generated by the test code.
|
||||
-
|
||||
- If you're having problems running this target due to the use of
|
||||
- the "junit" task below, see the comments at the head of this file.
|
||||
-
|
||||
- Individual tests (or subsets of tests) can be run by doing
|
||||
- ant -Dtestmatch=**/FooTestCase testall
|
||||
-->
|
||||
|
||||
<target name="test" depends="log4j12-test-warning, compile.tests, junit-present"
|
||||
if="junit.present"
|
||||
description="Run all unit tests">
|
||||
<echo message="Test output can be found in directory ${build.home}/test-reports."/>
|
||||
<delete dir="${build.home}/test-reports"/>
|
||||
<mkdir dir="${build.home}/test-reports"/>
|
||||
|
||||
<echo message="executing tests [${testmatch}.java]"/>
|
||||
<!--
|
||||
- Note that the fork/forkmode settings define default behaviour for tests.
|
||||
- The <test> and <batchtest> tags can override these settings if needed.
|
||||
- The default settings cause a single VM to be created in which all of
|
||||
- the tests are then run.
|
||||
-->
|
||||
<junit printsummary="off" showoutput="no" fork="yes" forkmode="once" failureproperty="test.failure">
|
||||
<!-- plain output to file; brief output to console. -->
|
||||
<formatter type="plain"/>
|
||||
<formatter usefile="false" type="brief"/>
|
||||
|
||||
<!--
|
||||
- Provide a set of properties pointing to the logging libs for
|
||||
- the use of the PathableClassLoader class used by some unit tests.
|
||||
-->
|
||||
<syspropertyset refid="test-lib-props"/>
|
||||
<classpath refid="test.classpath"/>
|
||||
|
||||
<!--
|
||||
- Uncomment this to enable logging diagnostics for tests
|
||||
- <jvmarg value="-Dorg.apache.commons.logging.diagnostics.dest=STDERR"/>
|
||||
-->
|
||||
|
||||
<!--
|
||||
- Auto-detect the tests to run. Checking the ${build.home}/tests
|
||||
- directory for .class files rather than the src/test directory
|
||||
- for .java files means that when we run the tests on platforms
|
||||
- where some components (eg jdk14 logging) is not available,
|
||||
- just ensuring the tests are skipped from the compile will
|
||||
- also cause them to be skipped from the testing.
|
||||
-
|
||||
- This does introduce the danger that if tests accidentally
|
||||
- fail to compile then we won't notice it here. However that
|
||||
- should have been reported earlier anyway.
|
||||
-->
|
||||
<batchtest todir="${build.home}/test-reports">
|
||||
<fileset dir="${build.home}/tests">
|
||||
<include name="${testmatch}.class"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
|
||||
<fail if="test.failure">
|
||||
One or more unit tests failed.
|
||||
</fail>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" property="junit.present"/>
|
||||
</target>
|
||||
<target name="junit-present" depends="test-junit-present" unless="junit.present">
|
||||
<echo>================================= WARNING ================================</echo>
|
||||
<echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo>
|
||||
<echo>==========================================================================</echo>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
575
commons-logging-1.3.3-dependencies.patch
Normal file
575
commons-logging-1.3.3-dependencies.patch
Normal file
@ -0,0 +1,575 @@
|
||||
--- a/src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java
|
||||
+++ /dev/null
|
||||
@@ -1,239 +0,0 @@
|
||||
-/*
|
||||
- * Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
- * contributor license agreements. See the NOTICE file distributed with
|
||||
- * this work for additional information regarding copyright ownership.
|
||||
- * The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
- * (the "License"); you may not use this file except in compliance with
|
||||
- * the License. You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-package org.apache.commons.logging.impl;
|
||||
-
|
||||
-import java.io.IOException;
|
||||
-import java.util.concurrent.ConcurrentHashMap;
|
||||
-import java.util.concurrent.ConcurrentMap;
|
||||
-
|
||||
-import org.apache.commons.logging.Log;
|
||||
-import org.apache.commons.logging.LogFactory;
|
||||
-import org.apache.logging.log4j.Level;
|
||||
-import org.apache.logging.log4j.LogManager;
|
||||
-import org.apache.logging.log4j.Marker;
|
||||
-import org.apache.logging.log4j.MarkerManager;
|
||||
-import org.apache.logging.log4j.spi.AbstractLoggerAdapter;
|
||||
-import org.apache.logging.log4j.spi.ExtendedLogger;
|
||||
-import org.apache.logging.log4j.spi.LoggerAdapter;
|
||||
-import org.apache.logging.log4j.spi.LoggerContext;
|
||||
-import org.apache.logging.log4j.util.StackLocatorUtil;
|
||||
-
|
||||
-/**
|
||||
- * Logger factory hardcoded to send everything to Log4j API.
|
||||
- * <p>
|
||||
- * Based on the `log4j-jcl` artifact from Apache Logging Services.
|
||||
- * </p>
|
||||
- *
|
||||
- * @since 1.3.0
|
||||
- */
|
||||
-public final class Log4jApiLogFactory extends LogFactory {
|
||||
-
|
||||
- private static final class Log4j2Log implements Log {
|
||||
-
|
||||
- private static final String FQCN = Log4j2Log.class.getName();
|
||||
-
|
||||
- private final ExtendedLogger logger;
|
||||
-
|
||||
- public Log4j2Log(final ExtendedLogger logger) {
|
||||
- this.logger = logger;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void debug(final Object message) {
|
||||
- logIfEnabled(Level.DEBUG, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void debug(final Object message, final Throwable t) {
|
||||
- logIfEnabled(Level.DEBUG, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void error(final Object message) {
|
||||
- logIfEnabled(Level.ERROR, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void error(final Object message, final Throwable t) {
|
||||
- logIfEnabled(Level.ERROR, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void fatal(final Object message) {
|
||||
- logIfEnabled(Level.FATAL, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void fatal(final Object message, final Throwable t) {
|
||||
- logIfEnabled(Level.FATAL, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void info(final Object message) {
|
||||
- logIfEnabled(Level.INFO, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void info(final Object message, final Throwable t) {
|
||||
- logIfEnabled(Level.INFO, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isDebugEnabled() {
|
||||
- return isEnabled(Level.DEBUG);
|
||||
- }
|
||||
-
|
||||
- private boolean isEnabled(final Level level) {
|
||||
- return logger.isEnabled(level, MARKER, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isErrorEnabled() {
|
||||
- return isEnabled(Level.ERROR);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isFatalEnabled() {
|
||||
- return isEnabled(Level.FATAL);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isInfoEnabled() {
|
||||
- return isEnabled(Level.INFO);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isTraceEnabled() {
|
||||
- return isEnabled(Level.TRACE);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isWarnEnabled() {
|
||||
- return isEnabled(Level.WARN);
|
||||
- }
|
||||
-
|
||||
- private void logIfEnabled(final Level level, final Object message, final Throwable t) {
|
||||
- if (message instanceof CharSequence) {
|
||||
- logger.logIfEnabled(FQCN, level, MARKER, (CharSequence) message, t);
|
||||
- } else {
|
||||
- logger.logIfEnabled(FQCN, level, MARKER, message, t);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void trace(final Object message) {
|
||||
- logIfEnabled(Level.TRACE, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void trace(final Object message, final Throwable t) {
|
||||
- logIfEnabled(Level.TRACE, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void warn(final Object message) {
|
||||
- logIfEnabled(Level.WARN, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void warn(final Object message, final Throwable t) {
|
||||
- logIfEnabled(Level.WARN, message, t);
|
||||
- }
|
||||
- }
|
||||
- private static final class LogAdapter extends AbstractLoggerAdapter<Log> {
|
||||
-
|
||||
- @Override
|
||||
- protected LoggerContext getContext() {
|
||||
- return getContext(LogManager.getFactory().isClassLoaderDependent() ? StackLocatorUtil.getCallerClass(
|
||||
- LogFactory.class) : null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- protected Log newLogger(final String name, final LoggerContext context) {
|
||||
- return new Log4j2Log(context.getLogger(name));
|
||||
- }
|
||||
-
|
||||
- }
|
||||
-
|
||||
- private static final String[] EMPTY_ARRAY = {};
|
||||
-
|
||||
- /**
|
||||
- * Marker used by all messages coming from Apache Commons Logging.
|
||||
- */
|
||||
- private static final Marker MARKER = MarkerManager.getMarker("COMMONS-LOGGING");
|
||||
-
|
||||
- /**
|
||||
- * Caches Log instances
|
||||
- */
|
||||
- private final LoggerAdapter<Log> adapter = new LogAdapter();
|
||||
-
|
||||
- private final ConcurrentMap<String, Object> attributes = new ConcurrentHashMap<>();
|
||||
-
|
||||
- /**
|
||||
- * Constructs a new instance.
|
||||
- */
|
||||
- public Log4jApiLogFactory() {
|
||||
- // empty
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Object getAttribute(final String name) {
|
||||
- return attributes.get(name);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public String[] getAttributeNames() {
|
||||
- return attributes.keySet().toArray(EMPTY_ARRAY);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Log getInstance(final Class<?> clazz) {
|
||||
- return getInstance(clazz.getName());
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Log getInstance(final String name) {
|
||||
- return adapter.getLogger(name);
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * This method is supposed to clear all loggers. In this implementation it will clear all the logger
|
||||
- * wrappers but the loggers managed by the underlying logger context will not be.
|
||||
- */
|
||||
- @Override
|
||||
- public void release() {
|
||||
- try {
|
||||
- adapter.close();
|
||||
- } catch (final IOException ignored) {
|
||||
- // Ignore
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void removeAttribute(final String name) {
|
||||
- attributes.remove(name);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void setAttribute(final String name, final Object value) {
|
||||
- if (value != null) {
|
||||
- attributes.put(name, value);
|
||||
- } else {
|
||||
- removeAttribute(name);
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
--- a/src/main/java/org/apache/commons/logging/impl/Slf4jLogFactory.java
|
||||
+++ /dev/null
|
||||
@@ -1,330 +0,0 @@
|
||||
-/*
|
||||
- * Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
- * contributor license agreements. See the NOTICE file distributed with
|
||||
- * this work for additional information regarding copyright ownership.
|
||||
- * The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
- * (the "License"); you may not use this file except in compliance with
|
||||
- * the License. You may obtain a copy of the License at
|
||||
- *
|
||||
- * http://www.apache.org/licenses/LICENSE-2.0
|
||||
- *
|
||||
- * Unless required by applicable law or agreed to in writing, software
|
||||
- * distributed under the License is distributed on an "AS IS" BASIS,
|
||||
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
- * See the License for the specific language governing permissions and
|
||||
- * limitations under the License.
|
||||
- */
|
||||
-package org.apache.commons.logging.impl;
|
||||
-
|
||||
-import static org.slf4j.spi.LocationAwareLogger.DEBUG_INT;
|
||||
-import static org.slf4j.spi.LocationAwareLogger.ERROR_INT;
|
||||
-import static org.slf4j.spi.LocationAwareLogger.INFO_INT;
|
||||
-import static org.slf4j.spi.LocationAwareLogger.TRACE_INT;
|
||||
-import static org.slf4j.spi.LocationAwareLogger.WARN_INT;
|
||||
-
|
||||
-import java.util.concurrent.ConcurrentHashMap;
|
||||
-import java.util.concurrent.ConcurrentMap;
|
||||
-
|
||||
-import org.apache.commons.logging.Log;
|
||||
-import org.apache.commons.logging.LogConfigurationException;
|
||||
-import org.apache.commons.logging.LogFactory;
|
||||
-import org.slf4j.ILoggerFactory;
|
||||
-import org.slf4j.Logger;
|
||||
-import org.slf4j.LoggerFactory;
|
||||
-import org.slf4j.Marker;
|
||||
-import org.slf4j.MarkerFactory;
|
||||
-import org.slf4j.spi.LocationAwareLogger;
|
||||
-
|
||||
-/**
|
||||
- * Logger factory hardcoded to send everything to SLF4J.
|
||||
- *
|
||||
- * @since 1.3.0
|
||||
- */
|
||||
-public final class Slf4jLogFactory extends LogFactory {
|
||||
-
|
||||
- private static final class Slf4jLocationAwareLog implements Log {
|
||||
-
|
||||
- private static final String FQCN = Slf4jLocationAwareLog.class.getName();
|
||||
-
|
||||
- private final LocationAwareLogger logger;
|
||||
-
|
||||
- public Slf4jLocationAwareLog(final LocationAwareLogger logger) {
|
||||
- this.logger = logger;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void debug(final Object message) {
|
||||
- log(DEBUG_INT, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void debug(final Object message, final Throwable t) {
|
||||
- log(DEBUG_INT, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void error(final Object message) {
|
||||
- log(ERROR_INT, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void error(final Object message, final Throwable t) {
|
||||
- log(ERROR_INT, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void fatal(final Object message) {
|
||||
- error(message);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void fatal(final Object message, final Throwable t) {
|
||||
- error(message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void info(final Object message) {
|
||||
- log(INFO_INT, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void info(final Object message, final Throwable t) {
|
||||
- log(INFO_INT, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isDebugEnabled() {
|
||||
- return logger.isDebugEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isErrorEnabled() {
|
||||
- return logger.isErrorEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isFatalEnabled() {
|
||||
- return isErrorEnabled();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isInfoEnabled() {
|
||||
- return logger.isInfoEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isTraceEnabled() {
|
||||
- return logger.isTraceEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isWarnEnabled() {
|
||||
- return logger.isWarnEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- private void log(final int level, final Object message, final Throwable t) {
|
||||
- logger.log(MARKER, FQCN, level, String.valueOf(message), EMPTY_OBJECT_ARRAY, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void trace(final Object message) {
|
||||
- log(TRACE_INT, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void trace(final Object message, final Throwable t) {
|
||||
- log(TRACE_INT, message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void warn(final Object message) {
|
||||
- log(WARN_INT, message, null);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void warn(final Object message, final Throwable t) {
|
||||
- log(WARN_INT, message, t);
|
||||
- }
|
||||
- }
|
||||
- private static class Slf4jLog implements Log {
|
||||
-
|
||||
- private final Logger logger;
|
||||
-
|
||||
- public Slf4jLog(final Logger logger) {
|
||||
- this.logger = logger;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void debug(final Object message) {
|
||||
- logger.debug(MARKER, String.valueOf(message));
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void debug(final Object message, final Throwable t) {
|
||||
- logger.debug(MARKER, String.valueOf(message), t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void error(final Object message) {
|
||||
- logger.error(MARKER, String.valueOf(message));
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void error(final Object message, final Throwable t) {
|
||||
- logger.debug(MARKER, String.valueOf(message), t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void fatal(final Object message) {
|
||||
- error(message);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void fatal(final Object message, final Throwable t) {
|
||||
- error(message, t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void info(final Object message) {
|
||||
- logger.info(MARKER, String.valueOf(message));
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void info(final Object message, final Throwable t) {
|
||||
- logger.info(MARKER, String.valueOf(message), t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isDebugEnabled() {
|
||||
- return logger.isDebugEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isErrorEnabled() {
|
||||
- return logger.isErrorEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isFatalEnabled() {
|
||||
- return isErrorEnabled();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isInfoEnabled() {
|
||||
- return logger.isInfoEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isTraceEnabled() {
|
||||
- return logger.isTraceEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public boolean isWarnEnabled() {
|
||||
- return logger.isWarnEnabled(MARKER);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void trace(final Object message) {
|
||||
- logger.trace(MARKER, String.valueOf(message));
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void trace(final Object message, final Throwable t) {
|
||||
- logger.trace(MARKER, String.valueOf(message), t);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void warn(final Object message) {
|
||||
- logger.warn(MARKER, String.valueOf(message));
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void warn(final Object message, final Throwable t) {
|
||||
- logger.warn(MARKER, String.valueOf(message), t);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- private static final Object[] EMPTY_OBJECT_ARRAY = {};
|
||||
-
|
||||
- private static final String[] EMPTY_STRING_ARRAY = {};
|
||||
-
|
||||
- /**
|
||||
- * Marker used by all messages coming from Apache Commons Logging.
|
||||
- */
|
||||
- private static final Marker MARKER = MarkerFactory.getMarker("COMMONS-LOGGING");
|
||||
-
|
||||
- /**
|
||||
- * Caches Log instances.
|
||||
- * <p>
|
||||
- * The SLF4J reference implementation (Logback) has a single logger context, so each call to
|
||||
- * {@link #getInstance(String)}
|
||||
- * should give the same result.
|
||||
- * </p>
|
||||
- */
|
||||
- private final ConcurrentMap<String, Log> loggers = new ConcurrentHashMap<>();
|
||||
-
|
||||
- private final ConcurrentMap<String, Object> attributes = new ConcurrentHashMap<>();
|
||||
-
|
||||
- /**
|
||||
- * Constructs a new instance.
|
||||
- */
|
||||
- public Slf4jLogFactory() {
|
||||
- // empty
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Object getAttribute(final String name) {
|
||||
- return attributes.get(name);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public String[] getAttributeNames() {
|
||||
- return attributes.keySet().toArray(EMPTY_STRING_ARRAY);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Log getInstance(final Class<?> clazz) throws LogConfigurationException {
|
||||
- return getInstance(clazz.getName());
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Log getInstance(final String name) {
|
||||
- return loggers.computeIfAbsent(name, n -> {
|
||||
- final Logger logger = LoggerFactory.getLogger(n);
|
||||
- return logger instanceof LocationAwareLogger ? new Slf4jLocationAwareLog((LocationAwareLogger) logger) : new Slf4jLog(
|
||||
- logger);
|
||||
- });
|
||||
- }
|
||||
-
|
||||
- /**
|
||||
- * This method is supposed to clear all loggers.
|
||||
- * <p>
|
||||
- * In this implementation it calls a "stop" method if the logger factory supports it. This is the case of
|
||||
- * Logback.
|
||||
- * </p>
|
||||
- */
|
||||
- @Override
|
||||
- public void release() {
|
||||
- final ILoggerFactory factory = LoggerFactory.getILoggerFactory();
|
||||
- try {
|
||||
- factory.getClass().getMethod("stop").invoke(factory);
|
||||
- } catch (final ReflectiveOperationException ignored) {
|
||||
- // empty
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void removeAttribute(final String name) {
|
||||
- attributes.remove(name);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void setAttribute(final String name, final Object value) {
|
||||
- if (value != null) {
|
||||
- attributes.put(name, value);
|
||||
- } else {
|
||||
- removeAttribute(name);
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
3
commons-logging-1.3.3-src.tar.gz
Normal file
3
commons-logging-1.3.3-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:21e8445d9fc6f0d5e45f67b059808bd3b90bf07b7ad658fd1b3e597acd7f44ee
|
||||
size 194860
|
||||
11
commons-logging-1.3.3-src.tar.gz.asc
Normal file
11
commons-logging-1.3.3-src.tar.gz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmaBqTIACgkQhv3H4qES
|
||||
YstuPQf/Za1DHg/M/4Jp51+47XXmNix01mBikDFNe9kviyDhJNKE/jAePtRMuYAB
|
||||
trazgtgupfuBOfdgh9ILve0ZFpBqWw7oEoUgGvKF6FBNlsEVXmQIUPVNV2RX6cdh
|
||||
mxFSeSKhlmZ6vkeCbicxlVNYHA/4nUivgwpZQM7FNWhDzv4BgupSNN0BC1nQMaPu
|
||||
nSExYvzfOWsaHsawhi+FP949B39cSezdUTFA3Rc0JEusXYNhbrnfhCBv8lfaH8xn
|
||||
S7nEGGjFH1GMZvGOPJEbdzllx6M0ugaEpf+lX/zAREc0zXt8PmP9rZTzvixW2kNw
|
||||
WwqBEWF0Udbv3dlPwOaO1/53va7ukA==
|
||||
=XlNv
|
||||
-----END PGP SIGNATURE-----
|
||||
3
commons-logging-1.3.4-src.tar.gz
Normal file
3
commons-logging-1.3.4-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7fd379e34abb5b8f1d1792d3125584003a25926ba7f68f68f6db30e5e505aa0a
|
||||
size 195717
|
||||
11
commons-logging-1.3.4-src.tar.gz.asc
Normal file
11
commons-logging-1.3.4-src.tar.gz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAma/SzoACgkQhv3H4qES
|
||||
YssgpggAgaocpsJDilcqkfdt316Bzl4qjH0ldlvO1PvfzFpOH0CEKIqimTLHkUhJ
|
||||
ZLnvGPpGnn107OJQMZEsjBQhhPOYyLMZEkFIUan60p30ZrRcAtpszqOBcBAH67L0
|
||||
sdhHQTsbNAjizbXgxYt/ROMcg0OFgY4gcLkZSAuR3vIeFldrmzjjcGMsNS14OI65
|
||||
aJZHBPKwrNUeYiSAHuTqIXDkC4xjerDMK8cjDNwBzYiDmwpVr/VKH+pdpqiZjxuG
|
||||
xUyXN8W496H2PYpxVDhapKOzU05Wyq3NZ0vvNTrqgp5aBipYW5p/ADTG/Bkd2+yY
|
||||
/KyxVcOZaYuS5yhF/MlDyCgmqmQHfQ==
|
||||
=22cX
|
||||
-----END PGP SIGNATURE-----
|
||||
165
commons-logging-api-1.1.pom
Normal file
165
commons-logging-api-1.1.pom
Normal file
@ -0,0 +1,165 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>commons-logging</groupId>
|
||||
<artifactId>commons-logging-api</artifactId>
|
||||
<name>Logging</name>
|
||||
<version>1.1</version>
|
||||
<description>Commons Logging is a thin adapter allowing configurable bridging to other,
|
||||
well known logging systems.</description>
|
||||
<url>http://jakarta.apache.org/commons/logging/</url>
|
||||
<issueManagement>
|
||||
<url>http://issues.apache.org/jira/browse/LOGGING</url>
|
||||
</issueManagement>
|
||||
<ciManagement>
|
||||
<notifiers>
|
||||
<notifier>
|
||||
<configuration>
|
||||
<address>commons-dev@jakarta.apache.org</address>
|
||||
</configuration>
|
||||
</notifier>
|
||||
</notifiers>
|
||||
</ciManagement>
|
||||
<inceptionYear>2001</inceptionYear>
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Commons Dev List</name>
|
||||
<subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
|
||||
<unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
|
||||
</mailingList>
|
||||
<mailingList>
|
||||
<name>Commons User List</name>
|
||||
<subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
|
||||
<unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
|
||||
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
<developers>
|
||||
<developer>
|
||||
<id>morgand</id>
|
||||
<name>Morgan Delagrange</name>
|
||||
<email>morgand at apache dot org</email>
|
||||
<organization>Apache</organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rwaldhoff</id>
|
||||
<name>Rodney Waldhoff</name>
|
||||
<email>rwaldhoff at apache org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>craigmcc</id>
|
||||
<name>Craig McClanahan</name>
|
||||
<email>craigmcc at apache org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>sanders</id>
|
||||
<name>Scott Sanders</name>
|
||||
<email>sanders at apache dot org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rdonkin</id>
|
||||
<name>Robert Burrell Donkin</name>
|
||||
<email>rdonkin at apache dot org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>donaldp</id>
|
||||
<name>Peter Donald</name>
|
||||
<email>donaldp at apache dot org</email>
|
||||
<organization></organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>costin</id>
|
||||
<name>Costin Manolache</name>
|
||||
<email>costin at apache dot org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>rsitze</id>
|
||||
<name>Richard Sitze</name>
|
||||
<email>rsitze at apache dot org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>baliuka</id>
|
||||
<name>Juozas Baliuka</name>
|
||||
<email>baliuka@apache.org</email>
|
||||
<organization></organization>
|
||||
<roles>
|
||||
<role>Java Developer</role>
|
||||
</roles>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>skitching</id>
|
||||
<name>Simon Kitching</name>
|
||||
<email>skitching@apache.org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>dennisl</id>
|
||||
<name>Dennis Lundberg</name>
|
||||
<email>dennisl@apache.org</email>
|
||||
<organization>Apache Software Foundation</organization>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>bstansberry</id>
|
||||
<name>Brian Stansberry</name>
|
||||
</developer>
|
||||
</developers>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>The Apache Software License, Version 2.0</name>
|
||||
<url>/LICENSE.txt</url>
|
||||
</license>
|
||||
</licenses>
|
||||
<scm>
|
||||
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</connection>
|
||||
<url>http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk/</url>
|
||||
</scm>
|
||||
<organization>
|
||||
<name>The Apache Software Foundation</name>
|
||||
<url>http://jakarta.apache.org</url>
|
||||
</organization>
|
||||
<build>
|
||||
<sourceDirectory>src/java</sourceDirectory>
|
||||
<testSourceDirectory>src/test</testSourceDirectory>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-xdoc-plugin</artifactId>
|
||||
<version>1.9.2</version>
|
||||
<configuration>
|
||||
<optional>true</optional>
|
||||
<comment><strong>Site Only</strong> - v1.9.2 (minimum)</comment>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<scope>test</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>default</id>
|
||||
<name>Default Repository</name>
|
||||
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
|
||||
</repository>
|
||||
<site>
|
||||
<id>default</id>
|
||||
<name>Default Site</name>
|
||||
<url>scp://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
|
||||
</site>
|
||||
<status>converted</status>
|
||||
</distributionManagement>
|
||||
</project>
|
||||
Loading…
x
Reference in New Issue
Block a user