You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/05/21 18:31:19 UTC
svn commit: r1596613 [1/5] - in /logging/log4j/log4j2/trunk:
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/
log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/
log4j-core/src/main/java/org/apache/logging/log4j/core/ap...
Author: ggregory
Date: Wed May 21 16:31:17 2014
New Revision: 1596613
URL: http://svn.apache.org/r1596613
Log:
Camel case changes as agreed upon on the ML (see the Java style guidelines in our manual). In particular, Camel Case is used even for acronyms. Note that not all type names have been changed yet as some are giving me headaches presumably due to running on Windows with SVN (Eclipse + Subclipse).
Added:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
- copied, changed from r1596579, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogAppender.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogFrame.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsQueueAppender.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsTopicAppender.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDnsAdvertiser.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TlsSocketManager.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/AbstractJmsManager.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/AbstractJMSManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/AbstractJmsReceiver.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/AbstractJMSReceiver.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JmsQueueManager.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSQueueManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JmsQueueReceiver.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSQueueReceiver.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JmsTopicManager.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSTopicManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JmsTopicReceiver.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSTopicReceiver.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfiguration.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SSLConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationDefaults.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SSLConfigurationDefaults.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationException.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SSLConfigurationException.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NdcPatternConverter.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UuidPatternConverter.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JndiContextSelector.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UuidUtil.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UUIDUtil.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XmlEvents.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogAppenderTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TlsSyslogFrameTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppenderTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/MtPerfTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JsonConfigTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XmlLoggerPropsTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLLoggerPropsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HtmlLayoutTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java (with props)
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueAppenderTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueFailoverTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsQueueTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicFailoverTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JmsTopicTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBsdTlsSyslogInputStreamReader.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SSLConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogInputStreamReader.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogInputStreamReaderBase.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogInputStreamReaderBase.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogMessageFormat.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogMessageFormat.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TlsSyslogTestUtil.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogTestUtil.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UuidTest.java
- copied, changed from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogFrame.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/AbstractJMSManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/AbstractJMSReceiver.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSQueueManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSQueueReceiver.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSTopicManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/JMSTopicReceiver.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TCPSocketServer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SSLConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SSLConfigurationDefaults.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SSLConfigurationException.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MDCPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/NDCPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/UUIDPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/util/UUIDUtil.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TLSSyslogAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/TLSSyslogFrameTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/MTPerfTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/json/JSONConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationPropsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLLoggerPropsTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTCPSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTLSSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUDPSyslogServer.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/LegacyBSDTLSSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/SSLConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogInputStreamReader.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogInputStreamReaderBase.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogMessageFormat.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/ssl/TLSSyslogTestUtil.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/UUIDTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/MimeMessageBuilder.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/jms/package-info.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/AbstractSocketServer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/KeyStoreConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/TrustStoreConfiguration.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/AbstractPatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LateConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/JSONCompleteFileAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTestDriver.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockSyslogServerFactory.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java (from r1596579, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java&r1=1596579&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java Wed May 21 16:31:17 2014
@@ -27,8 +27,8 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.filter.ThresholdFilter;
-import org.apache.logging.log4j.core.layout.HTMLLayout;
-import org.apache.logging.log4j.core.net.SMTPManager;
+import org.apache.logging.log4j.core.layout.HtmlLayout;
+import org.apache.logging.log4j.core.net.SmtpManager;
import org.apache.logging.log4j.core.util.Booleans;
/**
@@ -37,7 +37,7 @@ import org.apache.logging.log4j.core.uti
*
* <p>
* The number of logging events delivered in this e-mail depend on the value of
- * <b>BufferSize</b> option. The <code>SMTPAppender</code> keeps only the last
+ * <b>BufferSize</b> option. The <code>SmtpAppender</code> keeps only the last
* <code>BufferSize</code> logging events in its cyclic buffer. This keeps
* memory requirements at a reasonable level while still delivering useful
* application context.
@@ -50,21 +50,21 @@ import org.apache.logging.log4j.core.uti
* appender.
*/
@Plugin(name = "SMTP", category = "Core", elementType = "appender", printObject = true)
-public final class SMTPAppender extends AbstractAppender {
+public final class SmtpAppender extends AbstractAppender {
private static final int DEFAULT_BUFFER_SIZE = 512;
/** The SMTP Manager */
- protected final SMTPManager manager;
+ protected final SmtpManager manager;
- private SMTPAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout, final SMTPManager manager,
+ private SmtpAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout, final SmtpManager manager,
final boolean ignoreExceptions) {
super(name, filter, layout, ignoreExceptions);
this.manager = manager;
}
/**
- * Create a SMTPAppender.
+ * Create a SmtpAppender.
*
* @param name
* The name of the Appender.
@@ -94,16 +94,16 @@ public final class SMTPAppender extends
* How many log events should be buffered for inclusion in the
* message?
* @param layout
- * The layout to use (defaults to HTMLLayout).
+ * The layout to use (defaults to HtmlLayout).
* @param filter
* The Filter or null (defaults to ThresholdFilter, level of
* ERROR).
* @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
* they are propagated to the caller.
- * @return The SMTPAppender.
+ * @return The SmtpAppender.
*/
@PluginFactory
- public static SMTPAppender createAppender(
+ public static SmtpAppender createAppender(
@PluginAttribute("name") final String name,
@PluginAttribute("to") final String to,
@PluginAttribute("cc") final String cc,
@@ -122,7 +122,7 @@ public final class SMTPAppender extends
@PluginElement("Filter") Filter filter,
@PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
- LOGGER.error("No name provided for SMTPAppender");
+ LOGGER.error("No name provided for SmtpAppender");
return null;
}
@@ -132,19 +132,19 @@ public final class SMTPAppender extends
final int bufferSize = bufferSizeStr == null ? DEFAULT_BUFFER_SIZE : Integer.parseInt(bufferSizeStr);
if (layout == null) {
- layout = HTMLLayout.createLayout(null, null, null, null, null, null);
+ layout = HtmlLayout.createLayout(null, null, null, null, null, null);
}
if (filter == null) {
filter = ThresholdFilter.createFilter(null, null, null);
}
- final SMTPManager manager = SMTPManager.getSMTPManager(to, cc, bcc, from, replyTo, subject, smtpProtocol,
+ final SmtpManager manager = SmtpManager.getSMTPManager(to, cc, bcc, from, replyTo, subject, smtpProtocol,
smtpHost, smtpPort, smtpUsername, smtpPassword, isSmtpDebug, filter.toString(), bufferSize);
if (manager == null) {
return null;
}
- return new SMTPAppender(name, filter, layout, manager, ignoreExceptions);
+ return new SmtpAppender(name, filter, layout, manager, ignoreExceptions);
}
/**
@@ -162,7 +162,7 @@ public final class SMTPAppender extends
}
/**
- * Perform SMTPAppender specific appending actions, mainly adding the event
+ * Perform SmtpAppender specific appending actions, mainly adding the event
* to a cyclic buffer and checking if the event triggers an e-mail to be
* sent.
* @param event The Log event.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1596613&r1=1596612&r2=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Wed May 21 16:31:17 2014
@@ -33,7 +33,7 @@ import org.apache.logging.log4j.core.net
import org.apache.logging.log4j.core.net.Advertiser;
import org.apache.logging.log4j.core.net.DatagramSocketManager;
import org.apache.logging.log4j.core.net.Protocol;
-import org.apache.logging.log4j.core.net.TCPSocketManager;
+import org.apache.logging.log4j.core.net.TcpSocketManager;
import org.apache.logging.log4j.core.util.Booleans;
import org.apache.logging.log4j.util.EnglishEnums;
@@ -133,7 +133,7 @@ public class SocketAppender extends Abst
final Layout<? extends Serializable> layout) {
switch (p) {
case TCP:
- return TCPSocketManager.getSocketManager(host, port, delay, immediateFail, layout);
+ return TcpSocketManager.getSocketManager(host, port, delay, immediateFail, layout);
case UDP:
return DatagramSocketManager.getSocketManager(host, port, layout);
default:
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1596613&r1=1596612&r2=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java Wed May 21 16:31:17 2014
@@ -27,7 +27,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.layout.LoggerFields;
-import org.apache.logging.log4j.core.layout.RFC5424Layout;
+import org.apache.logging.log4j.core.layout.Rfc5424Layout;
import org.apache.logging.log4j.core.layout.SyslogLayout;
import org.apache.logging.log4j.core.net.AbstractSocketManager;
import org.apache.logging.log4j.core.net.Advertiser;
@@ -125,7 +125,7 @@ public class SyslogAppender extends Sock
final int port = AbstractAppender.parseInt(portNum, 0);
final boolean isAdvertise = Boolean.parseBoolean(advertise);
final Layout<? extends Serializable> layout = (RFC5424.equalsIgnoreCase(format) ?
- RFC5424Layout.createLayout(facility, id, ein, includeMDC, mdcId, mdcPrefix, eventPrefix, includeNL,
+ Rfc5424Layout.createLayout(facility, id, ein, includeMDC, mdcId, mdcPrefix, eventPrefix, includeNL,
escapeNL, appName, msgId, excludes, includes, required, exceptionPattern, "false", loggerFields,
config) :
SyslogLayout.createLayout(facility, includeNL, escapeNL, charsetName));
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogAppender.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogAppender.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogAppender.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogAppender.java Wed May 21 16:31:17 2014
@@ -27,22 +27,22 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.layout.LoggerFields;
-import org.apache.logging.log4j.core.layout.RFC5424Layout;
+import org.apache.logging.log4j.core.layout.Rfc5424Layout;
import org.apache.logging.log4j.core.layout.SyslogLayout;
import org.apache.logging.log4j.core.net.AbstractSocketManager;
import org.apache.logging.log4j.core.net.Advertiser;
-import org.apache.logging.log4j.core.net.TLSSocketManager;
-import org.apache.logging.log4j.core.net.ssl.SSLConfiguration;
+import org.apache.logging.log4j.core.net.TlsSocketManager;
+import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
import org.apache.logging.log4j.core.util.Booleans;
/**
* Secure Syslog Appender.
*/
@Plugin(name = "TLSSyslog", category = "Core", elementType = "appender", printObject = true)
-public final class TLSSyslogAppender extends SyslogAppender {
+public final class TlsSyslogAppender extends SyslogAppender {
- private TLSSyslogAppender(final String name,
+ private TlsSyslogAppender(final String name,
final Layout<? extends Serializable> layout,
final Filter filter,
final boolean ignoreExceptions,
@@ -86,12 +86,12 @@ public final class TLSSyslogAppender ext
* @param exceptionPattern The converter pattern to use for formatting exceptions.
* @param loggerFields The logger fields
* @param advertise Whether to advertise
- * @return A TLSSyslogAppender.
+ * @return A TlsSyslogAppender.
*/
@PluginFactory
- public static TLSSyslogAppender createAppender(@PluginAttribute("host") final String host,
+ public static TlsSyslogAppender createAppender(@PluginAttribute("host") final String host,
@PluginAttribute("port") final String portNum,
- @PluginElement("ssl") final SSLConfiguration sslConfig,
+ @PluginElement("ssl") final SslConfiguration sslConfig,
@PluginAttribute("reconnectionDelay") final String delay,
@PluginAttribute("immediateFail") final String immediateFail,
@PluginAttribute("name") final String name,
@@ -126,13 +126,13 @@ public final class TLSSyslogAppender ext
final boolean isAdvertise = Boolean.parseBoolean(advertise);
@SuppressWarnings("unchecked")
final Layout<? extends Serializable> layout = RFC5424.equalsIgnoreCase(format) ?
- RFC5424Layout.createLayout(facility, id, ein, includeMDC, mdcId, mdcPrefix, eventPrefix, includeNL,
+ Rfc5424Layout.createLayout(facility, id, ein, includeMDC, mdcId, mdcPrefix, eventPrefix, includeNL,
escapeNL, appName, msgId, excludes, includes, required, exceptionPattern, "true" ,loggerFields,
config) :
SyslogLayout.createLayout(facility, includeNL, escapeNL, charsetName);
if (name == null) {
- LOGGER.error("No name provided for TLSSyslogAppender");
+ LOGGER.error("No name provided for TlsSyslogAppender");
return null;
}
final AbstractSocketManager manager = createSocketManager(sslConfig, host, port, reconnectDelay, fail, layout);
@@ -140,16 +140,16 @@ public final class TLSSyslogAppender ext
return null;
}
- return new TLSSyslogAppender(name, layout, filter, ignoreExceptions, isFlush, manager,
+ return new TlsSyslogAppender(name, layout, filter, ignoreExceptions, isFlush, manager,
isAdvertise ? config.getAdvertiser() : null);
}
- public static AbstractSocketManager createSocketManager(final SSLConfiguration sslConfig,
+ public static AbstractSocketManager createSocketManager(final SslConfiguration sslConfig,
final String host,
final int port,
final int reconnectDelay,
final boolean fail,
final Layout<? extends Serializable> layout) {
- return TLSSocketManager.getSocketManager(sslConfig, host, port, reconnectDelay, fail, layout);
+ return TlsSocketManager.getSocketManager(sslConfig, host, port, reconnectDelay, fail, layout);
}
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogFrame.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogFrame.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogFrame.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java Wed May 21 16:31:17 2014
@@ -21,13 +21,13 @@ import java.nio.charset.Charset;
/**
* Wrapper for messages that are formatted according to RFC 5425.
*/
-public class TLSSyslogFrame {
+public class TlsSyslogFrame {
public static final char SPACE = ' ';
private String message;
private int messageLengthInBytes;
- public TLSSyslogFrame(String message) {
+ public TlsSyslogFrame(String message) {
setMessage(message);
}
@@ -60,15 +60,15 @@ public class TLSSyslogFrame {
return super.equals(frame);
}
- public boolean equals(TLSSyslogFrame frame) {
+ public boolean equals(TlsSyslogFrame frame) {
return isLengthEquals(frame) && isMessageEquals(frame);
}
- private boolean isLengthEquals(TLSSyslogFrame frame) {
+ private boolean isLengthEquals(TlsSyslogFrame frame) {
return this.messageLengthInBytes == frame.messageLengthInBytes;
}
- private boolean isMessageEquals(TLSSyslogFrame frame) {
+ private boolean isMessageEquals(TlsSyslogFrame frame) {
return this.message.equals(frame.message);
}
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsQueueAppender.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsQueueAppender.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsQueueAppender.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsQueueAppender.java Wed May 21 16:31:17 2014
@@ -28,19 +28,19 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.layout.SerializedLayout;
-import org.apache.logging.log4j.core.net.jms.JMSQueueManager;
+import org.apache.logging.log4j.core.net.jms.JmsQueueManager;
import org.apache.logging.log4j.core.util.Booleans;
/**
* Appender to write to a JMS Queue.
*/
@Plugin(name = "JMSQueue", category = "Core", elementType = "appender", printObject = true)
-public final class JMSQueueAppender extends AbstractAppender {
+public final class JmsQueueAppender extends AbstractAppender {
- private final JMSQueueManager manager;
+ private final JmsQueueManager manager;
- private JMSQueueAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
- final JMSQueueManager manager, final boolean ignoreExceptions) {
+ private JmsQueueAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
+ final JmsQueueManager manager, final boolean ignoreExceptions) {
super(name, filter, layout, ignoreExceptions);
this.manager = manager;
}
@@ -60,7 +60,7 @@ public final class JMSQueueAppender exte
}
/**
- * Create a JMSQueueAppender.
+ * Create a JmsQueueAppender.
* @param name The name of the Appender.
* @param factoryName The fully qualified class name of the InitialContextFactory.
* @param providerURL The URL of the provider to use.
@@ -76,10 +76,10 @@ public final class JMSQueueAppender exte
* @param filter The Filter or null.
* @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
* they are propagated to the caller.
- * @return The JMSQueueAppender.
+ * @return The JmsQueueAppender.
*/
@PluginFactory
- public static JMSQueueAppender createAppender(
+ public static JmsQueueAppender createAppender(
@PluginAttribute("name") final String name,
@PluginAttribute("factoryName") final String factoryName,
@PluginAttribute("providerURL") final String providerURL,
@@ -94,11 +94,11 @@ public final class JMSQueueAppender exte
@PluginElement("Filter") final Filter filter,
@PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
- LOGGER.error("No name provided for JMSQueueAppender");
+ LOGGER.error("No name provided for JmsQueueAppender");
return null;
}
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final JMSQueueManager manager = JMSQueueManager.getJMSQueueManager(factoryName, providerURL, urlPkgPrefixes,
+ final JmsQueueManager manager = JmsQueueManager.getJMSQueueManager(factoryName, providerURL, urlPkgPrefixes,
securityPrincipalName, securityCredentials, factoryBindingName, queueBindingName, userName, password);
if (manager == null) {
return null;
@@ -106,6 +106,6 @@ public final class JMSQueueAppender exte
if (layout == null) {
layout = SerializedLayout.createLayout();
}
- return new JMSQueueAppender(name, filter, layout, manager, ignoreExceptions);
+ return new JmsQueueAppender(name, filter, layout, manager, ignoreExceptions);
}
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsTopicAppender.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsTopicAppender.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsTopicAppender.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JmsTopicAppender.java Wed May 21 16:31:17 2014
@@ -28,19 +28,19 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.layout.SerializedLayout;
-import org.apache.logging.log4j.core.net.jms.JMSTopicManager;
+import org.apache.logging.log4j.core.net.jms.JmsTopicManager;
import org.apache.logging.log4j.core.util.Booleans;
/**
* Appender to write to a JMS Topic.
*/
@Plugin(name = "JMSTopic", category = "Core", elementType = "appender", printObject = true)
-public final class JMSTopicAppender extends AbstractAppender {
+public final class JmsTopicAppender extends AbstractAppender {
- private final JMSTopicManager manager;
+ private final JmsTopicManager manager;
- private JMSTopicAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
- final JMSTopicManager manager, final boolean ignoreExceptions) {
+ private JmsTopicAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
+ final JmsTopicManager manager, final boolean ignoreExceptions) {
super(name, filter, layout, ignoreExceptions);
this.manager = manager;
}
@@ -60,7 +60,7 @@ public final class JMSTopicAppender exte
}
/**
- * Create a JMSTopicAppender.
+ * Create a JmsTopicAppender.
* @param name The name of the Appender.
* @param factoryName The fully qualified class name of the InitialContextFactory.
* @param providerURL The URL of the provider to use.
@@ -76,10 +76,10 @@ public final class JMSTopicAppender exte
* @param filter The Filter or null.
* @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
* they are propagated to the caller.
- * @return The JMSTopicAppender.
+ * @return The JmsTopicAppender.
*/
@PluginFactory
- public static JMSTopicAppender createAppender(
+ public static JmsTopicAppender createAppender(
@PluginAttribute("name") final String name,
@PluginAttribute("factoryName") final String factoryName,
@PluginAttribute("providerURL") final String providerURL,
@@ -95,11 +95,11 @@ public final class JMSTopicAppender exte
@PluginAttribute("ignoreExceptions") final String ignore) {
if (name == null) {
- LOGGER.error("No name provided for JMSQueueAppender");
+ LOGGER.error("No name provided for JmsQueueAppender");
return null;
}
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
- final JMSTopicManager manager = JMSTopicManager.getJMSTopicManager(factoryName, providerURL, urlPkgPrefixes,
+ final JmsTopicManager manager = JmsTopicManager.getJMSTopicManager(factoryName, providerURL, urlPkgPrefixes,
securityPrincipalName, securityCredentials, factoryBindingName, topicBindingName, userName, password);
if (manager == null) {
return null;
@@ -107,6 +107,6 @@ public final class JMSTopicAppender exte
if (layout == null) {
layout = SerializedLayout.createLayout();
}
- return new JMSTopicAppender(name, filter, layout, manager, ignoreExceptions);
+ return new JmsTopicAppender(name, filter, layout, manager, ignoreExceptions);
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1596613&r1=1596612&r2=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Wed May 21 16:31:17 2014
@@ -24,7 +24,7 @@ import java.util.zip.Deflater;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.appender.rolling.action.Action;
import org.apache.logging.log4j.core.appender.rolling.action.FileRenameAction;
-import org.apache.logging.log4j.core.appender.rolling.action.GZCompressAction;
+import org.apache.logging.log4j.core.appender.rolling.action.GzCompressAction;
import org.apache.logging.log4j.core.appender.rolling.action.ZipCompressAction;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -418,7 +418,7 @@ public class DefaultRolloverStrategy imp
if (renameTo.endsWith(EXT_GZIP)) {
renameTo = renameTo.substring(0, renameTo.length() - EXT_GZIP.length());
- compressAction = new GZCompressAction(new File(renameTo), new File(compressedName), true);
+ compressAction = new GzCompressAction(new File(renameTo), new File(compressedName), true);
} else if (renameTo.endsWith(EXT_ZIP)) {
renameTo = renameTo.substring(0, renameTo.length() - EXT_ZIP.length());
compressAction = new ZipCompressAction(new File(renameTo), new File(compressedName), true,
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GZCompressAction.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/GzCompressAction.java Wed May 21 16:31:17 2014
@@ -26,7 +26,7 @@ import java.util.zip.GZIPOutputStream;
/**
* Compresses a file using GZ compression.
*/
-public final class GZCompressAction extends AbstractAction {
+public final class GzCompressAction extends AbstractAction {
private static final int BUF_SIZE = 8102;
@@ -46,14 +46,14 @@ public final class GZCompressAction exte
private final boolean deleteSource;
/**
- * Create new instance of GZCompressAction.
+ * Create new instance of GzCompressAction.
*
* @param source file to compress, may not be null.
* @param destination compressed file, may not be null.
* @param deleteSource if true, attempt to delete file on completion. Failure to delete
* does not cause an exception to be thrown or affect return value.
*/
- public GZCompressAction(final File source, final File destination, final boolean deleteSource) {
+ public GzCompressAction(final File source, final File destination, final boolean deleteSource) {
if (source == null) {
throw new NullPointerException("source");
}
@@ -128,7 +128,7 @@ public final class GZCompressAction exte
@Override
public String toString() {
- return GZCompressAction.class.getSimpleName() + '[' + source + " to " + destination //
+ return GzCompressAction.class.getSimpleName() + '[' + source + " to " + destination //
+ ", deleteSource=" + deleteSource + ']';
}
}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java?rev=1596613&r1=1596612&r2=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ZipCompressAction.java Wed May 21 16:31:17 2014
@@ -52,7 +52,7 @@ public final class ZipCompressAction ext
private final int level;
/**
- * Create new instance of GZCompressAction.
+ * Create new instance of GzCompressAction.
*
* @param source file to compress, may not be null.
* @param destination compressed file, may not be null.
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1596613&r1=1596612&r2=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java Wed May 21 16:31:17 2014
@@ -59,7 +59,7 @@ import org.apache.logging.log4j.util.Pro
* A ConfigurationFactory implementation can be added to the classpath and
* configured as a plugin. The Order annotation should be used to configure the
* factory to be the first one inspected. See
- * {@linkplain org.apache.logging.log4j.core.config.xml.XMLConfigurationFactory} for an example.</li>
+ * {@linkplain org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory} for an example.</li>
* </ol>
*
* If the ConfigurationFactory that was added returns null on a call to
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java Wed May 21 16:31:17 2014
@@ -45,7 +45,7 @@ import com.fasterxml.jackson.databind.Ob
/**
* Creates a Node hierarchy from a JSON file.
*/
-public class JSONConfiguration extends AbstractConfiguration implements Reconfigurable {
+public class JsonConfiguration extends AbstractConfiguration implements Reconfigurable {
private static final String[] VERBOSE_CLASSES = new String[]{ResolverUtil.class.getName()};
@@ -55,7 +55,7 @@ public class JSONConfiguration extends A
private final File configFile;
- public JSONConfiguration(final ConfigurationFactory.ConfigurationSource configSource) {
+ public JsonConfiguration(final ConfigurationFactory.ConfigurationSource configSource) {
this.configFile = configSource.getFile();
byte[] buffer;
try {
@@ -144,7 +144,7 @@ public class JSONConfiguration extends A
try {
final ConfigurationFactory.ConfigurationSource source =
new ConfigurationFactory.ConfigurationSource(new FileInputStream(configFile), configFile);
- return new JSONConfiguration(source);
+ return new JsonConfiguration(source);
} catch (final FileNotFoundException ex) {
LOGGER.error("Cannot locate file {}", configFile, ex);
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfigurationFactory.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfigurationFactory.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfigurationFactory.java Wed May 21 16:31:17 2014
@@ -25,9 +25,9 @@ import org.apache.logging.log4j.core.uti
/**
*
*/
-@Plugin(name = "JSONConfigurationFactory", category = "ConfigurationFactory")
+@Plugin(name = "JsonConfigurationFactory", category = "ConfigurationFactory")
@Order(6)
-public class JSONConfigurationFactory extends ConfigurationFactory {
+public class JsonConfigurationFactory extends ConfigurationFactory {
/**
* The file extensions supported by this factory.
@@ -42,7 +42,7 @@ public class JSONConfigurationFactory ex
private final boolean isActive;
- public JSONConfigurationFactory() {
+ public JsonConfigurationFactory() {
for (final String dependency : dependencies) {
if (!Loader.isClassAvailable(dependency)) {
LOGGER.debug("Missing dependencies for Json support");
@@ -63,7 +63,7 @@ public class JSONConfigurationFactory ex
if (!isActive) {
return null;
}
- return new JSONConfiguration(source);
+ return new JsonConfiguration(source);
}
@Override
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfiguration.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfiguration.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java Wed May 21 16:31:17 2014
@@ -60,7 +60,7 @@ import org.xml.sax.SAXException;
/**
* Creates a Node hierarchy from an XML file.
*/
-public class XMLConfiguration extends AbstractConfiguration implements Reconfigurable {
+public class XmlConfiguration extends AbstractConfiguration implements Reconfigurable {
private static final String XINCLUDE_FIXUP_LANGUAGE = "http://apache.org/xml/features/xinclude/fixup-language";
@@ -128,7 +128,7 @@ public class XMLConfiguration extends Ab
}
}
- public XMLConfiguration(final ConfigurationFactory.ConfigurationSource configSource) {
+ public XmlConfiguration(final ConfigurationFactory.ConfigurationSource configSource) {
this.configFile = configSource.getFile();
byte[] buffer = null;
@@ -188,7 +188,7 @@ public class XMLConfiguration extends Ab
if (strict && schema != null && buffer != null) {
InputStream is = null;
try {
- is = Loader.getResourceAsStream(schema, XMLConfiguration.class.getClassLoader());
+ is = Loader.getResourceAsStream(schema, XmlConfiguration.class.getClassLoader());
} catch (final Exception ex) {
LOGGER.error("Unable to access schema {}", this.schema);
}
@@ -241,7 +241,7 @@ public class XMLConfiguration extends Ab
try {
final ConfigurationFactory.ConfigurationSource source =
new ConfigurationFactory.ConfigurationSource(new FileInputStream(configFile), configFile);
- return new XMLConfiguration(source);
+ return new XmlConfiguration(source);
} catch (final FileNotFoundException ex) {
LOGGER.error("Cannot locate file " + configFile, ex);
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationFactory.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationFactory.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XMLConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationFactory.java Wed May 21 16:31:17 2014
@@ -22,11 +22,11 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.Plugin;
/**
- * Factory to construct an XMLConfiguration.
+ * Factory to construct an XmlConfiguration.
*/
-@Plugin(name = "XMLConfigurationFactory", category = "ConfigurationFactory")
+@Plugin(name = "XmlConfigurationFactory", category = "ConfigurationFactory")
@Order(5)
-public class XMLConfigurationFactory extends ConfigurationFactory {
+public class XmlConfigurationFactory extends ConfigurationFactory {
/**
* Valid file extensions for XML files.
@@ -40,7 +40,7 @@ public class XMLConfigurationFactory ext
*/
@Override
public Configuration getConfiguration(final ConfigurationSource source) {
- return new XMLConfiguration(source);
+ return new XmlConfiguration(source);
}
/**
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfiguration.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfiguration.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfiguration.java Wed May 21 16:31:17 2014
@@ -17,15 +17,15 @@
package org.apache.logging.log4j.core.config.yaml;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.config.json.JSONConfiguration;
+import org.apache.logging.log4j.core.config.json.JsonConfiguration;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-public class YAMLConfiguration extends JSONConfiguration {
+public class YamlConfiguration extends JsonConfiguration {
- public YAMLConfiguration(ConfigurationFactory.ConfigurationSource configSource) {
+ public YamlConfiguration(ConfigurationFactory.ConfigurationSource configSource) {
super(configSource);
}
Copied: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java (from r1596559, logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfigurationFactory.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfigurationFactory.java&r1=1596559&r2=1596613&rev=1596613&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YAMLConfigurationFactory.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/yaml/YamlConfigurationFactory.java Wed May 21 16:31:17 2014
@@ -22,9 +22,9 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.util.Loader;
-@Plugin(name = "YAMLConfigurationFactory", category = "ConfigurationFactory")
+@Plugin(name = "YamlConfigurationFactory", category = "ConfigurationFactory")
@Order(7)
-public class YAMLConfigurationFactory extends ConfigurationFactory {
+public class YamlConfigurationFactory extends ConfigurationFactory {
/**
* The file extensions supported by this factory.
@@ -40,7 +40,7 @@ public class YAMLConfigurationFactory ex
private final boolean isActive;
- public YAMLConfigurationFactory() {
+ public YamlConfigurationFactory() {
for (final String dependency : dependencies) {
if (!Loader.isClassAvailable(dependency)) {
LOGGER.debug("Missing dependencies for Yaml support");
@@ -61,7 +61,7 @@ public class YAMLConfigurationFactory ex
if (!isActive) {
return null;
}
- return new YAMLConfiguration(source);
+ return new YamlConfiguration(source);
}
@Override
Added: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java?rev=1596613&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java (added)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java Wed May 21 16:31:17 2014
@@ -0,0 +1,338 @@
+/*
+ * 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.logging.log4j.core.layout;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.LineNumberReader;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.util.Charsets;
+import org.apache.logging.log4j.core.util.Constants;
+import org.apache.logging.log4j.core.util.Transform;
+
+/**
+ * Outputs events as rows in an HTML table on an HTML page.
+ * <p/>
+ * Appenders using this layout should have their encoding set to UTF-8 or UTF-16, otherwise events containing
+ * non ASCII characters could result in corrupted log files.
+ */
+@Plugin(name = "HtmlLayout", category = "Core", elementType = "layout", printObject = true)
+public final class HtmlLayout extends AbstractStringLayout {
+
+ private static final int BUF_SIZE = 256;
+
+ private static final String TRACE_PREFIX = "<br /> ";
+
+ private static final String REGEXP = Constants.LINE_SEPARATOR.equals("\n") ? "\n" : Constants.LINE_SEPARATOR + "|\n";
+
+ private static final String DEFAULT_TITLE = "Log4j Log Messages";
+
+ private static final String DEFAULT_CONTENT_TYPE = "text/html";
+
+ private final long jvmStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
+
+ // Print no location info by default
+ private final boolean locationInfo;
+
+ private final String title;
+
+ private final String contentType;
+
+ /**Possible font sizes */
+ private enum FontSize {
+ SMALLER("smaller"), XXSMALL("xx-small"), XSMALL("x-small"), SMALL("small"), MEDIUM("medium"), LARGE("large"),
+ XLARGE("x-large"), XXLARGE("xx-large"), LARGER("larger");
+
+ private final String size;
+
+ private FontSize(final String size) {
+ this.size = size;
+ }
+
+ public String getFontSize() {
+ return size;
+ }
+
+ public static FontSize getFontSize(final String size) {
+ for (final FontSize fontSize : values()) {
+ if (fontSize.size.equals(size)) {
+ return fontSize;
+ }
+ }
+ return SMALL;
+ }
+
+ public FontSize larger() {
+ return this.ordinal() < XXLARGE.ordinal() ? FontSize.values()[this.ordinal() + 1] : this;
+ }
+ }
+
+ private final String font;
+ private final String fontSize;
+ private final String headerSize;
+
+ private HtmlLayout(final boolean locationInfo, final String title, final String contentType, final Charset charset,
+ final String font, final String fontSize, final String headerSize) {
+ super(charset);
+ this.locationInfo = locationInfo;
+ this.title = title;
+ this.contentType = contentType;
+ this.font = font;
+ this.fontSize = fontSize;
+ this.headerSize = headerSize;
+ }
+
+ /**
+ * Format as a String.
+ *
+ * @param event The Logging Event.
+ * @return A String containing the LogEvent as HTML.
+ */
+ @Override
+ public String toSerializable(final LogEvent event) {
+ final StringBuilder sbuf = new StringBuilder(BUF_SIZE);
+
+ sbuf.append(Constants.LINE_SEPARATOR).append("<tr>").append(Constants.LINE_SEPARATOR);
+
+ sbuf.append("<td>");
+ sbuf.append(event.getTimeMillis() - jvmStartTime);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+
+ final String escapedThread = Transform.escapeHtmlTags(event.getThreadName());
+ sbuf.append("<td title=\"").append(escapedThread).append(" thread\">");
+ sbuf.append(escapedThread);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+
+ sbuf.append("<td title=\"Level\">");
+ if (event.getLevel().equals(Level.DEBUG)) {
+ sbuf.append("<font color=\"#339933\">");
+ sbuf.append(Transform.escapeHtmlTags(String.valueOf(event.getLevel())));
+ sbuf.append("</font>");
+ } else if (event.getLevel().isMoreSpecificThan(Level.WARN)) {
+ sbuf.append("<font color=\"#993300\"><strong>");
+ sbuf.append(Transform.escapeHtmlTags(String.valueOf(event.getLevel())));
+ sbuf.append("</strong></font>");
+ } else {
+ sbuf.append(Transform.escapeHtmlTags(String.valueOf(event.getLevel())));
+ }
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+
+ String escapedLogger = Transform.escapeHtmlTags(event.getLoggerName());
+ if (escapedLogger.isEmpty()) {
+ escapedLogger = "root";
+ }
+ sbuf.append("<td title=\"").append(escapedLogger).append(" logger\">");
+ sbuf.append(escapedLogger);
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+
+ if (locationInfo) {
+ final StackTraceElement element = event.getSource();
+ sbuf.append("<td>");
+ sbuf.append(Transform.escapeHtmlTags(element.getFileName()));
+ sbuf.append(':');
+ sbuf.append(element.getLineNumber());
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+ }
+
+ sbuf.append("<td title=\"Message\">");
+ sbuf.append(Transform.escapeHtmlTags(event.getMessage().getFormattedMessage()).replaceAll(REGEXP, "<br />"));
+ sbuf.append("</td>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</tr>").append(Constants.LINE_SEPARATOR);
+
+ if (event.getContextStack() != null && !event.getContextStack().isEmpty()) {
+ sbuf.append("<tr><td bgcolor=\"#EEEEEE\" style=\"font-size : ").append(fontSize);
+ sbuf.append(";\" colspan=\"6\" ");
+ sbuf.append("title=\"Nested Diagnostic Context\">");
+ sbuf.append("NDC: ").append(Transform.escapeHtmlTags(event.getContextStack().toString()));
+ sbuf.append("</td></tr>").append(Constants.LINE_SEPARATOR);
+ }
+
+ if (event.getContextMap() != null && !event.getContextMap().isEmpty()) {
+ sbuf.append("<tr><td bgcolor=\"#EEEEEE\" style=\"font-size : ").append(fontSize);
+ sbuf.append(";\" colspan=\"6\" ");
+ sbuf.append("title=\"Mapped Diagnostic Context\">");
+ sbuf.append("MDC: ").append(Transform.escapeHtmlTags(event.getContextMap().toString()));
+ sbuf.append("</td></tr>").append(Constants.LINE_SEPARATOR);
+ }
+
+ final Throwable throwable = event.getThrown();
+ if (throwable != null) {
+ sbuf.append("<tr><td bgcolor=\"#993300\" style=\"color:White; font-size : ").append(fontSize);
+ sbuf.append(";\" colspan=\"6\">");
+ appendThrowableAsHTML(throwable, sbuf);
+ sbuf.append("</td></tr>").append(Constants.LINE_SEPARATOR);
+ }
+
+ return sbuf.toString();
+ }
+
+ /**
+ * HtmlLayout's format is sufficiently specified via the content type. The format could be defined via a DTD,
+ * but isn't at this time - returning empty Map/unspecified.
+ * @return empty Map
+ */
+ @Override
+ public Map<String, String> getContentFormat() {
+ return new HashMap<String, String>();
+ }
+
+ @Override
+ /**
+ * @return The content type.
+ */
+ public String getContentType() {
+ return contentType;
+ }
+
+ private void appendThrowableAsHTML(final Throwable throwable, final StringBuilder sbuf) {
+ final StringWriter sw = new StringWriter();
+ final PrintWriter pw = new PrintWriter(sw);
+ try {
+ throwable.printStackTrace(pw);
+ } catch (final RuntimeException ex) {
+ // Ignore the exception.
+ }
+ pw.flush();
+ final LineNumberReader reader = new LineNumberReader(new StringReader(sw.toString()));
+ final ArrayList<String> lines = new ArrayList<String>();
+ try {
+ String line = reader.readLine();
+ while (line != null) {
+ lines.add(line);
+ line = reader.readLine();
+ }
+ } catch (final IOException ex) {
+ if (ex instanceof InterruptedIOException) {
+ Thread.currentThread().interrupt();
+ }
+ lines.add(ex.toString());
+ }
+ boolean first = true;
+ for (final String line : lines) {
+ if (!first) {
+ sbuf.append(TRACE_PREFIX);
+ } else {
+ first = false;
+ }
+ sbuf.append(Transform.escapeHtmlTags(line));
+ sbuf.append(Constants.LINE_SEPARATOR);
+ }
+ }
+
+ /**
+ * Returns appropriate HTML headers.
+ * @return The header as a byte array.
+ */
+ @Override
+ public byte[] getHeader() {
+ final StringBuilder sbuf = new StringBuilder();
+ sbuf.append("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" ");
+ sbuf.append("\"http://www.w3.org/TR/html4/loose.dtd\">");
+ sbuf.append(Constants.LINE_SEPARATOR);
+ sbuf.append("<html>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<head>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<meta charset=\"").append(getCharset()).append("\"/>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<title>").append(title).append("</title>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<style type=\"text/css\">").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<!--").append(Constants.LINE_SEPARATOR);
+ sbuf.append("body, table {font-family:").append(font).append("; font-size: ");
+ sbuf.append(headerSize).append(";}").append(Constants.LINE_SEPARATOR);
+ sbuf.append("th {background: #336699; color: #FFFFFF; text-align: left;}").append(Constants.LINE_SEPARATOR);
+ sbuf.append("-->").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</style>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</head>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<body bgcolor=\"#FFFFFF\" topmargin=\"6\" leftmargin=\"6\">").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<hr size=\"1\" noshade>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("Log session start time " + new java.util.Date() + "<br>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<br>").append(Constants.LINE_SEPARATOR);
+ sbuf.append(
+ "<table cellspacing=\"0\" cellpadding=\"4\" border=\"1\" bordercolor=\"#224466\" width=\"100%\">");
+ sbuf.append(Constants.LINE_SEPARATOR);
+ sbuf.append("<tr>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Time</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Thread</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Level</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<th>Logger</th>").append(Constants.LINE_SEPARATOR);
+ if (locationInfo) {
+ sbuf.append("<th>File:Line</th>").append(Constants.LINE_SEPARATOR);
+ }
+ sbuf.append("<th>Message</th>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</tr>").append(Constants.LINE_SEPARATOR);
+ return sbuf.toString().getBytes(getCharset());
+ }
+
+ /**
+ * Returns the appropriate HTML footers.
+ * @return the footer as a byet array.
+ */
+ @Override
+ public byte[] getFooter() {
+ final StringBuilder sbuf = new StringBuilder();
+ sbuf.append("</table>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("<br>").append(Constants.LINE_SEPARATOR);
+ sbuf.append("</body></html>");
+ return sbuf.toString().getBytes(getCharset());
+ }
+
+ /**
+ * Create an HTML Layout.
+ * @param locationInfo If "true", location information will be included. The default is false.
+ * @param title The title to include in the file header. If none is specified the default title will be used.
+ * @param contentType The content type. Defaults to "text/html".
+ * @param charsetName The character set to use. If not specified, the default will be used.
+ * @param fontSize The font size of the text.
+ * @param font The font to use for the text.
+ * @return An HTML Layout.
+ */
+ @PluginFactory
+ public static HtmlLayout createLayout(
+ @PluginAttribute("locationInfo") final String locationInfo,
+ @PluginAttribute("title") String title,
+ @PluginAttribute("contentType") String contentType,
+ @PluginAttribute("charset") final String charsetName,
+ @PluginAttribute("fontSize") String fontSize,
+ @PluginAttribute("fontName") String font) {
+ final Charset charset = Charsets.getSupportedCharset(charsetName, Charsets.UTF_8);
+ if (font == null) {
+ font = "arial,sans-serif";
+ }
+ final FontSize fs = FontSize.getFontSize(fontSize);
+ fontSize = fs.getFontSize();
+ final String headerSize = fs.larger().getFontSize();
+ final boolean info = Boolean.parseBoolean(locationInfo);
+ if (title == null) {
+ title = DEFAULT_TITLE;
+ }
+ if (contentType == null) {
+ contentType = DEFAULT_CONTENT_TYPE + "; charset=" + charset;
+ }
+ return new HtmlLayout(info, title, contentType, charset, font, fontSize, headerSize);
+ }
+}
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
------------------------------------------------------------------------------
svn:keywords = Id