svn commit: r1179235 - in /logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src: main/java/org/apache/logging/log4j/core/appender/flume/ main/java/org/apache/logging/log4j/core/filter/ test/java/org/apache/logging/log4j/core/pattern/

[rgoers]

Author: rgoers
Date: Wed Oct  5 14:13:42 2011
New Revision: 1179235

URL: http://svn.apache.org/viewvc?rev=1179235&view=rev
Log:
Change PluginAttrs to PluginElements. Comment println in unit test

Modified:
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java?rev=1179235&r1=1179234&r2=1179235&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroAppender.java
 Wed Oct  5 14:13:42 2011
@@ -83,7 +83,7 @@ public class FlumeAvroAppender extends A
     }
 
     @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,

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java?rev=1179235&r1=1179234&r2=1179235&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilter.java
 Wed Oct  5 14:13:42 2011
@@ -23,6 +23,7 @@ import org.apache.logging.log4j.core.Log
 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 @@ public class DynamicThresholdFilter exte
 
     @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) {

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java?rev=1179235&r1=1179234&r2=1179235&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverterTest.java
 Wed Oct  5 14:13:42 2011
@@ -59,7 +59,7 @@ public class ExtendedThrowablePatternCon
         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);
     }