[jboss-svn-commits] JBL Code SVN: r30100 - labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2009-11-11 05:09:58 -0500 (Wed, 11 Nov 2009)
New Revision: 30100

Modified:
   labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLog.java
   labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLogEnvironmentBean.java
Log:
Tidy up logging properties. JBTM-628


Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLog.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLog.java	2009-11-11 09:49:03 UTC (rev 30099)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLog.java	2009-11-11 10:09:58 UTC (rev 30100)
@@ -189,7 +189,7 @@
         setLevel(BasicLog.LOG_LEVEL_INFO);
 
         // Set log level from properties
-        String lvl = commonPropertyManager.getBasicLogEnvironmentBean().getDefaultLevel();
+        String lvl = commonPropertyManager.getBasicLogEnvironmentBean().getLevel();
 
         if("all".equalsIgnoreCase(lvl)) {
             setLevel(BasicLog.LOG_LEVEL_ALL);

Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLogEnvironmentBean.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLogEnvironmentBean.java	2009-11-11 09:49:03 UTC (rev 30099)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/basic/BasicLogEnvironmentBean.java	2009-11-11 10:09:58 UTC (rev 30100)
@@ -21,6 +21,7 @@
 package com.arjuna.common.internal.util.logging.basic;
 
 import com.arjuna.common.internal.util.propertyservice.PropertyPrefix;
+import com.arjuna.common.internal.util.propertyservice.FullPropertyName;
 
 /**
  * A JavaBean containing configuration properties for the built-in log system.
@@ -35,7 +36,8 @@
     private volatile boolean showDate = true;
     private volatile boolean logFileAppend = true;
 
-    private volatile String defaultLevel = "info";
+    @FullPropertyName(name = "com.arjuna.common.util.logging.default.defaultLevel")
+    private volatile String level = "info";
 
     private volatile String logFile = "error.log";
 
@@ -140,20 +142,20 @@
      *
      * @return the default threshold logging level.
      */
-    public String getDefaultLevel()
+    public String getLevel()
     {
-        return defaultLevel;
+        return level;
     }
 
     /**
      * Sets the default log threshold.
      * Valid values (in order) are: all, trace, debug, info, warn, error, fatal, off
      *
-     * @param defaultLevel the default log threshold.
+     * @param level the default log threshold.
      */
-    public void setDefaultLevel(String defaultLevel)
+    public void setLevel(String level)
     {
-        this.defaultLevel = defaultLevel;
+        this.level = level;
     }
 
     /**