]> source.dussan.org Git - vaadin-framework.git/commitdiff
Removed log class, replaced with e.printstacktrace() or with System.err.println(..)
authorJani Laakso <jani.laakso@itmill.com>
Thu, 15 Nov 2007 16:24:09 +0000 (16:24 +0000)
committerJani Laakso <jani.laakso@itmill.com>
Thu, 15 Nov 2007 16:24:09 +0000 (16:24 +0000)
svn changeset:2828/svn branch:trunk

src/com/itmill/toolkit/Log.java [deleted file]
src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
src/com/itmill/toolkit/terminal/web/ApplicationServlet.java

diff --git a/src/com/itmill/toolkit/Log.java b/src/com/itmill/toolkit/Log.java
deleted file mode 100644 (file)
index 1f3acd1..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/* *************************************************************************
- IT Mill Toolkit 
-
- Development of Browser User Interfaces Made Easy
-
- Copyright (C) 2000-2006 IT Mill Ltd
- *************************************************************************
-
- This product is distributed under commercial license that can be found
- from the product package on license.pdf. Use of this product might 
- require purchasing a commercial license from IT Mill Ltd. For guidelines 
- on usage, see licensing-guidelines.html
-
- *************************************************************************
- For more information, contact:
- IT Mill Ltd                           phone: +358 2 4802 7180
- Ruukinkatu 2-4                        fax:   +358 2 4802 7181
- 20540, Turku                          email:  info@itmill.com
- Finland                               company www: www.itmill.com
- Primary source for information and releases: www.itmill.com
-
- ********************************************************************** */
-
-package com.itmill.toolkit;
-
-/**
- * <p>
- * Class providing centralized logging services. The logger defines five message
- * types, and provides methods to create messages of those types. These types
- * are:
- * </p>
- * 
- * <ul>
- * <li> <code>info</code> - Useful information generated during normal
- * operation of the application.
- * <li> <code>warning</code> - An error situation has occurred, but the
- * operation was able to finish succesfully.
- * <li> <code>error</code> - An error situation which prevented the operation
- * from finishing succesfully.
- * <li> <code>debug</code> - Internal information from the application meant
- * for developers.
- * <li> <code>exception</code> - A Java exception reported using the logger.
- * Includes the exception stack trace and a possible free-form message.
- * </ul>
- * 
- * <p>
- * Currently the class offers logging only to the standard output.
- * </p>
- * 
- * @author IT Mill Ltd.
- * @version
- * @VERSION@
- * @since 5.0
- */
-public class Log {
-
-       private static boolean useStdOut = true;
-
-       private static String LOG_MSG_INFO = "[INFO]";
-
-       private static String LOG_MSG_ERROR = "[ERROR]";
-
-       private static String LOG_MSG_WARN = "[WARNING]";
-
-       private static String LOG_MSG_DEBUG = "[DEBUG]";
-
-       private static String LOG_MSG_EXCEPT = "[EXCEPTION]";
-
-       /**
-        * Logs the <code>warning</code> message.
-        * 
-        * @param message
-        *            the Message String to be logged.
-        */
-       public static synchronized void warn(java.lang.String message) {
-               if (Log.useStdOut)
-                       System.out.println(LOG_MSG_WARN + " " + message);
-       }
-
-       /**
-        * Logs the <code>debug</code> message.
-        * 
-        * @param message
-        *            the Message String to be logged.
-        */
-       public static synchronized void debug(java.lang.String message) {
-               if (Log.useStdOut)
-                       System.out.println(LOG_MSG_DEBUG + " " + message);
-       }
-
-       /**
-        * Logs an <code>info</code> message.
-        * 
-        * @param message
-        *            the Message String to be logged.
-        */
-       public static synchronized void info(java.lang.String message) {
-               if (Log.useStdOut)
-                       System.out.println(LOG_MSG_INFO + " " + message);
-       }
-
-       /**
-        * Logs the Java exception and an accompanying error message.
-        * 
-        * @param message
-        *            the Message String to be logged.
-        * @param e
-        *            the Exception to be logged.
-        */
-       public static synchronized void except(java.lang.String message, Exception e) {
-               if (Log.useStdOut) {
-                       System.out.println(LOG_MSG_EXCEPT + " " + message);
-                       e.printStackTrace();
-               }
-       }
-
-       /**
-        * Logs the <code>error</code> message.
-        * 
-        * @param message
-        *            the Message String to be logged.
-        */
-       public static synchronized void error(java.lang.String message) {
-               if (Log.useStdOut)
-                       System.out.println(LOG_MSG_ERROR + " " + message);
-       }
-}
index b70166cbc7dded2807ed1b495a10077ed49021ab..a5b580d6cfb13dcdc4e448dec8ccdc020b30ad80 100644 (file)
@@ -54,7 +54,6 @@ import javax.servlet.http.HttpSession;
 import org.xml.sax.SAXException;
 
 import com.itmill.toolkit.Application;
-import com.itmill.toolkit.Log;
 import com.itmill.toolkit.external.org.apache.commons.fileupload.servlet.ServletFileUpload;
 import com.itmill.toolkit.service.FileTypeResolver;
 import com.itmill.toolkit.terminal.DownloadStream;
