Author: ggregory
Date: Fri May 30 17:04:19 2014
New Revision: 1598674
URL: http://svn.apache.org/r1598674
Log:
Rename PluginAttribute#default{Type}Value to default{Type}. Since the value of
the attribute, is well, a value, the postfix "Value" seems superfluous, and a
bit too verbose.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.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/config/plugins/PluginAttribute.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.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/JsonLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.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/SyslogLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
Fri May 30 17:04:19 2014
@@ -180,13 +180,13 @@ public final class AsyncAppender extends
@PluginFactory
public static AsyncAppender createAppender(@PluginElement("AppenderRef")
final AppenderRef[] appenderRefs,
@PluginAttribute("errorRef") @PluginAliases("error-ref") final
String errorRef,
- @PluginAttribute(value = "blocking", defaultBooleanValue = true)
final boolean blocking,
- @PluginAttribute(value = "bufferSize", defaultIntValue =
DEFAULT_QUEUE_SIZE) final int size,
+ @PluginAttribute(value = "blocking", defaultBoolean = true) final
boolean blocking,
+ @PluginAttribute(value = "bufferSize", defaultInt =
DEFAULT_QUEUE_SIZE) final int size,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "includeLocation", defaultBooleanValue =
false) final boolean includeLocation,
+ @PluginAttribute(value = "includeLocation", defaultBoolean =
false) final boolean includeLocation,
@PluginElement("Filter") final Filter filter,
@PluginConfiguration final Configuration config,
- @PluginAttribute(value = "ignoreExceptions", defaultBooleanValue =
true) final boolean ignoreExceptions) {
+ @PluginAttribute(value = "ignoreExceptions", defaultBoolean =
true) final boolean ignoreExceptions) {
if (name == null) {
LOGGER.error("No name provided for AsyncAppender");
return null;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
Fri May 30 17:04:19 2014
@@ -82,10 +82,10 @@ public final class ConsoleAppender exten
public static ConsoleAppender createAppender(
@PluginElement("Layout") Layout<? extends Serializable> layout,
@PluginElement("Filters") final Filter filter,
- @PluginAttribute(value = "target", defaultStringValue =
"SYSTEM_OUT") final String targetStr,
+ @PluginAttribute(value = "target", defaultString = "SYSTEM_OUT")
final String targetStr,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "follow", defaultBooleanValue = false)
final String follow,
- @PluginAttribute(value = "ignoreExceptions", defaultBooleanValue =
true) final String ignore) {
+ @PluginAttribute(value = "follow", defaultBoolean = false) final
String follow,
+ @PluginAttribute(value = "ignoreExceptions", defaultBoolean =
true) final String ignore) {
if (name == null) {
LOGGER.error("No name provided for ConsoleAppender");
return null;
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=1598674&r1=1598673&r2=1598674&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
Fri May 30 17:04:19 2014
@@ -93,22 +93,22 @@ public class SyslogAppender extends Sock
public static SyslogAppender createAppender(
// @formatter:off
@PluginAttribute("host") final String host,
- @PluginAttribute(value = "port", defaultIntValue = 0) final int
port,
+ @PluginAttribute(value = "port", defaultInt = 0) final int port,
@PluginAttribute("protocol") final String protocolStr,
@PluginElement("SSL") final SslConfiguration sslConfig,
- @PluginAttribute(value = "reconnectionDelay", defaultIntValue = 0)
final int reconnectionDelay,
- @PluginAttribute(value = "immediateFail", defaultBooleanValue =
true) final boolean immediateFail,
+ @PluginAttribute(value = "reconnectionDelay", defaultInt = 0)
final int reconnectionDelay,
+ @PluginAttribute(value = "immediateFail", defaultBoolean = true)
final boolean immediateFail,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "immediateFlush", defaultBooleanValue =
true) final boolean immediateFlush,
- @PluginAttribute(value = "ignoreExceptions", defaultBooleanValue =
true) final boolean ignoreExceptions,
- @PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
+ @PluginAttribute(value = "immediateFlush", defaultBoolean = true)
final boolean immediateFlush,
+ @PluginAttribute(value = "ignoreExceptions", defaultBoolean =
true) final boolean ignoreExceptions,
+ @PluginAttribute(value = "facility", defaultString = "LOCAL0")
final Facility facility,
@PluginAttribute("id") final String id,
- @PluginAttribute(value = "enterpriseNumber", defaultIntValue =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
- @PluginAttribute(value = "includeMdc", defaultBooleanValue = true)
final boolean includeMdc,
+ @PluginAttribute(value = "enterpriseNumber", defaultInt =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
+ @PluginAttribute(value = "includeMdc", defaultBoolean = true)
final boolean includeMdc,
@PluginAttribute("mdcId") final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultBooleanValue = false)
final boolean newLine,
+ @PluginAttribute(value = "newLine", defaultBoolean = false) final
boolean newLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute("appName") final String appName,
@PluginAttribute("messageId") final String msgId,
@@ -118,10 +118,10 @@ public class SyslogAppender extends Sock
@PluginAttribute("format") final String format,
@PluginElement("Filters") final Filter filter,
@PluginConfiguration final Configuration config,
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charsetName,
+ @PluginAttribute(value = "charset", defaultString = "UTF-8") final
Charset charsetName,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
- @PluginAttribute(value = "advertise", defaultBooleanValue = false)
final boolean advertise) {
+ @PluginAttribute(value = "advertise", defaultBoolean = false)
final boolean advertise) {
// @formatter:on
// TODO: add Protocol to TypeConverters
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java
Fri May 30 17:04:19 2014
@@ -46,30 +46,30 @@ public @interface PluginAttribute {
/**
* Specifies the default value this attribute should use if none is
provided or if the provided value is invalid.
*/
- String defaultStringValue() default "";
+ String defaultString() default "";
/**
* Specifies the default integer value to use.
*/
- int defaultIntValue() default 0;
+ int defaultInt() default 0;
/**
* Specifies the default long value to use.
*/
- long defaultLongValue() default 0L;
+ long defaultLong() default 0L;
/**
* Specifies the default boolean value to use.
*/
- boolean defaultBooleanValue() default false;
+ boolean defaultBoolean() default false;
/**
* Specifies the default floating point value to use.
*/
- float defaultFloatValue() default 0.0f;
+ float defaultFloat() default 0.0f;
/**
* Specifies the default double floating point value to use.
*/
- double defaultDoubleValue() default 0.0d;
+ double defaultDouble() default 0.0d;
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
Fri May 30 17:04:19 2014
@@ -46,20 +46,20 @@ public class PluginAttributeVisitor exte
private Object findDefaultValue(final LogEvent event) {
if (this.conversionType == int.class || this.conversionType ==
Integer.class) {
- return this.annotation.defaultIntValue();
+ return this.annotation.defaultInt();
}
if (this.conversionType == long.class || this.conversionType ==
Long.class) {
- return this.annotation.defaultLongValue();
+ return this.annotation.defaultLong();
}
if (this.conversionType == boolean.class || this.conversionType ==
Boolean.class) {
- return this.annotation.defaultBooleanValue();
+ return this.annotation.defaultBoolean();
}
if (this.conversionType == float.class || this.conversionType ==
Float.class) {
- return this.annotation.defaultFloatValue();
+ return this.annotation.defaultFloat();
}
if (this.conversionType == double.class || this.conversionType ==
Double.class) {
- return this.annotation.defaultDoubleValue();
+ return this.annotation.defaultDouble();
}
- return this.substitutor.replace(event,
this.annotation.defaultStringValue());
+ return this.substitutor.replace(event,
this.annotation.defaultString());
}
}
Modified:
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=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java
Fri May 30 17:04:19 2014
@@ -323,12 +323,12 @@ public final class HtmlLayout extends Ab
*/
@PluginFactory
public static HtmlLayout createLayout(
- @PluginAttribute(value = "locationInfo", defaultBooleanValue =
false) final boolean locationInfo,
- @PluginAttribute(value = "title", defaultStringValue =
DEFAULT_TITLE) final String title,
+ @PluginAttribute(value = "locationInfo", defaultBoolean = false)
final boolean locationInfo,
+ @PluginAttribute(value = "title", defaultString = DEFAULT_TITLE)
final String title,
@PluginAttribute("contentType") String contentType,
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
+ @PluginAttribute(value = "charset", defaultString = "UTF-8") final
Charset charset,
@PluginAttribute("fontSize") String fontSize,
- @PluginAttribute(value = "fontName", defaultStringValue =
DEFAULT_FONT_FAMILY) final String font) {
+ @PluginAttribute(value = "fontName", defaultString =
DEFAULT_FONT_FAMILY) final String font) {
final FontSize fs = FontSize.getFontSize(fontSize);
fontSize = fs.getFontSize();
final String headerSize = fs.larger().getFontSize();
@@ -354,22 +354,22 @@ public final class HtmlLayout extends Ab
public static class Builder implements
org.apache.logging.log4j.core.util.Builder<HtmlLayout> {
- @PluginAttribute(value = "locationInfo", defaultBooleanValue = false)
+ @PluginAttribute(value = "locationInfo", defaultBoolean = false)
private boolean locationInfo = false;
- @PluginAttribute(value = "title", defaultStringValue = DEFAULT_TITLE)
+ @PluginAttribute(value = "title", defaultString = DEFAULT_TITLE)
private String title = DEFAULT_TITLE;
@PluginAttribute(value = "contentType")
private String contentType = null; // defer default value in order to
use specified charset
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
+ @PluginAttribute(value = "charset", defaultString = "UTF-8")
private Charset charset = Charsets.UTF_8;
- @PluginAttribute(value = "fontSize", defaultStringValue = "SMALL")
+ @PluginAttribute(value = "fontSize", defaultString = "SMALL")
private FontSize fontSize = FontSize.SMALL;
- @PluginAttribute(value = "fontName", defaultStringValue =
DEFAULT_FONT_FAMILY)
+ @PluginAttribute(value = "fontName", defaultString =
DEFAULT_FONT_FAMILY)
private String fontName = DEFAULT_FONT_FAMILY;
private Builder() {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JsonLayout.java
Fri May 30 17:04:19 2014
@@ -854,11 +854,11 @@ public final class JsonLayout extends Ab
@PluginFactory
public static AbstractJacksonLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultBooleanValue =
false) final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultBooleanValue =
false) final boolean properties,
- @PluginAttribute(value = "complete", defaultBooleanValue = false)
final boolean complete,
- @PluginAttribute(value = "compact", defaultBooleanValue = false)
final boolean compact,
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset
+ @PluginAttribute(value = "locationInfo", defaultBoolean = false)
final boolean locationInfo,
+ @PluginAttribute(value = "properties", defaultBoolean = false)
final boolean properties,
+ @PluginAttribute(value = "complete", defaultBoolean = false) final
boolean complete,
+ @PluginAttribute(value = "compact", defaultBoolean = false) final
boolean compact,
+ @PluginAttribute(value = "charset", defaultString = "UTF-8") final
Charset charset
// @formatter:on
) {
return new JsonLayout(locationInfo, properties, complete, compact,
charset);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LoggerFields.java
Fri May 30 17:04:19 2014
@@ -73,7 +73,7 @@ public final class LoggerFields {
@PluginElement("LoggerFields") final KeyValuePair[] keyValuePairs,
@PluginAttribute("sdId") final String sdId,
@PluginAttribute("enterpriseId") final String enterpriseId,
- @PluginAttribute(value = "discardIfAllFieldsAreEmpty",
defaultBooleanValue = false) final boolean discardIfAllFieldsAreEmpty) {
+ @PluginAttribute(value = "discardIfAllFieldsAreEmpty", defaultBoolean
= false) final boolean discardIfAllFieldsAreEmpty) {
final Map<String, String> map = new HashMap<String, String>();
for (final KeyValuePair keyValuePair : keyValuePairs) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
Fri May 30 17:04:19 2014
@@ -265,12 +265,12 @@ public final class PatternLayout extends
*/
@PluginFactory
public static PatternLayout createLayout(
- @PluginAttribute(value = "pattern", defaultStringValue =
DEFAULT_CONVERSION_PATTERN) final String pattern,
+ @PluginAttribute(value = "pattern", defaultString =
DEFAULT_CONVERSION_PATTERN) final String pattern,
@PluginConfiguration final Configuration config,
@PluginElement("Replace") final RegexReplacement replace,
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
- @PluginAttribute(value = "alwaysWriteExceptions",
defaultBooleanValue = true) final boolean alwaysWriteExceptions,
- @PluginAttribute(value = "noConsoleNoAnsi", defaultBooleanValue =
false) final boolean noConsoleNoAnsi,
+ @PluginAttribute(value = "charset", defaultString = "UTF-8") final
Charset charset,
+ @PluginAttribute(value = "alwaysWriteExceptions", defaultBoolean =
true) final boolean alwaysWriteExceptions,
+ @PluginAttribute(value = "noConsoleNoAnsi", defaultBoolean =
false) final boolean noConsoleNoAnsi,
@PluginAttribute("header") final String header,
@PluginAttribute("footer") final String footer) {
return newBuilder()
@@ -313,7 +313,7 @@ public final class PatternLayout extends
// FIXME: it seems rather redundant to repeat default values (same
goes for field names)
// perhaps introduce a @PluginBuilderAttribute that has no values of
its own and uses reflection?
- @PluginAttribute(value = "pattern", defaultStringValue =
PatternLayout.DEFAULT_CONVERSION_PATTERN)
+ @PluginAttribute(value = "pattern", defaultString =
PatternLayout.DEFAULT_CONVERSION_PATTERN)
private String pattern = PatternLayout.DEFAULT_CONVERSION_PATTERN;
@PluginConfiguration
@@ -322,13 +322,13 @@ public final class PatternLayout extends
@PluginElement("Replace")
private RegexReplacement regexReplacement = null;
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
+ @PluginAttribute(value = "charset", defaultString = "UTF-8")
private Charset charset = Charsets.UTF_8;
- @PluginAttribute(value = "alwaysWriteExceptions", defaultBooleanValue
= true)
+ @PluginAttribute(value = "alwaysWriteExceptions", defaultBoolean =
true)
private boolean alwaysWriteExceptions = true;
- @PluginAttribute(value = "noConsoleNoAnsi", defaultBooleanValue =
false)
+ @PluginAttribute(value = "noConsoleNoAnsi", defaultBoolean = false)
private boolean noConsoleNoAnsi = false;
@PluginAttribute("header")
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Rfc5424Layout.java
Fri May 30 17:04:19 2014
@@ -624,14 +624,14 @@ public final class Rfc5424Layout extends
*/
@PluginFactory
public static Rfc5424Layout createLayout(
- @PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
+ @PluginAttribute(value = "facility", defaultString = "LOCAL0")
final Facility facility,
@PluginAttribute("id") final String id,
- @PluginAttribute(value = "enterpriseNumber", defaultIntValue =
DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
- @PluginAttribute(value = "includeMDC", defaultBooleanValue = true)
final boolean includeMDC,
- @PluginAttribute(value = "mdcId", defaultStringValue =
DEFAULT_MDCID) final String mdcId,
+ @PluginAttribute(value = "enterpriseNumber", defaultInt =
DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
+ @PluginAttribute(value = "includeMDC", defaultBoolean = true)
final boolean includeMDC,
+ @PluginAttribute(value = "mdcId", defaultString = DEFAULT_MDCID)
final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultBooleanValue = false)
final boolean newLine,
+ @PluginAttribute(value = "newLine", defaultBoolean = false) final
boolean newLine,
@PluginAttribute("newLineEscape") final String escapeNL,
@PluginAttribute("appName") final String appName,
@PluginAttribute("messageId") final String msgId,
@@ -639,7 +639,7 @@ public final class Rfc5424Layout extends
@PluginAttribute("mdcIncludes") String includes,
@PluginAttribute("mdcRequired") final String required,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
- @PluginAttribute(value = "useTlsMessageFormat",
defaultBooleanValue = false) final boolean useTlsMessageFormat, // RFC 5425
+ @PluginAttribute(value = "useTlsMessageFormat", defaultBoolean =
false) final boolean useTlsMessageFormat, // RFC 5425
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
@PluginConfiguration final Configuration config) {
final Charset charset = Charsets.UTF_8;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
Fri May 30 17:04:19 2014
@@ -134,10 +134,10 @@ public final class SyslogLayout extends
*/
@PluginFactory
public static SyslogLayout createLayout(
- @PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
- @PluginAttribute(value = "newLine", defaultBooleanValue = false)
final boolean includeNewLine,
+ @PluginAttribute(value = "facility", defaultString = "LOCAL0")
final Facility facility,
+ @PluginAttribute(value = "newLine", defaultBoolean = false) final
boolean includeNewLine,
@PluginAttribute("newLineEscape") final String escapeNL,
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset) {
+ @PluginAttribute(value = "charset", defaultString = "UTF-8") final
Charset charset) {
return new SyslogLayout(facility, includeNewLine, escapeNL, charset);
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java?rev=1598674&r1=1598673&r2=1598674&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XmlLayout.java
Fri May 30 17:04:19 2014
@@ -272,11 +272,11 @@ public final class XmlLayout extends Abs
@PluginFactory
public static XmlLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultBooleanValue =
false) final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultBooleanValue =
false) final boolean properties,
- @PluginAttribute(value = "complete", defaultBooleanValue = false)
final boolean complete,
- @PluginAttribute(value = "compact", defaultBooleanValue = false)
final boolean compact,
- @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset)
+ @PluginAttribute(value = "locationInfo", defaultBoolean = false)
final boolean locationInfo,
+ @PluginAttribute(value = "properties", defaultBoolean = false)
final boolean properties,
+ @PluginAttribute(value = "complete", defaultBoolean = false) final
boolean complete,
+ @PluginAttribute(value = "compact", defaultBoolean = false) final
boolean compact,
+ @PluginAttribute(value = "charset", defaultString = "UTF-8") final
Charset charset)
// @formatter:on
{
return new XmlLayout(locationInfo, properties, complete, compact,
charset);
