[libslf4j-java] 02/05: Merge tag 'upstream/1.7.12'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 29 09:39:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libslf4j-java.
commit 382251d02e4ea39312eff731526bebdde94f8ed3
Merge: 9871216 2e45769
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 29 11:12:52 2015 +0200
Merge tag 'upstream/1.7.12'
Upstream version 1.7.12
LICENSE.txt | 24 +
README.md | 14 +
integration/build.xml | 200 +++++
integration/osgi-build.xml | 92 +++
integration/pom.xml | 121 +++
integration/src/IBUNDLE-META-INF/MANIFEST.MF | 15 +
.../src/test/java/integrator/Activator.java | 60 ++
.../java/org/slf4j/CompatibilityAssertionTest.java | 61 ++
.../IncompatibleMultiBindingAssertionTest.java | 74 ++
.../slf4j/MissingSingletonMethodAssertionTest.java | 83 ++
.../java/org/slf4j/MultiBindingAssertionTest.java | 68 ++
.../src/test/java/org/slf4j/StringPrintStream.java | 56 ++
.../org/slf4j/VersionMismatchAssertionTest.java | 67 ++
.../test/java/org/slf4j/test_osgi/BundleTest.java | 59 ++
.../slf4j/test_osgi/CheckingBundleListener.java | 66 ++
.../test/java/org/slf4j/test_osgi/FelixHost.java | 119 +++
.../slf4j/test_osgi/FrameworkErrorListener.java | 62 ++
jcl-over-slf4j/pom.xml | 65 ++
.../main/java/org/apache/commons/logging/Log.java | 217 ++++++
.../commons/logging/LogConfigurationException.java | 93 +++
.../org/apache/commons/logging/LogFactory.java | 408 ++++++++++
.../org/apache/commons/logging/impl/NoOpLog.java | 145 ++++
.../logging/impl/SLF4JLocationAwareLog.java | 254 +++++++
.../org/apache/commons/logging/impl/SLF4JLog.java | 251 ++++++
.../commons/logging/impl/SLF4JLogFactory.java | 219 ++++++
.../org/apache/commons/logging/impl/SimpleLog.java | 683 +++++++++++++++++
.../org/apache/commons/logging/impl/package.html | 5 +
.../java/org/apache/commons/logging/package.html | 169 +++++
.../src/main/resources/META-INF/MANIFEST.MF | 9 +
.../services/org.apache.commons.logging.LogFactory | 5 +
.../org/apache/commons/logging/InvokeJCLTest.java | 83 ++
.../commons/logging/impl/SerializationTest.java | 89 +++
jul-to-slf4j/pom.xml | 64 ++
.../java/org/slf4j/bridge/SLF4JBridgeHandler.java | 303 ++++++++
.../src/main/java/org/slf4j/bridge/package.html | 15 +
.../src/main/resources/META-INF/MANIFEST.MF | 7 +
.../test/java/org/slf4j/bridge/ListAppender.java | 53 ++
.../slf4j/bridge/SLF4JBridgeHandlerPerfTest.java | 112 +++
.../org/slf4j/bridge/SLF4JBridgeHandlerTest.java | 181 +++++
.../org/slf4j/bridge/testLogStrings.properties | 3 +
log4j-over-slf4j/pom.xml | 63 ++
.../src/main/java/org/apache/log4j/Appender.java | 131 ++++
.../java/org/apache/log4j/AppenderSkeleton.java | 33 +
.../java/org/apache/log4j/BasicConfigurator.java | 31 +
.../src/main/java/org/apache/log4j/Category.java | 350 +++++++++
.../java/org/apache/log4j/ConsoleAppender.java | 20 +
.../main/java/org/apache/log4j/FileAppender.java | 31 +
.../src/main/java/org/apache/log4j/Layout.java | 27 +
.../src/main/java/org/apache/log4j/Level.java | 228 ++++++
.../java/org/apache/log4j/Log4jLoggerFactory.java | 77 ++
.../src/main/java/org/apache/log4j/LogManager.java | 87 +++
.../src/main/java/org/apache/log4j/Logger.java | 84 ++
.../src/main/java/org/apache/log4j/MDC.java | 64 ++
.../src/main/java/org/apache/log4j/NDC.java | 102 +++
.../main/java/org/apache/log4j/PatternLayout.java | 35 +
.../src/main/java/org/apache/log4j/Priority.java | 170 +++++
.../org/apache/log4j/PropertyConfigurator.java | 52 ++
.../java/org/apache/log4j/RollingFileAppender.java | 49 ++
.../main/java/org/apache/log4j/SimpleLayout.java | 19 +
.../main/java/org/apache/log4j/WriterAppender.java | 20 +
.../main/java/org/apache/log4j/helpers/LogLog.java | 161 ++++
.../org/apache/log4j/helpers/NullEnumeration.java | 47 ++
.../src/main/java/org/apache/log4j/package.html | 18 +
.../java/org/apache/log4j/spi/Configurator.java | 52 ++
.../java/org/apache/log4j/spi/ErrorHandler.java | 27 +
.../src/main/java/org/apache/log4j/spi/Filter.java | 20 +
.../apache/log4j/spi/HierarchyEventListener.java | 38 +
.../src/main/java/org/apache/log4j/spi/Layout.java | 20 +
.../java/org/apache/log4j/spi/LoggerFactory.java | 36 +
.../org/apache/log4j/spi/LoggerRepository.java | 95 +++
.../java/org/apache/log4j/spi/LoggingEvent.java | 20 +
.../java/org/apache/log4j/spi/OptionHandler.java | 22 +
.../java/org/apache/log4j/xml/DOMConfigurator.java | 66 ++
.../src/main/resources/META-INF/MANIFEST.MF | 8 +
.../src/test/java/org/apache/log4j/NDCTest.java | 60 ++
.../src/test/java/org/apache/log4j/Trivial.java | 51 ++
.../src/test/java/org/dummy/Bug131.java | 68 ++
.../src/test/java/org/dummy/Bug139.java | 57 ++
.../src/test/java/org/dummy/ListHandler.java | 49 ++
osgi-over-slf4j/pom.xml | 59 ++
.../org/slf4j/osgi/logservice/impl/Activator.java | 78 ++
.../osgi/logservice/impl/LogServiceFactory.java | 65 ++
.../slf4j/osgi/logservice/impl/LogServiceImpl.java | 206 +++++
pom.xml | 390 ++++++++++
slf4j-android/pom.xml | 63 ++
.../java/org/slf4j/impl/AndroidLoggerAdapter.java | 553 ++++++++++++++
.../java/org/slf4j/impl/AndroidLoggerFactory.java | 124 +++
.../java/org/slf4j/impl/StaticLoggerBinder.java | 81 ++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 58 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 67 ++
.../src/main/resources/META-INF/MANIFEST.MF | 9 +
.../org/slf4j/impl/AndroidLoggerFactoryTest.java | 79 ++
slf4j-api/pom.xml | 88 +++
.../src/main/java/org/slf4j/ILoggerFactory.java | 57 ++
.../src/main/java/org/slf4j/IMarkerFactory.java | 81 ++
slf4j-api/src/main/java/org/slf4j/Logger.java | 721 ++++++++++++++++++
.../src/main/java/org/slf4j/LoggerFactory.java | 347 +++++++++
slf4j-api/src/main/java/org/slf4j/MDC.java | 259 +++++++
slf4j-api/src/main/java/org/slf4j/Marker.java | 142 ++++
.../src/main/java/org/slf4j/MarkerFactory.java | 96 +++
.../java/org/slf4j/helpers/BasicMDCAdapter.java | 161 ++++
.../main/java/org/slf4j/helpers/BasicMarker.java | 195 +++++
.../java/org/slf4j/helpers/BasicMarkerFactory.java | 99 +++
.../java/org/slf4j/helpers/FormattingTuple.java | 76 ++
.../java/org/slf4j/helpers/MarkerIgnoringBase.java | 166 ++++
.../java/org/slf4j/helpers/MessageFormatter.java | 412 ++++++++++
.../src/main/java/org/slf4j/helpers/NOPLogger.java | 220 ++++++
.../java/org/slf4j/helpers/NOPLoggerFactory.java | 48 ++
.../main/java/org/slf4j/helpers/NOPMDCAdapter.java | 63 ++
.../java/org/slf4j/helpers/NamedLoggerBase.java | 70 ++
.../java/org/slf4j/helpers/SubstituteLogger.java | 328 ++++++++
.../org/slf4j/helpers/SubstituteLoggerFactory.java | 67 ++
.../src/main/java/org/slf4j/helpers/Util.java | 84 ++
.../src/main/java/org/slf4j/helpers/package.html | 16 +
.../java/org/slf4j/impl/StaticLoggerBinder.java | 73 ++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 57 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 70 ++
.../src/main/java/org/slf4j/impl/package.html | 17 +
slf4j-api/src/main/java/org/slf4j/package.html | 16 +
.../java/org/slf4j/spi/LocationAwareLogger.java | 60 ++
.../java/org/slf4j/spi/LoggerFactoryBinder.java | 57 ++
.../src/main/java/org/slf4j/spi/MDCAdapter.java | 91 +++
.../java/org/slf4j/spi/MarkerFactoryBinder.java | 57 ++
slf4j-api/src/main/java/org/slf4j/spi/package.html | 8 +
slf4j-api/src/main/resources/META-INF/MANIFEST.MF | 8 +
.../src/test/java/org/slf4j/BasicMarkerTest.java | 196 +++++
.../src/test/java/org/slf4j/Differentiator.java | 37 +
.../src/test/java/org/slf4j/NoBindingTest.java | 53 ++
.../src/test/java/org/slf4j/helpers/BogoPerf.java | 150 ++++
.../test/java/org/slf4j/helpers/BubbleSort.java | 51 ++
.../java/org/slf4j/helpers/BubbleSortTest.java | 100 +++
.../slf4j/helpers/MessageFormatterPerfTest.java | 111 +++
.../org/slf4j/helpers/MessageFormatterTest.java | 324 ++++++++
.../src/test/java/org/slf4j/helpers/MyRandom.java | 51 ++
.../org/slf4j/helpers/SubstitutableLoggerTest.java | 106 +++
.../slf4j/helpers/SubstituteLoggerFactoryTest.java | 69 ++
slf4j-ext/pom.xml | 105 +++
slf4j-ext/src/main/java/org/slf4j/NDC.java | 62 ++
.../main/java/org/slf4j/agent/AgentOptions.java | 63 ++
.../main/java/org/slf4j/agent/AgentPremain.java | 128 ++++
.../src/main/java/org/slf4j/agent/package.html | 33 +
.../src/main/java/org/slf4j/cal10n/LocLogger.java | 173 +++++
.../java/org/slf4j/cal10n/LocLoggerFactory.java | 75 ++
.../src/main/java/org/slf4j/cal10n/package.html | 12 +
.../src/main/java/org/slf4j/ext/EventData.java | 305 ++++++++
.../main/java/org/slf4j/ext/EventException.java | 66 ++
.../src/main/java/org/slf4j/ext/EventLogger.java | 64 ++
.../src/main/java/org/slf4j/ext/LoggerWrapper.java | 844 +++++++++++++++++++++
.../src/main/java/org/slf4j/ext/MDCStrLookup.java | 49 ++
slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java | 216 ++++++
.../main/java/org/slf4j/ext/XLoggerFactory.java | 65 ++
slf4j-ext/src/main/java/org/slf4j/ext/package.html | 12 +
.../org/slf4j/instrumentation/JavassistHelper.java | 186 +++++
.../org/slf4j/instrumentation/LogTransformer.java | 313 ++++++++
.../org/slf4j/instrumentation/ToStringHelper.java | 191 +++++
.../java/org/slf4j/instrumentation/package.html | 18 +
.../main/java/org/slf4j/profiler/DurationUnit.java | 35 +
.../src/main/java/org/slf4j/profiler/Profiler.java | 262 +++++++
.../java/org/slf4j/profiler/ProfilerRegistry.java | 65 ++
.../main/java/org/slf4j/profiler/SpacePadder.java | 127 ++++
.../main/java/org/slf4j/profiler/StopWatch.java | 116 +++
.../java/org/slf4j/profiler/TimeInstrument.java | 77 ++
.../org/slf4j/profiler/TimeInstrumentStatus.java | 40 +
.../src/main/java/org/slf4j/profiler/Util.java | 114 +++
.../src/main/java/org/slf4j/profiler/package.html | 13 +
slf4j-ext/src/main/resources/META-INF/MANIFEST.MF | 8 +
slf4j-ext/src/test/java/org/slf4j/NDCTest.java | 58 ++
.../java/org/slf4j/cal10n_dummy/LocLoggerTest.java | 80 ++
.../test/java/org/slf4j/cal10n_dummy/Months.java | 35 +
.../java/org/slf4j/cal10n_dummy/MyApplication.java | 55 ++
.../java/org/slf4j/cal10n_dummy/PackageTest.java | 36 +
.../java/org/slf4j/cal10n_dummy/Production.java | 35 +
.../java/org/slf4j/dummyExt/EventLoggerTest.java | 106 +++
.../test/java/org/slf4j/dummyExt/ListAppender.java | 53 ++
.../java/org/slf4j/dummyExt/MDCStrLookupTest.java | 56 ++
.../test/java/org/slf4j/dummyExt/PackageTest.java | 38 +
.../test/java/org/slf4j/dummyExt/XLoggerTest.java | 155 ++++
.../src/test/java/org/slf4j/dummyExt/package.html | 8 +
.../slf4j/instrumentation/ToStringHelperTest.java | 65 ++
.../java/org/slf4j/profiler/BasicProfilerDemo.java | 87 +++
.../org/slf4j/profiler/NestedProfilerDemo.java | 84 ++
.../org/slf4j/profiler/NestedProfilerDemo2.java | 64 ++
.../test/java/org/slf4j/profiler/PackageTest.java | 37 +
.../test/java/org/slf4j/profiler/ProfilerTest.java | 138 ++++
.../profiler/RandomIntegerArrayGenerator.java | 40 +
.../org/slf4j/profiler/SortAndPruneComposites.java | 96 +++
.../src/test/java/org/slf4j/profiler/UtilTest.java | 52 ++
slf4j-ext/src/test/resources/log4j.properties | 6 +
slf4j-ext/src/test/resources/months_en.properties | 6 +
.../src/test/resources/production_en_UK.properties | 4 +
.../src/test/resources/production_fr.properties | 4 +
slf4j-jcl/pom.xml | 53 ++
.../main/java/org/slf4j/impl/JCLLoggerAdapter.java | 531 +++++++++++++
.../main/java/org/slf4j/impl/JCLLoggerFactory.java | 83 ++
.../java/org/slf4j/impl/StaticLoggerBinder.java | 82 ++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 58 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 67 ++
slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF | 10 +
.../src/test/java/org/slf4j/InvocationTest.java | 125 +++
slf4j-jdk14/pom.xml | 56 ++
.../java/org/slf4j/impl/JDK14LoggerAdapter.java | 651 ++++++++++++++++
.../java/org/slf4j/impl/JDK14LoggerFactory.java | 69 ++
.../java/org/slf4j/impl/StaticLoggerBinder.java | 80 ++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 58 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 67 ++
.../src/main/resources/META-INF/MANIFEST.MF | 9 +
.../src/test/java/org/slf4j/InvocationTest.java | 203 +++++
.../org/slf4j/impl/JDK14AdapterLoggerNameTest.java | 89 +++
.../src/test/java/org/slf4j/impl/PerfTest.java | 76 ++
.../org/slf4j/issue/LoggerSerializationTest.java | 83 ++
slf4j-log4j12/pom.xml | 53 ++
.../java/org/slf4j/impl/Log4jLoggerAdapter.java | 598 +++++++++++++++
.../java/org/slf4j/impl/Log4jLoggerFactory.java | 70 ++
.../main/java/org/slf4j/impl/Log4jMDCAdapter.java | 91 +++
.../java/org/slf4j/impl/StaticLoggerBinder.java | 88 +++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 55 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 67 ++
.../src/main/resources/META-INF/MANIFEST.MF | 9 +
.../src/test/java/org/slf4j/InvocationTest.java | 175 +++++
.../src/test/java/org/slf4j/ListAppender.java | 53 ++
.../java/org/slf4j/impl/RecursiveAppender.java | 54 ++
.../slf4j/impl/RecursiveInitializationTest.java | 57 ++
.../src/test/resources/recursiveInit.properties | 8 +
slf4j-migrator/pom.xml | 46 ++
.../src/main/java/org/slf4j/migrator/Constant.java | 36 +
.../org/slf4j/migrator/ConversionException.java | 63 ++
.../main/java/org/slf4j/migrator/FileSelector.java | 69 ++
.../org/slf4j/migrator/InplaceFileConverter.java | 110 +++
.../src/main/java/org/slf4j/migrator/Main.java | 50 ++
.../java/org/slf4j/migrator/ProjectConverter.java | 126 +++
.../java/org/slf4j/migrator/RuleSetFactory.java | 62 ++
.../org/slf4j/migrator/helper/Abbreviator.java | 89 +++
.../slf4j/migrator/helper/SpringLayoutHelper.java | 61 ++
.../slf4j/migrator/internal/ConversionTask.java | 56 ++
.../org/slf4j/migrator/internal/MigratorFrame.java | 373 +++++++++
.../slf4j/migrator/internal/ProgressListener.java | 45 ++
.../migrator/internal/ProgressListenerImpl.java | 121 +++
.../org/slf4j/migrator/line/ConversionRule.java | 51 ++
.../java/org/slf4j/migrator/line/EmptyRuleSet.java | 39 +
.../java/org/slf4j/migrator/line/JCLRuleSet.java | 69 ++
.../java/org/slf4j/migrator/line/JULRuleSet.java | 72 ++
.../org/slf4j/migrator/line/LineConverter.java | 91 +++
.../java/org/slf4j/migrator/line/Log4jRuleSet.java | 78 ++
.../migrator/line/MultiGroupConversionRule.java | 100 +++
.../main/java/org/slf4j/migrator/line/RuleSet.java | 33 +
.../slf4j/migrator/line/SingleConversionRule.java | 75 ++
.../src/main/resources/META-INF/MANIFEST.MF | 1 +
.../src/test/java/org/slf4j/migrator/AllTest.java | 35 +
.../org/slf4j/migrator/AternativeApproach.java | 154 ++++
.../java/org/slf4j/migrator/FileConverterTest.java | 57 ++
.../test/java/org/slf4j/migrator/PackageTest.java | 34 +
.../org/slf4j/migrator/ProjectConverterTest.java | 45 ++
.../org/slf4j/migrator/helper/AbbreviatorTest.java | 158 ++++
.../org/slf4j/migrator/helper/PackageTest.java | 34 +
.../org/slf4j/migrator/helper/RandomHelper.java | 70 ++
.../migrator/internal/NopProgressListener.java | 54 ++
.../org/slf4j/migrator/line/JCLRuleSetTest.java | 121 +++
.../org/slf4j/migrator/line/Log4jRuleSetTest.java | 136 ++++
.../org/slf4j/migrator/line/NoConversionTest.java | 75 ++
.../java/org/slf4j/migrator/line/PackageTest.java | 34 +
.../org/slf4j/migrator/line/TrivialMatcher.java | 63 ++
.../slf4j/migrator/line/TrivialMatcherTest.java | 44 ++
slf4j-nop/pom.xml | 50 ++
.../java/org/slf4j/impl/StaticLoggerBinder.java | 80 ++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 56 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 67 ++
slf4j-nop/src/main/resources/META-INF/MANIFEST.MF | 9 +
.../src/test/java/org/slf4j/InvocationTest.java | 127 ++++
slf4j-simple/pom.xml | 47 ++
.../src/main/java/org/slf4j/impl/SimpleLogger.java | 648 ++++++++++++++++
.../java/org/slf4j/impl/SimpleLoggerFactory.java | 73 ++
.../java/org/slf4j/impl/StaticLoggerBinder.java | 81 ++
.../main/java/org/slf4j/impl/StaticMDCBinder.java | 56 ++
.../java/org/slf4j/impl/StaticMarkerBinder.java | 68 ++
.../src/main/resources/META-INF/MANIFEST.MF | 10 +
.../org/slf4j/DetectLoggerNameMismatchTest.java | 134 ++++
.../src/test/java/org/slf4j/InvocationTest.java | 131 ++++
.../src/test/java/org/slf4j/SilentPrintStream.java | 46 ++
.../test/java/org/slf4j/impl/SimpleLoggerTest.java | 78 ++
.../src/test/resources/simplelogger.properties | 34 +
src/main/assembly/source.xml | 342 +++++++++
src/main/javadocHeaders.xml | 10 +
src/main/licenseHeader.txt | 22 +
283 files changed, 28914 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libslf4j-java.git
More information about the pkg-java-commits
mailing list