
Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: c2f277a5357901e6856bec38a41ecde8c37dce0b https://github.com/qos-ch/slf4j/commit/c2f277a5357901e6856bec38a41ecde8c37dc... Author: mbishop <matthew.bishop@elasticpath.com> Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M osgi-over-slf4j/pom.xml M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java M pom.xml Log Message: ----------- Bugzilla #269. Commit: 3e121c2cac6a20edfa16a0c85c328c085a08e129 https://github.com/qos-ch/slf4j/commit/3e121c2cac6a20edfa16a0c85c328c085a08e... Author: mbishop <matthew.bishop@elasticpath.com> Date: 2012-09-20 (Thu, 20 Sep 2012) Changed paths: M integration/build.xml A integration/lib/slf4j-api-1.6.6.jar A integration/lib/slf4j-simple-1.6.6.jar M integration/pom.xml M jcl-over-slf4j/pom.xml M jcl-over-slf4j/src/main/java/org/apache/commons/logging/Log.java M jcl-over-slf4j/src/main/java/org/apache/commons/logging/LogFactory.java M jul-to-slf4j/pom.xml M jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java M log4j-over-slf4j/pom.xml M osgi-over-slf4j/pom.xml M pom.xml M slf4j-api/pom.xml M slf4j-api/src/main/java/org/slf4j/ILoggerFactory.java M slf4j-api/src/main/java/org/slf4j/IMarkerFactory.java M slf4j-api/src/main/java/org/slf4j/Logger.java M slf4j-api/src/main/java/org/slf4j/LoggerFactory.java M slf4j-api/src/main/java/org/slf4j/MDC.java M slf4j-api/src/main/java/org/slf4j/Marker.java M slf4j-api/src/main/java/org/slf4j/MarkerFactory.java M slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java M slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java M slf4j-api/src/main/java/org/slf4j/helpers/NOPLogger.java M slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-ext/pom.xml M slf4j-ext/src/main/java/org/slf4j/cal10n/LocLoggerFactory.java A slf4j-ext/src/main/java/org/slf4j/cal10n/package.html M slf4j-ext/src/main/java/org/slf4j/ext/EventData.java M slf4j-ext/src/main/java/org/slf4j/ext/LoggerWrapper.java M slf4j-ext/src/main/java/org/slf4j/ext/XLoggerFactory.java M slf4j-ext/src/main/java/org/slf4j/ext/package.html M slf4j-ext/src/main/java/org/slf4j/profiler/SpacePadder.java M slf4j-jcl/pom.xml M slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java M slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-jcl/src/main/java/org/slf4j/impl/StaticMDCBinder.java M slf4j-jdk14/pom.xml M slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java M slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-jdk14/src/test/java/org/slf4j/InvocationTest.java M slf4j-log4j12/pom.xml M slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java M slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java M slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java M slf4j-migrator/pom.xml M slf4j-migrator/src/main/java/org/slf4j/migrator/ProjectConverter.java M slf4j-nop/pom.xml M slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java R slf4j-osgi-integration-test/pom.xml R slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java R slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java R slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java R slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java R slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java R slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java R slf4j-osgi-integration-test/src/test/resources/log4j.properties R slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF R slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF R slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF R slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF R slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF R slf4j-osgi-test-bundle/pom.xml R slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/Activator.java R slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/CommonsLoggingTester.java R slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/ProbeImpl.java R slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/service/Probe.java R slf4j-scala-api/pom.xml R slf4j-scala-api/src/main/scala/Logging.scala R slf4j-scala-api/src/main/scala/logger.scala R slf4j-scala-api/src/test/scala/LoggerSpec.scala R slf4j-scala-api/src/test/scala/LoggingSpec.scala M slf4j-simple/pom.xml M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java M slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java A slf4j-simple/src/test/java/org/slf4j/impl/SimpleLoggerTest.java M slf4j-simple/src/test/resources/simplelogger.properties M slf4j-site/pom.xml M slf4j-site/src/site/pages/codes.html M slf4j-site/src/site/pages/faq.html M slf4j-site/src/site/pages/manual.html M slf4j-site/src/site/pages/news.html M slf4j-site/src/site/pages/templates/footer.js R slf4j.composite Log Message: ----------- Merge remote-tracking branch 'upstream/master' Compare: https://github.com/qos-ch/slf4j/compare/3b040e36ff55...3e121c2cac6a