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 2013/08/20 20:38:37 UTC
svn commit: r1515913 [2/2] - in /logging/log4j/log4j2/trunk:
core/src/main/java/org/apache/logging/log4j/core/appender/
core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/
core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/...
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Tue Aug 20 18:38:36 2013
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -148,10 +148,10 @@ public class AsyncLoggerConfig extends L
*/
@PluginFactory
public static LoggerConfig createLogger(
- @PluginAttr("additivity") final String additivity,
- @PluginAttr("level") final String levelName,
- @PluginAttr("name") final String loggerName,
- @PluginAttr("includeLocation") final String includeLocation,
+ @PluginAttribute("additivity") final String additivity,
+ @PluginAttribute("level") final String levelName,
+ @PluginAttribute("name") final String loggerName,
+ @PluginAttribute("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
@@ -191,9 +191,9 @@ public class AsyncLoggerConfig extends L
@PluginFactory
public static LoggerConfig createLogger(
- @PluginAttr("additivity") final String additivity,
- @PluginAttr("level") final String levelName,
- @PluginAttr("includeLocation") final String includeLocation,
+ @PluginAttribute("additivity") final String additivity,
+ @PluginAttribute("level") final String levelName,
+ @PluginAttribute("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java Tue Aug 20 18:38:36 2013
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAliases;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.status.StatusLogger;
@@ -69,9 +69,10 @@ public final class AppenderRef {
* @return The name of the Appender.
*/
@PluginFactory
- public static AppenderRef createAppenderRef(@PluginAttr("ref") final String ref,
- @PluginAttr("level") final String levelName,
- @PluginElement("Filters") final Filter filter) {
+ public static AppenderRef createAppenderRef(
+ @PluginAttribute("ref") final String ref,
+ @PluginAttribute("level") final String levelName,
+ @PluginElement("Filters") final Filter filter) {
if (ref == null) {
LOGGER.error("Appender references must contain a reference");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Tue Aug 20 18:38:36 2013
@@ -37,7 +37,7 @@ import org.apache.logging.log4j.core.Lay
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.config.plugins.PluginAliases;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -557,7 +557,7 @@ public class BaseConfiguration extends A
* Retrieve a static public 'method to create the desired object. Every parameter
* will be annotated to identify the appropriate attribute or element to use to
* set the value of the parameter.
- * Parameters annotated with PluginAttr will always be set as Strings.
+ * Parameters annotated with PluginAttribute will always be set as Strings.
* Parameters annotated with PluginElement may be Objects or arrays. Collections
* and Maps are currently not supported, although the factory method that is called
* can create these from an array.
@@ -670,8 +670,8 @@ public class BaseConfiguration extends A
final String value = subst.replace(event, v);
sb.append(name).append("=\"").append(value).append("\"");
parms[index] = value;
- } else if (a instanceof PluginAttr) {
- PluginAttr attr = (PluginAttr) a;
+ } else if (a instanceof PluginAttribute) {
+ PluginAttribute attr = (PluginAttribute) a;
final String name = attr.value();
final String value = subst.replace(event, getAttrValue(name, aliases, attrs));
sb.append(name).append("=\"").append(value).append("\"");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Tue Aug 20 18:38:36 2013
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.Lif
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -447,10 +447,10 @@ public class LoggerConfig extends Abstra
*/
@PluginFactory
public static LoggerConfig createLogger(
- @PluginAttr("additivity") final String additivity,
- @PluginAttr("level") final String levelName,
- @PluginAttr("name") final String loggerName,
- @PluginAttr("includeLocation") final String includeLocation,
+ @PluginAttribute("additivity") final String additivity,
+ @PluginAttribute("level") final String levelName,
+ @PluginAttribute("name") final String loggerName,
+ @PluginAttribute("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
@@ -496,9 +496,9 @@ public class LoggerConfig extends Abstra
@PluginFactory
public static LoggerConfig createLogger(
- @PluginAttr("additivity") final String additivity,
- @PluginAttr("level") final String levelName,
- @PluginAttr("includeLocation") final String includeLocation,
+ @PluginAttribute("additivity") final String additivity,
+ @PluginAttribute("level") final String levelName,
+ @PluginAttribute("includeLocation") final String includeLocation,
@PluginElement("AppenderRef") final AppenderRef[] refs,
@PluginElement("Properties") final Property[] properties,
@PluginConfiguration final Configuration config,
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/Property.java Tue Aug 20 18:38:36 2013
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.core.co
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.config.plugins.PluginValue;
import org.apache.logging.log4j.status.StatusLogger;
@@ -62,8 +62,9 @@ public final class Property {
* @return A Property.
*/
@PluginFactory
- public static Property createProperty(@PluginAttr("name") final String key,
- @PluginValue("value") final String value) {
+ public static Property createProperty(
+ @PluginAttribute("name") final String key,
+ @PluginValue("value") final String value) {
if (key == null) {
LOGGER.error("Property key cannot be null");
}
Copied: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java (from r1515899, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttr.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttr.java&r1=1515899&r2=1515913&rev=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttr.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginAttribute.java Tue Aug 20 18:38:36 2013
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.PARAMETER)
-public @interface PluginAttr {
+public @interface PluginAttribute {
String value();
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java Tue Aug 20 18:38:36 2013
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.message.Message;
@@ -224,11 +224,12 @@ public final class BurstFilter extends A
* @return A BurstFilter.
*/
@PluginFactory
- public static BurstFilter createFilter(@PluginAttr("level") final String levelName,
- @PluginAttr("rate") final String rate,
- @PluginAttr("maxBurst") final String maxBurst,
- @PluginAttr("onmatch") final String match,
- @PluginAttr("onmismatch") final String mismatch) {
+ public static BurstFilter createFilter(
+ @PluginAttribute("level") final String levelName,
+ @PluginAttribute("rate") final String rate,
+ @PluginAttribute("maxBurst") final String maxBurst,
+ @PluginAttribute("onmatch") final String match,
+ @PluginAttribute("onmismatch") final String mismatch) {
final Result onMatch = Result.toResult(match, Result.NEUTRAL);
final Result onMismatch = Result.toResult(mismatch, Result.DENY);
final Level level = Level.toLevel(levelName, Level.WARN);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.ThreadCo
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.KeyValuePair;
@@ -125,11 +125,12 @@ public final class DynamicThresholdFilte
* @return The DynamicThresholdFilter.
*/
@PluginFactory
- public static DynamicThresholdFilter createFilter(@PluginAttr("key") final String key,
- @PluginElement("Pairs") final KeyValuePair[] pairs,
- @PluginAttr("defaultThreshold") final String levelName,
- @PluginAttr("onmatch") final String match,
- @PluginAttr("onmismatch") final String mismatch) {
+ public static DynamicThresholdFilter createFilter(
+ @PluginAttribute("key") final String key,
+ @PluginElement("Pairs") final KeyValuePair[] pairs,
+ @PluginAttribute("defaultThreshold") final String levelName,
+ @PluginAttribute("onatch") final String match,
+ @PluginAttribute("onmismatch") final String mismatch) {
final Result onMatch = Result.toResult(match);
final Result onMismatch = Result.toResult(mismatch);
final Map<String, Level> map = new HashMap<String, Level>();
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java Tue Aug 20 18:38:36 2013
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.KeyValuePair;
@@ -116,10 +116,11 @@ public class MapFilter extends AbstractF
}
@PluginFactory
- public static MapFilter createFilter(@PluginElement("Pairs") final KeyValuePair[] pairs,
- @PluginAttr("operator") final String oper,
- @PluginAttr("onmatch") final String match,
- @PluginAttr("onmismatch") final String mismatch) {
+ public static MapFilter createFilter(
+ @PluginElement("Pairs") final KeyValuePair[] pairs,
+ @PluginAttribute("operator") final String oper,
+ @PluginAttribute("onmatch") final String match,
+ @PluginAttribute("onmismatch") final String mismatch) {
if (pairs == null || pairs.length == 0) {
LOGGER.error("keys and values must be specified for the MapFilter");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java Tue Aug 20 18:38:36 2013
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.message.Message;
@@ -80,9 +80,10 @@ public final class MarkerFilter extends
* @return A MarkerFilter.
*/
@PluginFactory
- public static MarkerFilter createFilter(@PluginAttr("marker") final String marker,
- @PluginAttr("onMatch") final String match,
- @PluginAttr("onMismatch") final String mismatch) {
+ public static MarkerFilter createFilter(
+ @PluginAttribute("marker") final String marker,
+ @PluginAttribute("onMatch") final String match,
+ @PluginAttribute("onMismatch") final String mismatch) {
if (marker == null) {
LOGGER.error("A marker must be provided for MarkerFilter");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java Tue Aug 20 18:38:36 2013
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.message.Message;
@@ -104,10 +104,11 @@ public final class RegexFilter extends A
* @return The RegexFilter.
*/
@PluginFactory
- public static RegexFilter createFilter(@PluginAttr("regex") final String regex,
- @PluginAttr("useRawMsg") final String useRawMsg,
- @PluginAttr("onMatch") final String match,
- @PluginAttr("onMismatch") final String mismatch) {
+ public static RegexFilter createFilter(
+ @PluginAttribute("regex") final String regex,
+ @PluginAttribute("useRawMsg") final String useRawMsg,
+ @PluginAttribute("onMatch") final String match,
+ @PluginAttribute("onMismatch") final String mismatch) {
if (regex == null) {
LOGGER.error("A regular expression must be provided for RegexFilter");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/StructuredDataFilter.java Tue Aug 20 18:38:36 2013
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.KeyValuePair;
@@ -101,10 +101,11 @@ public final class StructuredDataFilter
* @return The StructuredDataFilter.
*/
@PluginFactory
- public static StructuredDataFilter createFilter(@PluginElement("Pairs") final KeyValuePair[] pairs,
- @PluginAttr("operator") final String oper,
- @PluginAttr("onmatch") final String match,
- @PluginAttr("onmismatch") final String mismatch) {
+ public static StructuredDataFilter createFilter(
+ @PluginElement("Pairs") final KeyValuePair[] pairs,
+ @PluginAttribute("operator") final String oper,
+ @PluginAttribute("onmatch") final String match,
+ @PluginAttribute("onmismatch") final String mismatch) {
if (pairs == null || pairs.length == 0) {
LOGGER.error("keys and values must be specified for the StructuredDataFilter");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilter.java Tue Aug 20 18:38:36 2013
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.ThreadCo
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.KeyValuePair;
@@ -111,10 +111,11 @@ public class ThreadContextMapFilter exte
}
@PluginFactory
- public static ThreadContextMapFilter createFilter(@PluginElement("Pairs") final KeyValuePair[] pairs,
- @PluginAttr("operator") final String oper,
- @PluginAttr("onmatch") final String match,
- @PluginAttr("onmismatch") final String mismatch) {
+ public static ThreadContextMapFilter createFilter(
+ @PluginElement("Pairs") final KeyValuePair[] pairs,
+ @PluginAttribute("operator") final String oper,
+ @PluginAttribute("onmatch") final String match,
+ @PluginAttribute("onmismatch") final String mismatch) {
if (pairs == null || pairs.length == 0) {
LOGGER.error("key and value pairs must be specified for the ThreadContextMapFilter");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/ThresholdFilter.java Tue Aug 20 18:38:36 2013
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.message.Message;
@@ -83,9 +83,10 @@ public final class ThresholdFilter exten
* @return The created ThresholdFilter.
*/
@PluginFactory
- public static ThresholdFilter createFilter(@PluginAttr("level") final String levelName,
- @PluginAttr("onMatch") final String match,
- @PluginAttr("onMismatch") final String mismatch) {
+ public static ThresholdFilter createFilter(
+ @PluginAttribute("level") final String levelName,
+ @PluginAttribute("onMatch") final String match,
+ @PluginAttribute("onMismatch") final String mismatch) {
final Level level = Level.toLevel(levelName, Level.ERROR);
final Result onMatch = Result.toResult(match, Result.NEUTRAL);
final Result onMismatch = Result.toResult(mismatch, Result.DENY);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java Tue Aug 20 18:38:36 2013
@@ -23,7 +23,7 @@ import java.util.TimeZone;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
@@ -102,11 +102,12 @@ public final class TimeFilter extends Ab
* @return A TimeFilter.
*/
@PluginFactory
- public static TimeFilter createFilter(@PluginAttr("start") final String start,
- @PluginAttr("end") final String end,
- @PluginAttr("timezone") final String tz,
- @PluginAttr("onMatch") final String match,
- @PluginAttr("onMismatch") final String mismatch) {
+ public static TimeFilter createFilter(
+ @PluginAttribute("start") final String start,
+ @PluginAttribute("end") final String end,
+ @PluginAttribute("timezone") final String tz,
+ @PluginAttribute("onMatch") final String match,
+ @PluginAttribute("onMismatch") final String mismatch) {
final SimpleDateFormat stf = new SimpleDateFormat("HH:mm:ss");
long s = 0;
if (start != null) {
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/KeyValuePair.java Tue Aug 20 18:38:36 2013
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.helpers;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
@@ -67,8 +67,9 @@ public class KeyValuePair {
* @return A KeyValuePair.
*/
@PluginFactory
- public static KeyValuePair createPair(@PluginAttr("key") final String key,
- @PluginAttr("value") final String value) {
+ public static KeyValuePair createPair(
+ @PluginAttribute("key") final String key,
+ @PluginAttribute("value") final String value) {
return new KeyValuePair(key, value);
}
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java Tue Aug 20 18:38:36 2013
@@ -31,7 +31,7 @@ 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.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Charsets;
import org.apache.logging.log4j.core.helpers.Constants;
@@ -312,12 +312,13 @@ public final class HTMLLayout extends Ab
* @return An HTML Layout.
*/
@PluginFactory
- public static HTMLLayout createLayout(@PluginAttr("locationInfo") final String locationInfo,
- @PluginAttr("title") String title,
- @PluginAttr("contentType") String contentType,
- @PluginAttr("charset") final String charsetName,
- @PluginAttr("fontSize") String fontSize,
- @PluginAttr("fontName") String font) {
+ 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";
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Charsets;
import org.apache.logging.log4j.core.helpers.Throwables;
@@ -358,11 +358,11 @@ public class JSONLayout extends Abstract
*/
@PluginFactory
public static JSONLayout createLayout(
- @PluginAttr("locationInfo") final String locationInfo,
- @PluginAttr("properties") final String properties,
- @PluginAttr("complete") final String completeStr,
- @PluginAttr("compact") final String compactStr,
- @PluginAttr("charset") final String charsetName) {
+ @PluginAttribute("locationInfo") final String locationInfo,
+ @PluginAttribute("properties") final String properties,
+ @PluginAttribute("complete") final String completeStr,
+ @PluginAttribute("compact") final String compactStr,
+ @PluginAttribute("charset") final String charsetName) {
final Charset charset = Charsets.getSupportedCharset(charsetName, Charsets.UTF_8);
final boolean info = Boolean.parseBoolean(locationInfo);
final boolean props = Boolean.parseBoolean(properties);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java Tue Aug 20 18:38:36 2013
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -208,11 +208,12 @@ public final class PatternLayout extends
* @return The PatternLayout.
*/
@PluginFactory
- public static PatternLayout createLayout(@PluginAttr("pattern") final String pattern,
- @PluginConfiguration final Configuration config,
- @PluginElement("Replace") final RegexReplacement replace,
- @PluginAttr("charset") final String charsetName,
- @PluginAttr("alwaysWriteExceptions") final String always) {
+ public static PatternLayout createLayout(
+ @PluginAttribute("pattern") final String pattern,
+ @PluginConfiguration final Configuration config,
+ @PluginElement("Replace") final RegexReplacement replace,
+ @PluginAttribute("charset") final String charsetName,
+ @PluginAttribute("alwaysWriteExceptions") final String always) {
final Charset charset = Charsets.getSupportedCharset(charsetName);
final boolean alwaysWriteExceptions = Booleans.parseBoolean(always, true);
return new PatternLayout(
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java Tue Aug 20 18:38:36 2013
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.LoggingE
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -532,23 +532,24 @@ public final class RFC5424Layout extends
* @return An RFC5424Layout.
*/
@PluginFactory
- public static RFC5424Layout createLayout(@PluginAttr("facility") final String facility,
- @PluginAttr("id") final String id,
- @PluginAttr("enterpriseNumber") final String ein,
- @PluginAttr("includeMDC") final String includeMDC,
- @PluginAttr("mdcId") String mdcId,
- @PluginAttr("mdcPrefix") final String mdcPrefix,
- @PluginAttr("eventPrefix") final String eventPrefix,
- @PluginAttr("newLine") final String includeNL,
- @PluginAttr("newLineEscape") final String escapeNL,
- @PluginAttr("appName") final String appName,
- @PluginAttr("messageId") final String msgId,
- @PluginAttr("mdcExcludes") final String excludes,
- @PluginAttr("mdcIncludes") String includes,
- @PluginAttr("mdcRequired") final String required,
- @PluginAttr("exceptionPattern") final String exceptionPattern,
- @PluginElement("LoggerFields") final LoggerFields loggerFields,
- @PluginConfiguration final Configuration config) {
+ public static RFC5424Layout createLayout(
+ @PluginAttribute("facility") final String facility,
+ @PluginAttribute("id") final String id,
+ @PluginAttribute("enterpriseNumber") final String ein,
+ @PluginAttribute("includeMDC") final String includeMDC,
+ @PluginAttribute("mdcId") String mdcId,
+ @PluginAttribute("mdcPrefix") final String mdcPrefix,
+ @PluginAttribute("eventPrefix") final String eventPrefix,
+ @PluginAttribute("newLine") final String includeNL,
+ @PluginAttribute("newLineEscape") final String escapeNL,
+ @PluginAttribute("appName") final String appName,
+ @PluginAttribute("messageId") final String msgId,
+ @PluginAttribute("mdcExcludes") final String excludes,
+ @PluginAttribute("mdcIncludes") String includes,
+ @PluginAttribute("mdcRequired") final String required,
+ @PluginAttribute("exceptionPattern") final String exceptionPattern,
+ @PluginElement("LoggerFields") final LoggerFields loggerFields,
+ @PluginConfiguration final Configuration config) {
final Charset charset = Charsets.UTF_8;
if (includes != null && excludes != null) {
LOGGER.error("mdcIncludes and mdcExcludes are mutually exclusive. Includes wil be ignored");
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java Tue Aug 20 18:38:36 2013
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Charsets;
import org.apache.logging.log4j.core.net.Facility;
@@ -152,10 +152,11 @@ public class SyslogLayout extends Abstra
* @return A SyslogLayout.
*/
@PluginFactory
- public static SyslogLayout createLayout(@PluginAttr("facility") final String facility,
- @PluginAttr("newLine") final String includeNL,
- @PluginAttr("newLineEscape") final String escapeNL,
- @PluginAttr("charset") final String charsetName) {
+ public static SyslogLayout createLayout(
+ @PluginAttribute("facility") final String facility,
+ @PluginAttribute("newLine") final String includeNL,
+ @PluginAttribute("newLineEscape") final String escapeNL,
+ @PluginAttribute("charset") final String charsetName) {
final Charset charset = Charsets.getSupportedCharset(charsetName);
final boolean includeNewLine = Boolean.parseBoolean(includeNL);
final Facility f = Facility.toFacility(facility, Facility.LOCAL0);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java Tue Aug 20 18:38:36 2013
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Charsets;
import org.apache.logging.log4j.core.helpers.Strings;
@@ -353,12 +353,12 @@ public class XMLLayout extends AbstractS
*/
@PluginFactory
public static XMLLayout createLayout(
- @PluginAttr("locationInfo") final String locationInfo,
- @PluginAttr("properties") final String properties,
- @PluginAttr("complete") final String completeStr,
- @PluginAttr("compact") final String compactStr,
- @PluginAttr("namespacePrefix") final String namespacePrefix,
- @PluginAttr("charset") final String charsetName) {
+ @PluginAttribute("locationInfo") final String locationInfo,
+ @PluginAttribute("properties") final String properties,
+ @PluginAttribute("complete") final String completeStr,
+ @PluginAttribute("compact") final String compactStr,
+ @PluginAttribute("namespacePrefix") final String namespacePrefix,
+ @PluginAttribute("charset") final String charsetName) {
final Charset charset = Charsets.getSupportedCharset(charsetName, Charsets.UTF_8);
final boolean info = Boolean.parseBoolean(locationInfo);
final boolean props = Boolean.parseBoolean(properties);
Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java Tue Aug 20 18:38:36 2013
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.status.StatusLogger;
@@ -68,8 +68,9 @@ public final class RegexReplacement {
* @return A RegexReplacement.
*/
@PluginFactory
- public static RegexReplacement createRegexReplacement(@PluginAttr("regex") final String regex,
- @PluginAttr("replacement") final String replacement) {
+ public static RegexReplacement createRegexReplacement(
+ @PluginAttribute("regex") final String regex,
+ @PluginAttribute("replacement") final String replacement) {
if (regex == null) {
LOGGER.error("A regular expression is required for replacement");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java Tue Aug 20 18:38:36 2013
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.LoggingE
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
@@ -39,7 +39,7 @@ public class AlwaysFailAppender extends
}
@PluginFactory
- public static AlwaysFailAppender createAppender(@PluginAttr("name") final String name) {
+ public static AlwaysFailAppender createAppender(@PluginAttribute("name") final String name) {
if (name == null) {
LOGGER.error("A name for the Appender must be specified");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java Tue Aug 20 18:38:36 2013
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.LoggingE
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import java.util.ArrayList;
@@ -57,7 +57,7 @@ public class FailOnceAppender extends Ab
}
@PluginFactory
- public static FailOnceAppender createAppender(@PluginAttr("name") final String name) {
+ public static FailOnceAppender createAppender(@PluginAttribute("name") final String name) {
if (name == null) {
LOGGER.error("A name for the Appender must be specified");
return null;
Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java Tue Aug 20 18:38:36 2013
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.core.Lay
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
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;
@@ -154,11 +154,12 @@ public class ListAppender extends Abstra
}
@PluginFactory
- public static ListAppender createAppender(@PluginAttr("name") final String name,
- @PluginAttr("entryPerNewLine") final String newLine,
- @PluginAttr("raw") final String raw,
- @PluginElement("Layout") final Layout<? extends Serializable> layout,
- @PluginElement("Filters") final Filter filter) {
+ public static ListAppender createAppender(
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("entryPerNewLine") final String newLine,
+ @PluginAttribute("raw") final String raw,
+ @PluginElement("Layout") final Layout<? extends Serializable> layout,
+ @PluginElement("Filters") final Filter filter) {
if (name == null) {
LOGGER.error("No name provided for ListAppender");
Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java Tue Aug 20 18:38:36 2013
@@ -18,7 +18,7 @@ package org.apache.logging.log4j.flume.a
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Integers;
import org.apache.logging.log4j.status.StatusLogger;
@@ -72,8 +72,8 @@ public final class Agent {
* @return The Agent.
*/
@PluginFactory
- public static Agent createAgent(@PluginAttr("host") String host,
- @PluginAttr("port") final String port) {
+ public static Agent createAgent(@PluginAttribute("host") String host,
+ @PluginAttribute("port") final String port) {
if (host == null) {
host = DEFAULT_HOST;
}
Modified: logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1515913&r1=1515912&r2=1515913&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original)
+++ logging/log4j/log4j2/trunk/flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Tue Aug 20 18:38:36 2013
@@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.Log
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttr;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.helpers.Booleans;
@@ -158,22 +158,22 @@ public final class FlumeAppender extends
@PluginFactory
public static FlumeAppender createAppender(@PluginElement("Agents") Agent[] agents,
@PluginElement("Properties") final Property[] properties,
- @PluginAttr("embedded") final String embedded,
- @PluginAttr("type") final String type,
- @PluginAttr("dataDir") final String dataDir,
- @PluginAttr("connectTimeout") final String connectionTimeout,
- @PluginAttr("requestTimeout") final String requestTimeout,
- @PluginAttr("agentRetries") final String agentRetries,
- @PluginAttr("maxDelay") final String maxDelay,
- @PluginAttr("name") final String name,
- @PluginAttr("ignoreExceptions") final String ignore,
- @PluginAttr("mdcExcludes") final String excludes,
- @PluginAttr("mdcIncludes") final String includes,
- @PluginAttr("mdcRequired") final String required,
- @PluginAttr("mdcPrefix") final String mdcPrefix,
- @PluginAttr("eventPrefix") final String eventPrefix,
- @PluginAttr("compress") final String compressBody,
- @PluginAttr("batchSize") final String batchSize,
+ @PluginAttribute("embedded") final String embedded,
+ @PluginAttribute("type") final String type,
+ @PluginAttribute("dataDir") final String dataDir,
+ @PluginAttribute("connectTimeout") final String connectionTimeout,
+ @PluginAttribute("requestTimeout") final String requestTimeout,
+ @PluginAttribute("agentRetries") final String agentRetries,
+ @PluginAttribute("maxDelay") final String maxDelay,
+ @PluginAttribute("name") final String name,
+ @PluginAttribute("ignoreExceptions") final String ignore,
+ @PluginAttribute("mdcExcludes") final String excludes,
+ @PluginAttribute("mdcIncludes") final String includes,
+ @PluginAttribute("mdcRequired") final String required,
+ @PluginAttribute("mdcPrefix") final String mdcPrefix,
+ @PluginAttribute("eventPrefix") final String eventPrefix,
+ @PluginAttribute("compress") final String compressBody,
+ @PluginAttribute("batchSize") final String batchSize,
@PluginElement("FlumeEventFactory") final FlumeEventFactory factory,
@PluginElement("Layout") Layout<? extends Serializable> layout,
@PluginElement("Filters") final Filter filter) {