Change PluginAttrs to PluginElements. Comment println in unit test
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers@1179235 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java b/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
index 8f1186b..dad9c86 100644
--- a/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
+++ b/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
@@ -83,7 +83,7 @@
}
@PluginFactory
- public static FlumeAvroAppender createAppender(@PluginAttr("agents") Agent[] agents,
+ public static FlumeAvroAppender createAppender(@PluginElement("agents") Agent[] agents,
@PluginAttr("reconnectionDelay") String delay,
@PluginAttr("agentRetries") String agentRetries,
@PluginAttr("name") String name,
diff --git a/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java b/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
index e7e7ea0..21147cc 100644
--- a/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
+++ b/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
@@ -23,6 +23,7 @@
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.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.message.Message;
@@ -85,7 +86,7 @@
@PluginFactory
public static DynamicThresholdFilter createFilter(@PluginAttr("key") String key,
- @PluginAttr("pairs") ValueLevelPair[] pairs,
+ @PluginElement("pairs") ValueLevelPair[] pairs,
@PluginAttr("defaultThreshold") String level,
@PluginAttr("onmatch") String match,
@PluginAttr("onmismatch") String mismatch) {
diff --git a/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java b/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
index 07d22d9..895e90f 100644
--- a/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
+++ b/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
@@ -59,7 +59,7 @@
PrintWriter pw = new PrintWriter(sw);
parent.printStackTrace(pw);
String result = sb.toString();
- System.out.print(result);
+ //System.out.print(result);
result = result.replaceAll(" ~?\\[.*\\]", "");
assertEquals(sw.toString(), result);
}
