svn commit: r1538530 - in /cxf/branches/2.7.x-fixes: ./ services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/ services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/ services/xkms/xkms-itests/src/test/resources/etc/

[cschneider]

Author: cschneider
Date: Mon Nov  4 08:50:12 2013
New Revision: 1538530

URL: http://svn.apache.org/r1538530
Log:
CXF-5370 Refactor STS logging to split mapping from log writing

Added:
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/
      - copied from r1538526, 
cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/
Removed:
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerListener.java
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/StacktraceDefaultFormatter.java
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/StacktraceFormatter.java
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/StacktraceHtmlFormatter.java
Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
    
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
    
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1538526

Modified: 
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java?rev=1538530&r1=1538529&r2=1538530&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLog4J.java
 Mon Nov  4 08:50:12 2013
@@ -19,6 +19,7 @@
 
 package org.apache.cxf.sts.event;
 
+import org.apache.cxf.sts.event.map.MapEventLogger;
 import org.apache.log4j.PatternLayout;
 
 public class LoggerPatternLayoutLog4J extends PatternLayout {
@@ -34,7 +35,7 @@ public class LoggerPatternLayoutLog4J ex
         if (this.header != null) {
             return this.header + System.getProperty("line.separator");
         }
-        LoggerListener ll = new LoggerListener();
+        MapEventLogger ll = new MapEventLogger();
         StringBuffer line = new StringBuffer();
         for (String item : ll.getFieldOrder()) {
             line.append(item).append(";");

Modified: 
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java?rev=1538530&r1=1538529&r2=1538530&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/LoggerPatternLayoutLogback.java
 Mon Nov  4 08:50:12 2013
@@ -19,6 +19,8 @@
 
 package org.apache.cxf.sts.event;
 
+import org.apache.cxf.sts.event.map.MapEventLogger;
+
 import ch.qos.logback.classic.PatternLayout;
 
 public class LoggerPatternLayoutLogback extends PatternLayout {
@@ -30,7 +32,7 @@ public class LoggerPatternLayoutLogback 
         if (this.header != null) {
             return this.header + System.getProperty("line.separator");
         }
-        LoggerListener ll = new LoggerListener();
+        MapEventLogger ll = new MapEventLogger();
         StringBuffer line = new StringBuffer();
         for (String item : ll.getFieldOrder()) {
             line.append(item).append(";");

Modified: 
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg?rev=1538530&r1=1538529&r2=1538530&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
 (original)
+++ 
cxf/branches/2.7.x-fixes/services/xkms/xkms-itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
 Mon Nov  4 08:50:12 2013
@@ -1,5 +1,5 @@
 # Root logger
-log4j.rootLogger=WARN, stdout, file
+log4j.rootLogger=INFO, stdout, file
 log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
 
 log4j.logger.org.apache.cxf.xkms=INFO
@@ -9,7 +9,7 @@ log4j.logger.org.apache.cxf.xkms.x509.va
 log4j.logger.org.ops4j.pax.swissbox.bnd.BndUtils=ERROR
 
 # CONSOLE appender
-log4j.appender.stdout.threshold=INFO
+log4j.appender.stdout.threshold=WARN
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | 
%-50.50c | %m%n