You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by cz...@apache.org on 2005/08/09 08:14:59 UTC

cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/log LoggerImpl.java LogManager.java Log.java

cziegeler    2005/08/08 23:14:59

  Modified:    src/org/apache/wsrp4j/log LoggerImpl.java LogManager.java
  Removed:     src/org/apache/wsrp4j/log Log.java
  Log:
  Remove unused Log class
  Allow own LogManager implementations
  
  Revision  Changes    Path
  1.4       +1 -3      ws-wsrp4j/src/org/apache/wsrp4j/log/LoggerImpl.java
  
  Index: LoggerImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/log/LoggerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoggerImpl.java	26 Jul 2005 14:02:17 -0000	1.3
  +++ LoggerImpl.java	9 Aug 2005 06:14:58 -0000	1.4
  @@ -35,10 +35,8 @@
           if (log4jLevel != org.apache.log4j.Level.OFF)
           {
               return (logLevel <= level && logger.isEnabledFor(log4jLevel));
  -        } else
  -        {
  -            return false;
           }
  +        return false;
       }
   
       public void text(int logLevel, String loggingMethod, String text)
  
  
  
  1.6       +14 -4     ws-wsrp4j/src/org/apache/wsrp4j/log/LogManager.java
  
  Index: LogManager.java
  ===================================================================
  RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/log/LogManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LogManager.java	26 Jul 2005 14:02:17 -0000	1.5
  +++ LogManager.java	9 Aug 2005 06:14:58 -0000	1.6
  @@ -29,7 +29,7 @@
       private static final String GLOBAL_LOG_LEVEL_PROPERTY = "wsrp4j.logger";
       private static int globalLogLevel = Logger.ERROR;
       private static Properties wsrp4jLevels = new Properties();
  -    private static LogManager logManager = new LogManager();
  +    private static LogManager logManager;
   
       /**
         private constructor prohibits sub-classing
  @@ -81,10 +81,22 @@
       */
       public static LogManager getLogManager()
       {
  +        if ( logManager == null ) 
  +        {
  +            logManager = new LogManager();
  +        }
           return logManager;
       }
   
       /**
  +     * Sets a different LogManager implementation
  +     */
  +    public static void setLogManager(LogManager manager)
  +    {
  +        logManager = manager;
  +    }
  +
  +    /**
         Returns a Logger instance for the calling class
         
         @param aClass The class that requests the logger instance.
  @@ -137,10 +149,8 @@
               {
                   return 0;
               }
  -        } else
  -        {
  -            return 0;
           }
  +        return 0;
       }
   
       /*