Menu
▾
▴
[Wonder-cvs] SF.net SVN: wonder:[10986] branches/Wonder_2_0_0_Branch/Wonder/Common/ Frameworks/ERExtensions
|
From: <ms...@us...> - 2010-07-07 02:05:25
|
Revision: 10986
http://wonder.svn.sourceforge.net/wonder/?rev=10986&view=rev
Author: mschrag
Date: 2010-07-07 02:05:18 +0000 (Wed, 07 Jul 2010)
Log Message:
-----------
Add support for setting debug level to trace in the log4j configuration page
Modified Paths:
--------------
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.html 2010-07-05 19:43:55 UTC (rev 10985)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.html 2010-07-07 02:05:18 UTC (rev 10986)
@@ -21,7 +21,7 @@
<webobject name=RepetitionLoggers><webobject name=GenericContainerTR>
<td><webobject name=StringLoggerName></webobject></td>
<td><webobject name=StringLoggerLevel></webobject></td>
- <webobject name=GenericContainerTD> <webobject name=RadioButtonDebugLevel></webobject><webobject name=B1>Debug</webobject> <webobject name=RadioButtonInfoLevel></webobject><webobject name=B2>Info</webobject> <webobject name=RadioButtonWarnLevel></webobject><webobject name=B3>Warn</webobject> <webobject name=RadioButtonErrorLevel></webobject><webobject name=B4>Error</webobject> <webobject name=RadioButtonFatalLevel></webobject><webobject name=B5>Fatal</webobject> <webobject name=RadioButtonUnsetLevel></webobject><i>Unset</i></webobject></webobject></webobject>
+ <webobject name=GenericContainerTD> <webobject name=RadioButtonTraceLevel></webobject><webobject name=B0>Trace</webobject> <webobject name=RadioButtonDebugLevel></webobject><webobject name=B1>Debug</webobject> <webobject name=RadioButtonInfoLevel></webobject><webobject name=B2>Info</webobject> <webobject name=RadioButtonWarnLevel></webobject><webobject name=B3>Warn</webobject> <webobject name=RadioButtonErrorLevel></webobject><webobject name=B4>Error</webobject> <webobject name=RadioButtonFatalLevel></webobject><webobject name=B5>Fatal</webobject> <webobject name=RadioButtonUnsetLevel></webobject><i>Unset</i></webobject></webobject></webobject>
</table>
<br>
<webobject name=SubmitButtonUpdate2></webobject> <webobject name=SubmitButtonShowAll2></webobject> <webobject name=SubmitButtonShowExplicitLevels2></webobject></webobject>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod 2010-07-05 19:43:55 UTC (rev 10985)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Components/Nonlocalized.lproj/ERXLog4JConfiguration.wo/ERXLog4JConfiguration.wod 2010-07-07 02:05:18 UTC (rev 10986)
@@ -1,3 +1,8 @@
+B0: WOGenericContainer {
+ elementName = "B";
+ omitTags = loggerIsNotTrace;
+}
+
B1: WOGenericContainer {
elementName = "B";
omitTags = loggerIsNotDebug;
@@ -78,6 +83,12 @@
closedLabel = "Show Properties String";
}
+RadioButtonTraceLevel: WORadioButton {
+ name = logger.name;
+ selection = loggerLevelValue;
+ value = traceLevel;
+}
+
RadioButtonDebugLevel: WORadioButton {
name = logger.name;
selection = loggerLevelValue;
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java 2010-07-05 19:43:55 UTC (rev 10985)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/logging/ERXLog4JConfiguration.java 2010-07-07 02:05:18 UTC (rev 10986)
@@ -120,7 +120,7 @@
}
-
+ public Integer traceLevel() { return ERXConstant.integerForInt(Level.TRACE.toInt()); }
public Integer debugLevel() { return ERXConstant.integerForInt(Level.DEBUG.toInt()); }
public Integer infoLevel() { return ERXConstant.integerForInt(Level.INFO.toInt()); }
public Integer warnLevel() { return ERXConstant.integerForInt(Level.WARN.toInt()); }
@@ -133,6 +133,7 @@
ERXConstant.integerForInt(logger().getLevel().toInt()) : ERXConstant.MinusOneInteger;
}
+ public boolean loggerIsNotTrace() { return logger()!=null && logger().getLevel()!=Level.TRACE; }
public boolean loggerIsNotDebug() { return logger()!=null && logger().getLevel()!=Level.DEBUG; }
public boolean loggerIsNotInfo() { return logger()!=null && logger().getLevel()!=Level.INFO; }
public boolean loggerIsNotWarn() { return logger()!=null && logger().getLevel()!=Level.WARN; }
@@ -159,6 +160,7 @@
private final static NSDictionary BG_COLORS=new NSDictionary(
new Object[] {
+ "#ffdddd",
"#ffbbbb",
"#eeccbb",
"#ddddbb",
@@ -166,6 +168,7 @@
"#bbffbb"
},
new Object[] {
+ ERXConstant.integerForInt(Level.TRACE.toInt()),
ERXConstant.integerForInt(Level.DEBUG.toInt()),
ERXConstant.integerForInt(Level.INFO.toInt()),
ERXConstant.integerForInt(Level.WARN.toInt()),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|