geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lkue...@apache.org
Subject svn commit: r618091 - in /geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB: Logger.java LoggerHelper.java LoggerHolder.java LoggerOperations.java Logger_impl.java WLogger.java WLoggerHelper.java WLoggerHolder.java WLoggerOperations.java
Date Sun, 03 Feb 2008 21:22:56 GMT
Author: lkuehne
Date: Sun Feb  3 13:22:53 2008
New Revision: 618091

URL: http://svn.apache.org/viewvc?rev=618091&view=rev
Log:
YOKO-417 - cleaned up Logger class hierarchy: removed LoggerOperations, LoggerHolder and the
WLogger classes which do not make sense in Java

Removed:
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerHelper.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerHolder.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/LoggerOperations.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/WLogger.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/WLoggerHelper.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/WLoggerHolder.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/WLoggerOperations.java
Modified:
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger.java
    geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger.java?rev=618091&r1=618090&r2=618091&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger.java Sun Feb  3 13:22:53
2008
@@ -17,16 +17,151 @@
 
 package org.apache.yoko.orb.OB;
 
-//
-// IDL:orb.yoko.apache.org/OB/Logger:1.0
-//
+import java.util.logging.Level;
+
 /**
  *
  * The Yoko message logger interface.
  *
  **/
-
-public interface Logger extends LoggerOperations,
-                                org.omg.CORBA.Object
+public interface Logger
 {
+    /**
+     * Log an informational message.
+     * 
+     * @param msg    The message.
+     * @param e      An exception associated with the error.
+     */
+    void
+    info(String msg, Throwable e);
+
+    /**
+     *
+     * Log an informational message.
+     *
+     * @param msg The message.
+     *
+     **/
+    void
+    info(String msg);
+
+    /**
+     *
+     * Log an error message.
+     *
+     * @param msg The error message.
+     *
+     **/
+    void
+    error(String msg);
+    
+    
+    /**
+     * Log an error message.
+     * 
+     * @param msg    The error message.
+     * @param e      An exception associated with the error.
+     */
+    void
+    error(String msg, Throwable e);
+
+    /**
+     *
+     * Log a warning message.
+     *
+     * @param msg The warning message.
+     *
+     **/
+    void
+    warning(String msg);
+    
+    
+    /**
+     *
+     * Log a warning message.
+     *
+     * @param msg The warning message.
+     * @param e      An exception associated with the warning.
+     *
+     **/
+    void
+    warning(String msg, Throwable e);
+
+    /**
+     *
+     * Log a debug message.
+     *
+     * @param msg The debug message.
+     *
+     **/
+    void
+    debug(String msg);
+    
+    /**
+     *
+     * Log a debug message.
+     *
+     * @param msg The debug message.
+     * @param e      An exception associated with the warning.
+     *
+     **/
+    void
+    debug(String msg, Throwable e);
+    
+    
+    /**
+     * Test if debug output is enabled for this logger.
+     * 
+     * @return True if debug logging is enabled, false if debug 
+     *         output is not enabled.
+     */
+    boolean isDebugEnabled();     
+
+    /**
+     *
+     * Log a trace message.
+     *
+     * @param category The trace category.
+     *
+     * @param msg The trace message.
+     *
+     **/
+    void
+    trace(String category,
+          String msg);
+
+    /**
+     * Log a message of the indicated level.
+     *
+     * @param level  The message level.
+     * @param msg    The logged message.
+     */
+    void log(Level level, String msg);
+
+    /**
+     * Log a message of the indicated level.
+     *
+     * @param level  The message level.
+     * @param msg    The logged message.
+     * @param param  A single parameter object included with the message.
+     */
+    void log(Level level, String msg, Object param);
+
+    /**
+     * Log a message of the indicated level.
+     *
+     * @param level  The message level.
+     * @param msg    The logged message.
+     * @param params An array of parameter objects logged with the message.
+     */
+    void log(Level level, String msg, Object[] params);
+
+    /**
+     * Log a message of the indicated level.
+     *
+     * @param level  The message level.
+     * @param msg    The logged message.
+     * @param thrown An exception object included in the log.
+     */
+    void log(Level level, String msg, Throwable thrown);
 }

Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java?rev=618091&r1=618090&r2=618091&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/Logger_impl.java Sun Feb
 3 13:22:53 2008
@@ -20,17 +20,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.apache.yoko.orb.OB.WLogger;
-
-public class Logger_impl extends org.omg.CORBA.LocalObject implements WLogger {
+public class Logger_impl implements org.apache.yoko.orb.OB.Logger {
 
     // the real logger backing instance.
     static final Logger logger = Logger.getLogger(ORBInstance.class.getName());
 
-    // ------------------------------------------------------------------
-    // Standard IDL to Java Mapping
-    // ------------------------------------------------------------------
-
     public void info(String msg) {
         logger.info(msg);
     }
@@ -39,14 +33,6 @@
         logger.log(Level.INFO, msg, e);
     }
 
-    public void winfo(String msg) {
-        info(msg);
-    }
-
-    public void winfo(String msg, Throwable e) {
-        info(msg, e); 
-    }
-
     public void error(String msg) {
         logger.severe(msg);
     }
@@ -55,14 +41,6 @@
         logger.log(Level.SEVERE, msg, e);
     }
 
-    public void werror(String msg) {
-        error(msg);
-    }
-
-    public void werror(String msg, Throwable e) {
-        error(msg, e);
-    }
-
     public void warning(String msg) {
         logger.warning(msg);
     }
@@ -71,14 +49,6 @@
         logger.log(Level.WARNING, msg, e);
     }
 
-    public void wwarning(String msg) {
-        warning(msg);
-    }
-
-    public void wwarning(String msg, Throwable e) {
-        warning(msg, e);
-    }
-
     public void debug(String msg) {
         logger.fine(msg);
     }
@@ -91,14 +61,6 @@
         return logger.isLoggable(Level.FINE); 
     }
 
-    public void wdebug(String msg) {
-        debug(msg);
-    }
-
-    public void wdebug(String msg, Throwable e) {
-        debug(msg, e);
-    }
-
     public void trace(String category, String msg) {
         logger.log(Level.FINE, category, msg);
         String s = "[ " + category + ": ";
@@ -112,10 +74,6 @@
         s += msg.substring(start);
         s += " ]";
         logger.log(Level.FINE, msg);
-    }
-
-    public void wtrace(String category, String msg) {
-        trace(category, msg);
     }
 
     /**



Mime
View raw message