Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/493760d8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/493760d8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/493760d8 Branch: refs/heads/master Commit: 493760d84d2667cf0a0af83005fcfa0fece34148 Parents: 14efd5f 5edc0c3 Author: rpopma <[email protected]> Authored: Sat Feb 27 19:48:50 2016 +0900 Committer: rpopma <[email protected]> Committed: Sat Feb 27 19:48:50 2016 +0900 ---------------------------------------------------------------------- .../log4j/message/ObjectArrayMessage.java | 4 +- .../core/config/AppenderControlArraySet.java | 4 + .../apache/logging/log4j/core/net/Facility.java | 131 +++++++++++++++---- .../log4j/core/net/MimeMessageBuilder.java | 15 ++- .../apache/logging/log4j/core/net/Severity.java | 2 +- .../logging/log4j/core/net/SmtpManager.java | 2 +- .../core/net/mom/jms/AbstractJmsReceiver.java | 48 +++++++ .../core/net/mom/jms/JmsQueueReceiver.java | 45 ++----- .../core/net/mom/jms/JmsTopicReceiver.java | 44 ++----- .../log4j/core/net/server/JmsServer.java | 24 ++++ .../logging/log4j/core/pattern/AnsiEscape.java | 2 +- .../core/util/ExtensionLanguageMapping.java | 8 +- .../log4j/core/appender/SmtpAppenderTest.java | 24 ++-- 13 files changed, 233 insertions(+), 120 deletions(-) ----------------------------------------------------------------------
