perfsonar development work

Author: michael.bischoff
Date: 2008-06-18 12:03:14 -0400 (Wed, 18 Jun 2008)
New Revision: 4023

Modified:
   trunk/perfsonar_base/ant/const.properties
   trunk/perfsonar_base/doc/ChangeLog.txt
   trunk/perfsonar_base/pom.xml
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
Log:
changed: fixed log4j wrong source of message being reported.

Modified: trunk/perfsonar_base/ant/const.properties
===================================================================
--- trunk/perfsonar_base/ant/const.properties   2008-06-18 13:53:38 UTC (rev 
4022)
+++ trunk/perfsonar_base/ant/const.properties   2008-06-18 16:03:14 UTC (rev 
4023)
@@ -13,4 +13,4 @@
 # name of jar file to be created
 jarfilename=perfsonar-base
 # version of the product (will be included in the final name of jar file)
-version=1.0.20080609
+version=1.0.20080618

Modified: trunk/perfsonar_base/doc/ChangeLog.txt
===================================================================
--- trunk/perfsonar_base/doc/ChangeLog.txt      2008-06-18 13:53:38 UTC (rev 
4022)
+++ trunk/perfsonar_base/doc/ChangeLog.txt      2008-06-18 16:03:14 UTC (rev 
4023)
@@ -1,4 +1,6 @@
 perfSONAR Base
+2008-06-18
+- change: changed Log4j aux-component to allow filtering of messages by 
package name.
 
 2008-04-16 v1.0.20080416
 - Change: fixed most type-safe warnings.

Modified: trunk/perfsonar_base/pom.xml
===================================================================
--- trunk/perfsonar_base/pom.xml        2008-06-18 13:53:38 UTC (rev 4022)
+++ trunk/perfsonar_base/pom.xml        2008-06-18 16:03:14 UTC (rev 4023)
@@ -7,7 +7,7 @@
        <artifactId>perfsonar-base</artifactId>
        <packaging>jar</packaging>
        <name>Perfsonar Base package</name>
-       <version>1.0.20080520</version>
+       <version>1.0.20080618</version>
        <description>
                The perfSONAR base provides a number of common, shared 
classes which can be used by 
                MA, MP and Clients. 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
   2008-06-18 13:53:38 UTC (rev 4022)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
   2008-06-18 16:03:14 UTC (rev 4023)
@@ -2,6 +2,7 @@
 
 import java.io.File;
 
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.perfsonar.base.auxiliary.AuxiliaryComponent;
@@ -21,8 +22,10 @@
     implements AuxiliaryComponent, LoggerComponent {
 
     
-    // ---------------------------------- class fields
+    private static final String CALLER_FQCN = 
Log4jLoggerComponent.class.getName();
 
+       // ---------------------------------- class fields
+
     /**
      * Component Name
      */
@@ -38,8 +41,8 @@
 
     // ---------------------------------- constructors
     
-    /* Default no arg cosntructor */
-    public Log4jLoggerComponent() {            
+    /* Default no arg constructor */
+    public Log4jLoggerComponent() { /* no arg constructor */           
     }
 
 
@@ -60,7 +63,7 @@
             if(logConfiguration!=null) {
                
PropertyConfigurator.configure(logConfiguration.getAbsolutePath());
             } else {
-               System.err.println("PerfSONAR:WARNING: perfsonar logging not 
configured correctly. (specified logging properties 
file['"+logConfiguration+"'] not found.)");
+               System.err.println("PerfSONAR:WARNING: perfsonar logging not 
configured correctly. (specified logging properties file['"+logconf+"'] not 
found.)");
             }            
         } catch(Exception ex) {
                System.err.println("PerfSONAR:WARNING: perfsonar logging not 
configured correctly.");
@@ -86,35 +89,35 @@
      * @see 
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#debug(java.lang.String)
      */
     public void debug(String message) {
-        debugLog.debug(message);
+        debugLog.log(CALLER_FQCN, Level.DEBUG, message, null);
     }
 
     /* (non-Javadoc)
      * @see 
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#info(java.lang.String)
      */
     public void info(String message) {
-        infoLog.info(message);
+       infoLog.log(CALLER_FQCN, Level.INFO, message, null);
     }
 
     /* (non-Javadoc)
      * @see 
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#warn(java.lang.String)
      */
     public void warn(String message) {
-        warnLog.warn(message);
+       warnLog.log(CALLER_FQCN, Level.WARN, message, null);
     }
 
     /* (non-Javadoc)
      * @see 
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#error(java.lang.String)
      */
     public void error(String message) {
-        errorLog.error(message);
+       errorLog.log(CALLER_FQCN, Level.ERROR, message, null);
     }
 
     /* (non-Javadoc)
      * @see 
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#fatal(java.lang.String)
      */
     public void fatal(String message) {
-        fatalLog.fatal(message);
+       fatalLog.log(CALLER_FQCN, Level.FATAL, message, null);
     }
 
     public String getComponentName() {