Author: mattsicker
Date: Mon May 26 19:44:36 2014
New Revision: 1597635
URL: http://svn.apache.org/r1597635
Log:
Rename defaultValue() to defaultStringValue().
- Also added other defaultFooValues.
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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 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", defaultValue = "true") final
boolean blocking,
- @PluginAttribute(value = "bufferSize", defaultValue =
DEFAULT_QUEUE_SIZE) final int size,
+ @PluginAttribute(value = "blocking", defaultStringValue = "true")
final boolean blocking,
+ @PluginAttribute(value = "bufferSize", defaultStringValue =
DEFAULT_QUEUE_SIZE) final int size,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "includeLocation", defaultValue =
"false") final boolean includeLocation,
+ @PluginAttribute(value = "includeLocation", defaultStringValue =
"false") final boolean includeLocation,
@PluginElement("Filter") final Filter filter,
@PluginConfiguration final Configuration config,
- @PluginAttribute(value = "ignoreExceptions", defaultValue =
"true") final boolean ignoreExceptions) {
+ @PluginAttribute(value = "ignoreExceptions", defaultStringValue =
"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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 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", defaultValue = "SYSTEM_OUT")
final String targetStr,
+ @PluginAttribute(value = "target", defaultStringValue =
"SYSTEM_OUT") final String targetStr,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "follow", defaultValue = "false") final
String follow,
- @PluginAttribute(value = "ignoreExceptions", defaultValue =
"true") final String ignore) {
+ @PluginAttribute(value = "follow", defaultStringValue = "false")
final String follow,
+ @PluginAttribute(value = "ignoreExceptions", defaultStringValue =
"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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -93,22 +93,22 @@ public class SyslogAppender extends Sock
public static SyslogAppender createAppender(
// @formatter:off
@PluginAttribute("host") final String host,
- @PluginAttribute(value = "port", defaultValue = "0") final int
port,
+ @PluginAttribute(value = "port", defaultStringValue = "0") final
int port,
@PluginAttribute("protocol") final String protocolStr,
@PluginElement("SSL") final SslConfiguration sslConfig,
- @PluginAttribute(value = "reconnectionDelay", defaultValue = "0")
final int reconnectionDelay,
- @PluginAttribute(value = "immediateFail", defaultValue = "true")
final boolean immediateFail,
+ @PluginAttribute(value = "reconnectionDelay", defaultStringValue =
"0") final int reconnectionDelay,
+ @PluginAttribute(value = "immediateFail", defaultStringValue =
"true") final boolean immediateFail,
@PluginAttribute("name") final String name,
- @PluginAttribute(value = "immediateFlush", defaultValue = "true")
final boolean immediateFlush,
- @PluginAttribute(value = "ignoreExceptions", defaultValue =
"true") final boolean ignoreExceptions,
- @PluginAttribute(value = "facility", defaultValue = "LOCAL0")
final Facility facility,
+ @PluginAttribute(value = "immediateFlush", defaultStringValue =
"true") final boolean immediateFlush,
+ @PluginAttribute(value = "ignoreExceptions", defaultStringValue =
"true") final boolean ignoreExceptions,
+ @PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
@PluginAttribute("id") final String id,
- @PluginAttribute(value = "enterpriseNumber", defaultValue =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
- @PluginAttribute(value = "includeMdc", defaultValue = "true")
final boolean includeMdc,
+ @PluginAttribute(value = "enterpriseNumber", defaultStringValue =
Rfc5424Layout.DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
+ @PluginAttribute(value = "includeMdc", defaultStringValue =
"true") final boolean includeMdc,
@PluginAttribute("mdcId") final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultValue = "false") final
boolean newLine,
+ @PluginAttribute(value = "newLine", defaultStringValue = "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", defaultValue = "UTF-8") final
Charset charsetName,
+ @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charsetName,
@PluginAttribute("exceptionPattern") final String exceptionPattern,
@PluginElement("LoggerFields") final LoggerFields[] loggerFields,
- @PluginAttribute(value = "advertise", defaultValue = "false")
final boolean advertise) {
+ @PluginAttribute(value = "advertise", defaultStringValue =
"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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -23,7 +23,11 @@ import java.lang.annotation.RetentionPol
import java.lang.annotation.Target;
/**
- * Identifies a Plugin Attribute.
+ * Identifies a Plugin Attribute and its default value. Note that only one of
the defaultFooValue attributes will be
+ * used based on the type this annotation is attached to. Thus, for primitive
types, the default<i>Type</i>Value
+ * attribute will be used for some <i>Type</i>. However, for more complex
types (including enums), the default
+ * string value is used instead and should correspond to the string that would
correctly convert to the appropriate
+ * enum value using {@link Enum#valueOf(Class, String) Enum.valueOf}.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -39,5 +43,30 @@ public @interface PluginAttribute {
/**
* Specifies the default value this attribute should use if none is
provided or if the provided value is invalid.
*/
- String defaultValue() default "";
+ String defaultStringValue() default "";
+
+ /**
+ * Specifies the default integer value to use.
+ */
+ int defaultIntValue() default 0;
+
+ /**
+ * Specifies the default long value to use.
+ */
+ long defaultLongValue() default 0L;
+
+ /**
+ * Specifies the default boolean value to use.
+ */
+ boolean defaultBooleanValue() default false;
+
+ /**
+ * Specifies the default floating point value to use.
+ */
+ float defaultFloatValue() default 0.0f;
+
+ /**
+ * Specifies the default double floating point value to use.
+ */
+ double defaultDoubleValue() 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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -38,7 +38,7 @@ public class PluginAttributeVisitor exte
final Map<String, String> attributes = node.getAttributes();
final String rawValue = removeAttributeValue(attributes, name,
this.aliases);
final String replacedValue = this.substitutor.replace(event, rawValue);
- final String rawDefaultValue = this.annotation.defaultValue();
+ final String rawDefaultValue = this.annotation.defaultStringValue();
final String replacedDefaultValue = this.substitutor.replace(event,
rawDefaultValue);
final Object value = convert(replacedValue, replacedDefaultValue);
LOGGER.debug("Attribute({}=\"{}\"", name, value);
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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -322,12 +322,12 @@ public final class HtmlLayout extends Ab
*/
@PluginFactory
public static HtmlLayout createLayout(
- @PluginAttribute(value = "locationInfo", defaultValue = "false")
final boolean locationInfo,
- @PluginAttribute(value = "title", defaultValue = DEFAULT_TITLE)
final String title,
- @PluginAttribute(value = "contentType", defaultValue =
DEFAULT_CONTENT_TYPE) String contentType,
- @PluginAttribute(value = "charset", defaultValue = "UTF-8") final
Charset charset,
+ @PluginAttribute(value = "locationInfo", defaultStringValue =
"false") final boolean locationInfo,
+ @PluginAttribute(value = "title", defaultStringValue =
DEFAULT_TITLE) final String title,
+ @PluginAttribute(value = "contentType", defaultStringValue =
DEFAULT_CONTENT_TYPE) String contentType,
+ @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
@PluginAttribute("fontSize") String fontSize,
- @PluginAttribute(value = "fontName", defaultValue =
DEFAULT_FONT_FAMILY) final String font) {
+ @PluginAttribute(value = "fontName", defaultStringValue =
DEFAULT_FONT_FAMILY) final String font) {
final FontSize fs = FontSize.getFontSize(fontSize);
fontSize = fs.getFontSize();
final String headerSize = fs.larger().getFontSize();
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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -854,11 +854,11 @@ public final class JsonLayout extends Ab
@PluginFactory
public static AbstractJacksonLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultValue = "false")
final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultValue = "false")
final boolean properties,
- @PluginAttribute(value = "complete", defaultValue = "false") final
boolean complete,
- @PluginAttribute(value = "compact", defaultValue = "false") final
boolean compact,
- @PluginAttribute(value = "charset", defaultValue = "UTF-8") final
Charset charset
+ @PluginAttribute(value = "locationInfo", defaultStringValue =
"false") final boolean locationInfo,
+ @PluginAttribute(value = "properties", defaultStringValue =
"false") final boolean properties,
+ @PluginAttribute(value = "complete", defaultStringValue = "false")
final boolean complete,
+ @PluginAttribute(value = "compact", defaultStringValue = "false")
final boolean compact,
+ @PluginAttribute(value = "charset", defaultStringValue = "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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 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", defaultValue =
"false") final boolean discardIfAllFieldsAreEmpty) {
+ @PluginAttribute(value = "discardIfAllFieldsAreEmpty",
defaultStringValue = "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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -270,9 +270,9 @@ public final class PatternLayout extends
@PluginAttribute("pattern") final String pattern,
@PluginConfiguration final Configuration config,
@PluginElement("Replace") final RegexReplacement replace,
- @PluginAttribute(value = "charset", defaultValue = "UTF-8") final
Charset charset,
- @PluginAttribute(value = "alwaysWriteExceptions", defaultValue =
"true") final boolean alwaysWriteExceptions,
- @PluginAttribute(value = "noConsoleNoAnsi", defaultValue =
"false") final boolean noConsoleNoAnsi,
+ @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset,
+ @PluginAttribute(value = "alwaysWriteExceptions",
defaultStringValue = "true") final boolean alwaysWriteExceptions,
+ @PluginAttribute(value = "noConsoleNoAnsi", defaultStringValue =
"false") final boolean noConsoleNoAnsi,
@PluginAttribute("header") final String header,
@PluginAttribute("footer") final String footer) {
return new PatternLayout(config, replace, pattern == null ?
DEFAULT_CONVERSION_PATTERN : pattern, charset,
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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -624,14 +624,14 @@ public final class Rfc5424Layout extends
*/
@PluginFactory
public static Rfc5424Layout createLayout(
- @PluginAttribute(value = "facility", defaultValue = "LOCAL0")
final Facility facility,
+ @PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
@PluginAttribute("id") final String id,
- @PluginAttribute(value = "enterpriseNumber", defaultValue =
DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
- @PluginAttribute(value = "includeMDC", defaultValue = "true")
final boolean includeMDC,
- @PluginAttribute(value = "mdcId", defaultValue = DEFAULT_MDCID)
final String mdcId,
+ @PluginAttribute(value = "enterpriseNumber", defaultStringValue =
DEFAULT_ENTERPRISE_NUMBER) final int enterpriseNumber,
+ @PluginAttribute(value = "includeMDC", defaultStringValue =
"true") final boolean includeMDC,
+ @PluginAttribute(value = "mdcId", defaultStringValue =
DEFAULT_MDCID) final String mdcId,
@PluginAttribute("mdcPrefix") final String mdcPrefix,
@PluginAttribute("eventPrefix") final String eventPrefix,
- @PluginAttribute(value = "newLine", defaultValue = "false") final
boolean newLine,
+ @PluginAttribute(value = "newLine", defaultStringValue = "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", defaultValue =
"false") final boolean useTlsMessageFormat, // RFC 5425
+ @PluginAttribute(value = "useTlsMessageFormat", defaultStringValue
= "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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -134,10 +134,10 @@ public final class SyslogLayout extends
*/
@PluginFactory
public static SyslogLayout createLayout(
- @PluginAttribute(value = "facility", defaultValue = "LOCAL0")
final Facility facility,
- @PluginAttribute(value = "newLine", defaultValue = "false") final
boolean includeNewLine,
+ @PluginAttribute(value = "facility", defaultStringValue =
"LOCAL0") final Facility facility,
+ @PluginAttribute(value = "newLine", defaultStringValue = "false")
final boolean includeNewLine,
@PluginAttribute("newLineEscape") final String escapeNL,
- @PluginAttribute(value = "charset", defaultValue = "UTF-8") final
Charset charset) {
+ @PluginAttribute(value = "charset", defaultStringValue = "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=1597635&r1=1597634&r2=1597635&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
Mon May 26 19:44:36 2014
@@ -272,11 +272,11 @@ public final class XmlLayout extends Abs
@PluginFactory
public static XmlLayout createLayout(
// @formatter:off
- @PluginAttribute(value = "locationInfo", defaultValue = "false")
final boolean locationInfo,
- @PluginAttribute(value = "properties", defaultValue = "false")
final boolean properties,
- @PluginAttribute(value = "complete", defaultValue = "false") final
boolean complete,
- @PluginAttribute(value = "compact", defaultValue = "false") final
boolean compact,
- @PluginAttribute(value = "charset", defaultValue = "UTF-8") final
Charset charset)
+ @PluginAttribute(value = "locationInfo", defaultStringValue =
"false") final boolean locationInfo,
+ @PluginAttribute(value = "properties", defaultStringValue =
"false") final boolean properties,
+ @PluginAttribute(value = "complete", defaultStringValue = "false")
final boolean complete,
+ @PluginAttribute(value = "compact", defaultStringValue = "false")
final boolean compact,
+ @PluginAttribute(value = "charset", defaultStringValue = "UTF-8")
final Charset charset)
// @formatter:on
{
return new XmlLayout(locationInfo, properties, complete, compact,
charset);