@@ -165,7 +164,8 @@ public class ApplicationServlet extends HttpServlet {
                String applicationClassName = servletConfig
                                .getInitParameter("application");
                if (applicationClassName == null) {
-                       Log.error("Application not specified in servlet parameters");
+                       System.err
+                                       .println("Application not specified in servlet parameters");
                }
 
                // Stores the application parameters into Properties object
@@ -212,7 +212,7 @@ public class ApplicationServlet extends HttpServlet {
                                classLoader = (ClassLoader) c
                                                .newInstance(new Object[] { getClass().getClassLoader() });
                        } catch (Exception e) {
-                               Log.error("Could not find specified class loader: "
+                               System.err.println("Could not find specified class loader: "
                                                + classLoaderName);
                                throw new ServletException(e);
                        }
@@ -435,8 +435,8 @@ public class ApplicationServlet extends HttpServlet {
                        }
                        if (is == null) {
                                // cannot serve requested file
-                               Log
-                                               .warn("Requested resource ["
+                               System.err
+                                               .println("Requested resource ["
                                                                + filename
                                                                + "] not found from filesystem or through class loader.");
                                response.setStatus(404);
@@ -686,7 +686,7 @@ public class ApplicationServlet extends HttpServlet {
                        data = getServletContext().getResourceAsStream(
                                        THEME_DIRECTORY_PATH + themeName + "/" + resourceId);
                } catch (Exception e) {
-                       Log.info(e.getMessage());
+                       e.printStackTrace();
                        data = null;
                }
 
@@ -719,8 +719,8 @@ public class ApplicationServlet extends HttpServlet {
                        }
 
                } catch (java.io.IOException e) {
-                       Log.info("Resource transfer failed:  " + request.getRequestURI()
-                                       + ". (" + e.getMessage() + ")");
+                       System.err.println("Resource transfer failed:  "
+                                       + request.getRequestURI() + ". (" + e.getMessage() + ")");
                }
 
                return true;
@@ -755,7 +755,7 @@ public class ApplicationServlet extends HttpServlet {
                                servletPath = servletPath + "/";
                        applicationUrl = new URL(reqURL, servletPath);
                } catch (MalformedURLException e) {
-                       Log.error("Error constructing application url "
+                       System.err.println("Error constructing application url "
                                        + request.getRequestURI() + " (" + e + ")");
                        throw e;
                }
@@ -836,11 +836,11 @@ public class ApplicationServlet extends HttpServlet {
                        return application;
 
                } catch (IllegalAccessException e) {
-                       Log.error("Illegal access to application class "
+                       System.err.println("Illegal access to application class "
                                        + this.applicationClass.getName());
                        throw e;
                } catch (InstantiationException e) {
-                       Log.error("Failed to instantiate application class: "
+                       System.err.println("Failed to instantiate application class: "
                                        + this.applicationClass.getName());
                        throw e;
                }
index 9fb792f30b6eb908cb2c61a053831f3d17bf02eb..5dc6168ff19656f4efd71be4ee178fc740ed365f 100644 (file)
@@ -67,7 +67,6 @@ import com.itmill.toolkit.external.org.apache.commons.fileupload.ProgressListene
 import com.itmill.toolkit.external.org.apache.commons.fileupload.servlet.ServletFileUpload;
 
 import com.itmill.toolkit.Application;
-import com.itmill.toolkit.Log;
 import com.itmill.toolkit.Application.WindowAttachEvent;
 import com.itmill.toolkit.Application.WindowDetachEvent;
 import com.itmill.toolkit.terminal.DownloadStream;
@@ -412,7 +411,6 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
                                                                                                        + resource);
                                                } catch (Exception e) {
                                                        e.printStackTrace();
-                                                       Log.info(e.getMessage());
                                                }
                                                if (is != null) {
 
@@ -428,9 +426,10 @@ public class CommunicationManager implements Paintable.RepaintRequestListener,
                                                                        layout.append(buffer, 0, charsRead);
                                                                r.close();
                                                        } catch (java.io.IOException e) {
-                                                               Log.info("Resource transfer failed:  "
-                                                                               + request.getRequestURI() + ". ("
-                                                                               + e.getMessage() + ")");
+                                                               System.err
+                                                                               .println("Resource transfer failed:  "
+                                                                                               + request.getRequestURI()
+                                                                                               + ". (" + e.getMessage() + ")");
                                                        }
                                                        outWriter.print("\""
                                                                        + JsonPaintTarget.escapeJSON(layout
index 7da1a4b1a83fb9451638268cdff4b75c9f9b1c41..67d5666be9ed5faf1bea80f6441833361b6c9e45 100644 (file)
@@ -3,8 +3,6 @@ package com.itmill.toolkit.terminal.web;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
-import com.itmill.toolkit.Log;
-
 /**
  * This package and servlet is only provided for backward compatibility. Since
  * Toolkit version 5.0 you should use
@@ -22,8 +20,8 @@ public class ApplicationServlet extends
        private static final long serialVersionUID = -1471357707917217303L;
 
        public void init(ServletConfig servletConfig) throws ServletException {
-               Log
-                               .warn("Compatiblity class in use. Please use com.itmill.toolkit.terminal.gwt.server.ApplicationServlet instead. You probably need to update your web.xml.");
+               System.err
+                               .println("Compatiblity class in use. Please use com.itmill.toolkit.terminal.gwt.server.ApplicationServlet instead. You probably need to update your web.xml.");
                super.init(servletConfig);
        }