You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2001/04/12 04:22:59 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/logging BaseRunDataFilter.java FileLogger.java Log4JavaLogger.java Logger.java LoggingConfig.java LoggingService.java ServletLogger.java ServletLoggingService.java TurbineLogging.java TurbineLoggingService.java
mpoeschl 01/04/11 19:22:59
Modified: src/java/org/apache/turbine/services/logging
BaseRunDataFilter.java FileLogger.java
Log4JavaLogger.java Logger.java LoggingConfig.java
LoggingService.java ServletLogger.java
ServletLoggingService.java TurbineLogging.java
TurbineLoggingService.java
Log:
- typos
- javadocs
- missing blanks
- linebreaks
Revision Changes Path
1.7 +168 -158 jakarta-turbine/src/java/org/apache/turbine/services/logging/BaseRunDataFilter.java
Index: BaseRunDataFilter.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/BaseRunDataFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseRunDataFilter.java 2001/03/22 15:50:30 1.6
+++ BaseRunDataFilter.java 2001/04/12 02:22:58 1.7
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -70,7 +70,7 @@
* Each token should be seperate by space. In output known token
* will be replaced by coresponding data from RunData, unkonwn will be
* returned unchanged on output.<BR>
- *
+ *
* Conversion token:
* <UL>
* <LI> %t - current Time
@@ -100,107 +100,108 @@
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:Michal.Majdan@e-point.pl">Michal Majdan</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: BaseRunDataFilter.java,v 1.6 2001/03/22 15:50:30 dlr Exp $
+ * @version $Id: BaseRunDataFilter.java,v 1.7 2001/04/12 02:22:58 mpoeschl Exp $
*/
-public class BaseRunDataFilter implements RunDataFilter
+public class BaseRunDataFilter implements RunDataFilter
{
- /** table matching conversion tokens to methods names*/
- protected static Map methodNamesMap=null;
+ /** table matching conversion tokens to methods names */
+ protected static Map methodNamesMap = null;
/** applied format */
- protected String format=null;
+ protected String format = null;
/** parsed format */
- protected List pattern=null;
+ protected List pattern = null;
- protected final String DELIM=" ";
+ protected final String DELIM = " ";
/** initialization of the conversion table */
- static
+ static
{
- if (methodNamesMap==null)
+ if (methodNamesMap == null)
{
methodNamesMap= new HashMap();
- methodNamesMap.put("%t","getTime");
- methodNamesMap.put("%U","getURLRequested");
- methodNamesMap.put("%h","getRemoteHost");
- methodNamesMap.put("%a","getRemoteAddr");
- methodNamesMap.put("%l","getRemoteUser");
- methodNamesMap.put("%p","getServerPort");
- methodNamesMap.put("%v","getServerName");
- methodNamesMap.put("%m","getMethod");
- methodNamesMap.put("%q","getQueryString");
- methodNamesMap.put("%cp","getContextPath");
- methodNamesMap.put("%sid","getSessionId");
- methodNamesMap.put("%au","getAuthType");
- methodNamesMap.put("%ct","getContentType");
- methodNamesMap.put("%enc","getCharacterEncoding");
- methodNamesMap.put("%pro","getProtocol");
- methodNamesMap.put("%sce","getScheme");
- methodNamesMap.put("%cln","getContentLength");
- methodNamesMap.put("%ua","getUserAgent");
- methodNamesMap.put("%ban","getBannerInfo");
- methodNamesMap.put("%usr","getUser");
- methodNamesMap.put("%cook","getCookies");
+ methodNamesMap.put("%t", "getTime");
+ methodNamesMap.put("%U", "getURLRequested");
+ methodNamesMap.put("%h", "getRemoteHost");
+ methodNamesMap.put("%a", "getRemoteAddr");
+ methodNamesMap.put("%l", "getRemoteUser");
+ methodNamesMap.put("%p", "getServerPort");
+ methodNamesMap.put("%v", "getServerName");
+ methodNamesMap.put("%m", "getMethod");
+ methodNamesMap.put("%q", "getQueryString");
+ methodNamesMap.put("%cp", "getContextPath");
+ methodNamesMap.put("%sid", "getSessionId");
+ methodNamesMap.put("%au", "getAuthType");
+ methodNamesMap.put("%ct", "getContentType");
+ methodNamesMap.put("%enc", "getCharacterEncoding");
+ methodNamesMap.put("%pro", "getProtocol");
+ methodNamesMap.put("%sce", "getScheme");
+ methodNamesMap.put("%cln", "getContentLength");
+ methodNamesMap.put("%ua", "getUserAgent");
+ methodNamesMap.put("%ban", "getBannerInfo");
+ methodNamesMap.put("%usr", "getUser");
+ methodNamesMap.put("%cook", "getCookies");
}
}
- /** pareses format string */
+ /** parses format string */
public void setFormat(String format)
{
- if (format!=null && !format.trim().equals(""))
+ if (format != null && !format.trim().equals(""))
{
- pattern=new ArrayList();
+ pattern = new ArrayList();
StringTokenizer st = new StringTokenizer(format);
- while (st.hasMoreTokens())
+ while (st.hasMoreTokens())
{
pattern.add(st.nextToken());
}
- this.format=format;
+ this.format = format;
}
}
- /**
- * For ech field in tha pattern looking for method extracting
- * data from RunData, invokes the method, and adds return value to return value.
+ /**
+ * For each field in tha pattern looking for method extracting data from
+ * RunData, invokes the method, and adds return value to return value.
* If there is no method for the token, adds token to return value
*
* @param data - RunDate from which data will be extracted
*/
public String getString(RunData data)
{
- Method method=null;
- StringBuffer answer=new StringBuffer();
- if (format==null)
+ Method method = null;
+ StringBuffer answer = new StringBuffer();
+ if (format == null)
{
return "";
}
- for(int i=0; i<pattern.size();i++)
+ for(int i = 0; i < pattern.size(); i++)
{
try
{
- //when we want ordianry information we do
- String methodName=(String)methodNamesMap.get(pattern.get(i));
- if(methodName!=null)
+ //when we want ordinary information we do
+ String methodName = (String)methodNamesMap.get(pattern.get(i));
+ if(methodName != null)
{
- method=getClass().getDeclaredMethod(methodName,
- new Class[]{RunData.class});
- answer.append((String)method.invoke(null,new Object[] {data}));
+ method = getClass().getDeclaredMethod(methodName,
+ new Class[]{RunData.class});
+ answer.append((String)method.invoke(null,
+ new Object[] {data}));
answer.append(DELIM);
- }
+ }
else
{
- //when we need the content of a header line
- if(((String)pattern.get(i)).endsWith("i"))
+ //when we need the content of a header line
+ if(((String)pattern.get(i)).endsWith("i"))
{
- method=getClass().getDeclaredMethod("getHeader",
- new Class[]{RunData.class,String.class});
+ method=getClass().getDeclaredMethod("getHeader",
+ new Class[]{RunData.class, String.class});
answer.append((String)method.invoke(null,
- new Object[] {data,(String)pattern.get(i)}));
+ new Object[] {data, (String)pattern.get(i)}));
answer.append(DELIM);
- }
- else
+ }
+ else
{
answer.append((String)pattern.get(i));
answer.append(DELIM);
@@ -210,18 +211,18 @@
catch (Exception e)
{
}
- }
+ }
return answer.toString();
}
/**
- * Retrives current system time.
+ * Retrives current system time.
*
- * @param data RunData object associated with this request
- * @return date and time
+ * @param data RunData object associated with this request
+ * @return date and time
*/
private static String getTime(RunData data) {
- long time= System.currentTimeMillis();
+ long time = System.currentTimeMillis();
Date d = new Date(time);
return d.toString();
}
@@ -229,10 +230,10 @@
/**
* Retrives the url requested by the client
*
- * @param data RunData object associated with this request
- * @return url requested by the client
+ * @param data RunData object associated with this request
+ * @return url requested by the client
*/
- private static String getURLRequested(RunData data)
+ private static String getURLRequested(RunData data)
{
return HttpUtils.getRequestURL(data.getRequest()).toString();
}
@@ -240,33 +241,33 @@
/**
* Retrives remote host name.
*
- * @param data RunData object associated with this request
- * @return name of the host that sent the request
+ * @param data RunData object associated with this request
+ * @return name of the host that sent the request
*/
- private static String getRemoteHost(RunData data)
+ private static String getRemoteHost(RunData data)
{
return data.getRemoteHost();
- }
+ }
/**
* Retrives remote host address.
*
- * @param data RunData object associated with this request
- * @return address of the host that sent the request
+ * @param data RunData object associated with this request
+ * @return address of the host that sent the request
*/
- private static String getRemoteAddr(RunData data)
+ private static String getRemoteAddr(RunData data)
{
return data.getRemoteAddr();
}
/**
- * Retrives the login of the user making this request, if the user
+ * Retrives the login of the user making this request, if the user
* has been authenticated, or null if the user has not been authenticated.
*
- * @param data RunData object associated with this request
- * @return remote user login name if he/she has been authenticated
+ * @param data RunData object associated with this request
+ * @return remote user login name if he/she has been authenticated
*/
- private static String getRemoteUser(RunData data)
+ private static String getRemoteUser(RunData data)
{
return data.getRequest().getRemoteUser();
}
@@ -274,10 +275,10 @@
/**
* Retrives the cached serverPort that is stored in the ServerData object
*
- * @param data RunData object associated with this request
- * @return port that this request was recived on
+ * @param data RunData object associated with this request
+ * @return port that this request was recived on
*/
- private static String getServerPort(RunData data)
+ private static String getServerPort(RunData data)
{
return String.valueOf(data.getServerPort());
}
@@ -285,10 +286,10 @@
/**
* Retrives the cached serverName that is stored in the ServerData object
*
- * @param data RunData object associated with this request
- * @return name of the server that served the request
+ * @param data RunData object associated with this request
+ * @return name of the server that served the request
*/
- private static String getServerName(RunData data)
+ private static String getServerName(RunData data)
{
return data.getServerName();
}
@@ -296,138 +297,146 @@
/**
* Retrives the cached method that is stored in the ServerData object
*
- * @param data RunData object associated with this request
- * @return method used by the request
+ * @param data RunData object associated with this request
+ * @return method used by the request
*/
- private static String getMethod(RunData data)
+ private static String getMethod(RunData data)
{
return data.getRequest().getMethod();
- }
+ }
/**
- * Retrives the value of the specified request header.
+ * Retrives the value of the specified request header.
*
- * @param data RunData object associated with this request
- * @param symbol pattern element containig header line name between {} brackets
- * @return header line contents
+ * @param data RunData object associated with this request
+ * @param symbol pattern element containig header line name between {}
+ * brackets
+ * @return header line contents
*/
- private static String getHeader(RunData data, String symbol)
+ private static String getHeader(RunData data, String symbol)
{
Enumeration names = data.getRequest().getHeaderNames();
- StringTokenizer st = new StringTokenizer(symbol,"%{}");
- return data.getRequest().getHeader(st.nextToken());
+ StringTokenizer st = new StringTokenizer(symbol, "%{}");
+ return data.getRequest().getHeader(st.nextToken());
}
/**
- * Retrives the query string that is contained in the request URL after the path.
+ * Retrives the query string that is contained in the request URL after the
+ * path.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return query string
*/
- private static String getQueryString(RunData data)
+ private static String getQueryString(RunData data)
{
return data.getRequest().getQueryString();
- }
+ }
/**
- * Retrives the portion of the request URI that indicates the context of the request.
+ * Retrives the portion of the request URI that indicates the context of the
+ * request.
*
- * @param data RunData object associated with this request
- * @return the portion of the request URI that indicates the context of the request.
+ * @param data RunData object associated with this request
+ * @return the portion of the request URI that indicates the context of the
+ * request.
*/
- private static String getContextPath(RunData data)
+ private static String getContextPath(RunData data)
{
return data.getRequest().getContextPath();
- }
+ }
/**
- * Retrives a string containing the unique identifier assigned to this session
+ * Retrives a string containing the unique identifier assigned to this
+ * session
*
- * @param data RunData object associated with this request
- * @return Session Id
+ * @param data RunData object associated with this request
+ * @return Session Id
*/
- private static String getSessionId(RunData data)
+ private static String getSessionId(RunData data)
{
- return data.getRequest().getSession().getId();
- }
+ return data.getRequest().getSession().getId();
+ }
/**
- * Retrives the name of the authentication scheme used to protect the servlet,
- * for example, "BASIC" or "SSL," or null if the servlet was not protected.
+ * Retrives the name of the authentication scheme used to protect the
+ * servlet, for example, "BASIC" or "SSL," or null if the servlet was not
+ * protected.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return authentication scheme used
*/
- private static String getAuthType(RunData data)
+ private static String getAuthType(RunData data)
{
- return data.getRequest().getAuthType();
- }
-
+ return data.getRequest().getAuthType();
+ }
+
/**
- * Retrives the MIME type of the body of the request, or null if the type is not known.
+ * Retrives the MIME type of the body of the request, or null if the type is
+ * not known.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return content type of the request
*/
- private static String getContentType(RunData data)
+ private static String getContentType(RunData data)
{
- return data.getRequest().getContentType();
- }
-
+ return data.getRequest().getContentType();
+ }
+
/**
- * Retrives the name of the character encoding used in the body of this request.
+ * Retrives the name of the character encoding used in the body of this
+ * request.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return character encoding
*/
- private static String getCharacterEncoding(RunData data)
+ private static String getCharacterEncoding(RunData data)
{
- return data.getRequest().getCharacterEncoding();
- }
-
+ return data.getRequest().getCharacterEncoding();
+ }
+
/**
- * Retrives the name and version of the protocol the request uses in the
+ * Retrives the name and version of the protocol the request uses in the
* form protocol/majorVersion.minorVersion
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return protocol
*/
- private static String getProtocol(RunData data)
+ private static String getProtocol(RunData data)
{
- return data.getRequest().getProtocol();
+ return data.getRequest().getProtocol();
}
/**
- * Retrives the name of the scheme used to make this request, for example,
- * http, https, or ftp.
+ * Retrives the name of the scheme used to make this request, for example,
+ * http, https, or ftp.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return scheme
*/
- private static String getScheme(RunData data)
+ private static String getScheme(RunData data)
{
- return data.getRequest().getScheme();
+ return data.getRequest().getScheme();
}
/**
- * Retrives the length, in bytes, of the request body and made available
- * by the input stream, or -1 if the length is not known.
+ * Retrives the length, in bytes, of the request body and made available
+ * by the input stream, or -1 if the length is not known.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return content length or -1 if not yet known
*/
- private static String getContentLength(RunData data)
+ private static String getContentLength(RunData data)
{
- return String.valueOf(data.getRequest().getContentLength());
+ return String.valueOf(data.getRequest().getContentLength());
}
/**
* Retrives the user agent name.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return user agent string
*/
- private static String getUserAgent(RunData data)
+ private static String getUserAgent(RunData data)
{
return data.getUserAgent();
}
@@ -435,36 +444,37 @@
/**
* Retrives the banner info asociated with the user making the request.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return banner info or empty stirng
*/
private static String getBannerInfo(RunData data)
{
- return (String) data.getUser().getTemp("bannerInfo","");
+ return (String) data.getUser().getTemp("bannerInfo", "");
}
/**
- *Retrives first and last name of the user making the request..
+ * Retrives first and last name of the user making the request.
*
- * @param data RunData object associated with this request
+ * @param data RunData object associated with this request
* @return user
*/
private static String getUser(RunData data)
{
- return data.getUser().getFirstName() + " " +data.getUser().getLastName() ;
+ return data.getUser().getFirstName() + " " +
+ data.getUser().getLastName() ;
}
/**
* Retrives cookies.
*
- * @param data RunData object associated with this request
- * @return cookies
+ * @param data RunData object associated with this request
+ * @return cookies
*/
private static String getCookies(RunData data) {
- Cookie cookies[]=data.getRequest().getCookies();
- StringBuffer answer=new StringBuffer();
+ Cookie cookies[] = data.getRequest().getCookies();
+ StringBuffer answer = new StringBuffer();
answer.append("Cookies: [ ");
- for (int i=0;i<cookies.length ;i++ )
+ for (int i = 0; i < cookies.length; i++ )
{
answer.append(cookies[i].getName());
answer.append(" = ");
@@ -473,5 +483,5 @@
}
answer.append("]");
return answer.toString();
- }
+ }
}
1.9 +77 -77 jakarta-turbine/src/java/org/apache/turbine/services/logging/FileLogger.java
Index: FileLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/FileLogger.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileLogger.java 2001/03/06 06:12:26 1.8
+++ FileLogger.java 2001/04/12 02:22:58 1.9
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -65,14 +65,14 @@
import org.apache.turbine.util.RunData;
-/**
- * This class implements Logger interface using simple file
+/**
+ * This class implements Logger interface using simple file
* writing. It handles only files and console as destinations.
*
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: FileLogger.java,v 1.8 2001/03/06 06:12:26 chrise Exp $
+ * @version $Id: FileLogger.java,v 1.9 2001/04/12 02:22:58 mpoeschl Exp $
*/
public class FileLogger extends BaseLogger
{
@@ -86,7 +86,7 @@
protected String lf = System.getProperty("line.separator", "\n");
/** class initialization */
- static
+ static
{
globalFilesTable = new Hashtable();
}
@@ -100,10 +100,10 @@
/** Initialize and create the writers */
public void init(LoggingConfig loggingConfig)
{
- super.init(loggingConfig);
+ super.init(loggingConfig);
}
- /**
+ /**
* Adds local file as destinations for logger.
* @param LoggingConfig configuration
*/
@@ -124,24 +124,24 @@
// check if the file is being used by another FileLogger instance.
// if so, use the writer from the global table to synchronize access
FileWriter writer = (FileWriter)globalFilesTable.get(path);
- if (writer == null)
+ if (writer == null)
{
try
{
- writer = new FileWriter(path,true);
- globalFilesTable.put(path,writer);
+ writer = new FileWriter(path, true);
+ globalFilesTable.put(path, writer);
}
catch(Exception e)
{
continue;
}
}
- localFilesTable.put(path,writer);
+ localFilesTable.put(path, writer);
}
}
- /**
- * It adds console as a destination for logger.
+ /**
+ * Adds console as a destination for logger.
* @param LoggingConfig configuration
*/
protected void configureConsole(LoggingConfig loggingConfig)
@@ -149,7 +149,7 @@
this.console = loggingConfig.getConsole();
}
- /**
+ /**
* It performs action that are need for deterimne whether
* logger was well configured or has any output
*/
@@ -167,7 +167,7 @@
{
shutdown();
}
-
+
public void shutdown()
{
for (Enumeration files = localFilesTable.elements(); files.hasMoreElements(); )
@@ -180,140 +180,140 @@
catch (Exception e)
{
}
- }
+ }
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
public void debug(String message)
{
- log(DEBUG,message,null,null);
+ log(DEBUG, message, null, null);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
public void debug(String message, Throwable t)
{
- log(DEBUG,message,null,t);
+ log(DEBUG, message, null, t);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
public void debug(String message, RunData data)
- {
- log(DEBUG,message,data,null);
+ {
+ log(DEBUG, message, data, null);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
- public void debug(String message,RunData data,Throwable t)
+ public void debug(String message, RunData data, throwable t)
{
- log(DEBUG,message,data,t);
+ log(DEBUG, message, data, t);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
public void info(String message)
{
- log(INFO,message,null,null);
+ log(INFO, message, null, null);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,Throwable t)
+ public void info(String message, throwable t)
{
- log(INFO,message,null,t);
+ log(INFO, message, null, t);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,RunData data)
+ public void info(String message, RunData data)
{
- log(INFO,message,data,null);
+ log(INFO, message, data, null);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,RunData data,Throwable t)
+ public void info(String message, RunData data, throwable t)
{
- log(INFO,message,data,t);
+ log(INFO, message, data, t);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
public void warn(String message)
{
- log(WARN,message,null,null);
+ log(WARN, message, null, null);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,Throwable t)
+ public void warn(String message, throwable t)
{
- log(WARN,message,null,t);
+ log(WARN, message, null, t);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,RunData data)
+ public void warn(String message, RunData data)
{
- log(WARN,message,data,null);
+ log(WARN, message, data, null);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,RunData data,Throwable t)
+ public void warn(String message, RunData data, throwable t)
{
- log(WARN,message,data,t);
+ log(WARN, message, data, t);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
public void error(String message)
{
- log(ERROR,message,null,null);
+ log(ERROR, message, null, null);
}
- public void error(String message,Throwable e)
+ public void error(String message, throwable e)
{
- log(ERROR,message,null,e);
+ log(ERROR, message, null, e);
}
public void error(Throwable e)
{
- log(ERROR,null,null,e);
+ log(ERROR, null, null, e);
}
- public void error(String message,RunData data)
+ public void error(String message, RunData data)
{
- log(ERROR,message,data,null);
+ log(ERROR, message, data, null);
}
- public void error(String message,RunData data,Throwable e)
+ public void error(String message, RunData data, throwable e)
{
- log(ERROR,message,data,e);
+ log(ERROR, message, data, e);
}
- /**
+ /**
* Checks if logging is allowed and appends loglevel message
*/
- protected void log(int level,String message,RunData data,Throwable e)
+ protected void log(int level,String message, RunData data, throwable e)
{
- if (level<logLevel)
+ if (level < logLevel)
{
return;
}
@@ -321,37 +321,37 @@
switch (level)
{
case DEBUG: levelS = LEVELDEBUG; break;
- case INFO: levelS = LEVELINFO; break;
- case WARN: levelS = LEVELWARN; break;
+ case INFO: levelS = LEVELINFO; break;
+ case WARN: levelS = LEVELWARN; break;
case ERROR: levelS = LEVELERROR; break;
default: levelS = LEVELDEBUG;
}
-
- logAll(levelS,message,data,e);
+
+ logAll(levelS, message, data, e);
}
/** log message to all open loging files */
- protected void logAll(String level,String description,RunData data,Throwable t)
+ protected void logAll(String level,String description, RunData data, throwable t)
{
Date date = new Date();
StringBuffer logEntry = new StringBuffer();
- logEntry.append ( "[" );
- logEntry.append ( date.toString() );
- logEntry.append ( "] -- " );
- logEntry.append ( level );
- logEntry.append ( " -- " );
- logEntry.append ( description );
+ logEntry.append( "[" );
+ logEntry.append( date.toString() );
+ logEntry.append( "] -- " );
+ logEntry.append( level );
+ logEntry.append( " -- " );
+ logEntry.append( description );
if (data!=null)
{
- logEntry.append ( " -- " );
+ logEntry.append( " -- " );
logEntry.append(runDataFilter.getString(data));
}
if (t != null)
{
logEntry.append ( lf );
ByteArrayOutputStream ostr = new ByteArrayOutputStream();
- PrintWriter out = new PrintWriter(ostr,true);
+ PrintWriter out = new PrintWriter(ostr, true);
out.write(logEntry.toString());
out.write("\tException: ");
out.write(t.toString());
@@ -377,7 +377,7 @@
}
catch(IOException e)
{
- System.out.println("Cannot log message: "+e.getMessage());
+ System.out.println("Cannot log message: " + e.getMessage());
e.printStackTrace();
}
}
1.9 +85 -83 jakarta-turbine/src/java/org/apache/turbine/services/logging/Log4JavaLogger.java
Index: Log4JavaLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/Log4JavaLogger.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Log4JavaLogger.java 2001/04/07 03:11:14 1.8
+++ Log4JavaLogger.java 2001/04/12 02:22:58 1.9
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -67,7 +67,7 @@
import org.apache.turbine.services.logging.jdbc.*;
-/**
+/**
* Class implements the Logger interface using log4java package
* Messages can be written to following destination:
* <ul>
@@ -84,7 +84,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: Log4JavaLogger.java,v 1.8 2001/04/07 03:11:14 dlr Exp $
+ * @version $Id: Log4JavaLogger.java,v 1.9 2001/04/12 02:22:58 mpoeschl Exp $
*/
public class Log4JavaLogger extends BaseLogger
{
@@ -92,7 +92,7 @@
protected static Hashtable filesTable;
/** console appender */
- protected static Appender consoleAppender=null;
+ protected static Appender consoleAppender = null;
/** log4java logging interface */
protected Category logger;
@@ -105,7 +105,7 @@
{
filesTable = new Hashtable();
consoleAppender = new FileAppender(
- new PatternLayout("%d [%t] %-5p %c - %m%n"),System.out);
+ new PatternLayout("%d [%t] %-5p %c - %m%n"), System.out);
}
public Log4JavaLogger()
@@ -122,14 +122,14 @@
//Priority is set for DEBUG becouse this implementation checks log level.
logger.setPriority(Priority.DEBUG);
// FIXME: set the pattern
- layout = new PatternLayout("%d [%t] %-5p %c - %m%n");
+ layout = new PatternLayout("%d [%t] %-5p %c - %m%n");
// now do the rest of initialization
super.init(loggingConfig);
}
- /**
+ /**
* Adds a local file as destinations for logger.
*
* @param loggingConfig The configuration of this logger.
@@ -144,11 +144,11 @@
//resolves relative paths
String pathTmp = ((ServletContext)loggingConfig.getServletContext())
.getRealPath(path);
- if (pathTmp!=null)
+ if (pathTmp != null)
{
path=pathTmp;
}
-
+
Appender appender = null;
//checking if thereis such appender in the system
appender = (Appender)filesTable.get(path);
@@ -156,14 +156,16 @@
{
try
{
- appender = new RollingFileAppender(layout,path,true);
- ((RollingFileAppender)appender).setMaxBackupIndex(loggingConfig.getBackupFiles());
+ appender = new RollingFileAppender(layout, path, true);
+ ((RollingFileAppender)appender)
+ .setMaxBackupIndex(loggingConfig.getBackupFiles());
//finding file size
if (loggingConfig.getFileSize() > -1)
{
- ((RollingFileAppender)appender).setMaxFileSize(loggingConfig.getFileSize());
+ ((RollingFileAppender)appender)
+ .setMaxFileSize(loggingConfig.getFileSize());
}
- filesTable.put(path,appender);
+ filesTable.put(path, appender);
}
catch (java.io.IOException e)
{
@@ -174,7 +176,7 @@
}
}
- /**
+ /**
* It adds console as a destination for logger.
* @param loggingConfig configuration
*/
@@ -183,14 +185,14 @@
this.console = loggingConfig.getConsole();
if (console)
{
- if (consoleAppender!=null)
+ if (consoleAppender != null)
{
logger.addAppender(consoleAppender);
}
}
}
- /**
+ /**
* This method should be implemented by user if the logger can handle console.
* It adds console as a destination for logger.
*
@@ -204,11 +206,11 @@
{
return;
}
- Appender appender=new SocketAppender(remoteHost,remotePort);
+ Appender appender = new SocketAppender(remoteHost, remotePort);
logger.addAppender(appender);
}
- /**
+ /**
* It adds remote demon as a destination for logger.
*
* @param loggingConfig configuration
@@ -221,7 +223,7 @@
return;
}
- Appender appender = new SyslogAppender(layout,syslogHost,logLevel);
+ Appender appender = new SyslogAppender(layout, syslogHost, logLevel);
logger.addAppender(appender);
}
@@ -256,7 +258,7 @@
appender.setLayout(layout);
appender.activateOptions();
logger.addAppender(appender);
- }
+ }
/**
* It adds a db as a destination for logger.
@@ -272,10 +274,10 @@
{
return;
}
-
+
JDBCAppender appender = new JDBCAppender();
appender.setOption(JDBCAppender.LOGGER_CLASS_OPTION, dbLogger);
-
+
/*
* This sucks, but we are stuck with setOption(String, String).
* I want people to be able to specify their own db logger
@@ -286,9 +288,9 @@
appender.setLayout(layout);
appender.activateOptions();
logger.addAppender(appender);
- }
+ }
- /**
+ /**
* It performs action that are need for deterimne whether
* logger was well configured or has any output
*/
@@ -324,167 +326,167 @@
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
public void debug(String message)
{
- log(DEBUG,message,null,null);
+ log(DEBUG, message, null, null);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
- public void debug(String message,Throwable t)
+ public void debug(String message, throwable t)
{
- log(DEBUG,message,null,t);
+ log(DEBUG, message, null, t);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
- public void debug(String message,RunData data)
+ public void debug(String message, RunData data)
{
- log(DEBUG,message,data,null);
+ log(DEBUG, message, data, null);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
- public void debug(String message,RunData data,Throwable t)
+ public void debug(String message, RunData data, throwable t)
{
- log(DEBUG,message,data,t);
+ log(DEBUG, message, data, t);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
public void info(String message)
{
- log(INFO,message,null,null);
+ log(INFO, message, null, null);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,Throwable t)
+ public void info(String message, throwable t)
{
- log(INFO,message,null,t);
+ log(INFO, message, null, t);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,RunData data)
+ public void info(String message, RunData data)
{
- log(INFO,message,data,null);
+ log(INFO, message, data, null);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,RunData data,Throwable t)
+ public void info(String message, RunData data, throwable t)
{
- log(INFO,message,data,t);
+ log(INFO, message, data, t);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
public void warn(String message)
{
- log(WARN,message,null,null);
+ log(WARN, message, null, null);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,Throwable t)
+ public void warn(String message, throwable t)
{
- log(WARN,message,null,t);
+ log(WARN, message, null, t);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,RunData data)
+ public void warn(String message, RunData data)
{
- log(WARN,message,data,null);
+ log(WARN, message, data, null);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,RunData data,Throwable t)
+ public void warn(String message, RunData data, throwable t)
{
- log(WARN,message,data,t);
+ log(WARN, message, data, t);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
public void error(String message)
{
- log(ERROR,message,null,null);
+ log(ERROR, message, null, null);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
- public void error(String message,Throwable e)
+ public void error(String message, throwable e)
{
- log(ERROR,message,null,e);
+ log(ERROR, message, null, e);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
public void error(Throwable e)
{
- log(ERROR,null,null,e);
+ log(ERROR, null, null, e);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
- public void error(String message,RunData data)
+ public void error(String message, RunData data)
{
- log(ERROR,message,data,null);
+ log(ERROR, message, data, null);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
- public void error(String message,RunData data,Throwable e)
+ public void error(String message, RunData data, throwable e)
{
- log(ERROR,message,data,e);
+ log(ERROR, message, data, e);
}
/**
* Creates new loging message form message and RunData, and sends it to the category.
*/
- private void log(int level,String message,RunData data,Throwable e)
+ private void log(int level, String message, RunData data, throwable e)
{
- if (level<logLevel)
+ if (level < logLevel)
{
return;
}
-
- if (data!=null)
+
+ if (data != null)
{
- message+=runDataFilter.getString(data);
+ message += runDataFilter.getString(data);
}
switch (level)
{
- case DEBUG: logger.debug(message,e); break;
- case INFO: logger.info(message,e); break;
- case WARN: logger.warn(message,e); break;
- case ERROR: logger.error(message,e); break;
- default: logger.debug(message,e);
+ case DEBUG: logger.debug(message, e); break;
+ case INFO: logger.info(message, e); break;
+ case WARN: logger.warn(message, e); break;
+ case ERROR: logger.error(message, e); break;
+ default: logger.debug(message, e);
}
}
}
1.9 +66 -66 jakarta-turbine/src/java/org/apache/turbine/services/logging/Logger.java
Index: Logger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/Logger.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Logger.java 2001/04/06 18:41:52 1.8
+++ Logger.java 2001/04/12 02:22:58 1.9
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -66,66 +66,66 @@
*
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: Logger.java,v 1.8 2001/04/06 18:41:52 jvanzyl Exp $
+ * @version $Id: Logger.java,v 1.9 2001/04/12 02:22:58 mpoeschl Exp $
*/
-public interface Logger
+public interface Logger
{
/**Log level*/
- public static final int DEBUG=1;
+ public static final int DEBUG = 1;
/**Log level*/
- public static final int INFO=2;
+ public static final int INFO = 2;
/**Log level*/
- public static final int WARN=3;
+ public static final int WARN = 3;
/**Log level*/
- public static final int ERROR=4;
+ public static final int ERROR = 4;
/** String denoting log level */
- public static final String LEVELDEBUG="DEBUG";
+ public static final String LEVELDEBUG = "DEBUG";
/** String denoting log level */
- public static final String LEVELINFO="INFO";
+ public static final String LEVELINFO = "INFO";
/** String denoting log level */
- public static final String LEVELWARN="WARN";
+ public static final String LEVELWARN = "WARN";
/** String denoting log level */
- public static final String LEVELERROR="ERROR";
-
+ public static final String LEVELERROR = "ERROR";
+
/** Destination type - file */
- public static final String FILE_KEY="file";
+ public static final String FILE_KEY = "file";
/** Destination type - syslogdemon */
- public static final String SYSLOGD_KEY="syslogd";
+ public static final String SYSLOGD_KEY = "syslogd";
/** Destination type - remote server */
- public static final String REMOTE_KEY="remote";
+ public static final String REMOTE_KEY = "remote";
/** Destination type - console */
- public static final String CONSOLE_KEY="console";
+ public static final String CONSOLE_KEY = "console";
/** Destination type - email */
- public static final String EMAIL_KEY="email";
+ public static final String EMAIL_KEY = "email";
/** Destination type - db */
- public static final String DB_KEY="database";
-
+ public static final String DB_KEY = "database";
+
/** Destination parameter - format */
- public static final String FORMAT_KEY="format";
+ public static final String FORMAT_KEY = "format";
/** Destination parameter - file path */
- public static final String PATH_KEY="path";
+ public static final String PATH_KEY = "path";
/** Destination parameter - remote url */
- public static final String HOST_KEY="host";
+ public static final String HOST_KEY = "host";
/** Destination parameter - remote port */
- public static final String PORT_KEY="port";
+ public static final String PORT_KEY = "port";
/** Destination parameter - syslogd facility */
- public static final String FACILITY_KEY="facility";
+ public static final String FACILITY_KEY = "facility";
/** Destination parameter - rollover file size */
- public static final String SIZE_KEY="file.size";
+ public static final String SIZE_KEY = "file.size";
/** Destination parameter - number of backup files */
- public static final String BACKUP_KEY="file.backups";
+ public static final String BACKUP_KEY = "file.backups";
/** Destination parameter - email from */
- public static final String EMAILFROM_KEY="from";
+ public static final String EMAILFROM_KEY = "from";
/** Destination parameter - email to */
- public static final String EMAILTO_KEY="to";
+ public static final String EMAILTO_KEY = "to";
/** Destination parameter - email subject */
- public static final String EMAILSUBJECT_KEY="subject";
+ public static final String EMAILSUBJECT_KEY = "subject";
/** Destination parameter - email buffer size */
- public static final String EMAILBUFFERSIZE_KEY="buffer.size";
+ public static final String EMAILBUFFERSIZE_KEY = "buffer.size";
/** Destination parameter - db sql */
- public static final String DB_LOGGER_KEY="logger";
- public static final String DB_POOL_KEY="pool";
+ public static final String DB_LOGGER_KEY = "logger";
+ public static final String DB_POOL_KEY = "pool";
/** name of the logger */
public String getName();
@@ -133,7 +133,7 @@
/** Setings the name */
public void setName(String logName);
- /**
+ /**
* This method sets parameters for the logger implementation.
* If the implementation cannot handle some type of destination should ignore
* that output.
@@ -145,105 +145,105 @@
/** Close all destinations*/
public void shutdown();
- /**
+ /**
* Sets log level for the logger
*/
public void setLogLevel(int level);
- /**
- * This method should be implemented by user.
+ /**
+ * This method should be implemented by user.
* It performs action that are need for deterimne whether
* logger was well configured or has any output
*/
public boolean checkLogger();
- /**
+ /**
* Sets format style for extracting data from RunData
*/
public void setFormat(String format);
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
public void debug(String message);
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
public void debug(String message, Throwable t);
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
- public void debug(String message,RunData data);
+ public void debug(String message, RunData data);
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log metod with logLevel == DEBUG
*/
- public void debug(String message,RunData data, Throwable t);
+ public void debug(String message, RunData data, Throwable t);
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
public void info(String message);
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
public void info(String message, Throwable t);
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,RunData data);
+ public void info(String message, RunData data);
/**
- * This is a log metod with logLevel==INFO
+ * This is a log metod with logLevel == INFO
*/
- public void info(String message,RunData data, Throwable t);
+ public void info(String message, RunData data, Throwable t);
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
public void warn(String message);
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
public void warn(String message, Throwable t);
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,RunData data);
+ public void warn(String message, RunData data);
/**
- * This is a log metod with logLevel==WARN
+ * This is a log metod with logLevel == WARN
*/
- public void warn(String message,RunData data, Throwable t);
+ public void warn(String message, RunData data, Throwable t);
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
public void error(String message);
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
- public void error(String message,Throwable e);
+ public void error(String message, Throwable e);
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
public void error(Throwable e);
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
- public void error(String message,RunData data);
+ public void error(String message, RunData data);
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log metod with logLevel == ERROR
*/
- public void error(String message,RunData data,Throwable e);
+ public void error(String message, RunData data, Throwable e);
}
1.6 +9 -9 jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingConfig.java
Index: LoggingConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoggingConfig.java 2001/04/06 18:41:52 1.5
+++ LoggingConfig.java 2001/04/12 02:22:58 1.6
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -65,7 +65,7 @@
* system.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: LoggingConfig.java,v 1.5 2001/04/06 18:41:52 jvanzyl Exp $
+ * @version $Id: LoggingConfig.java,v 1.6 2001/04/12 02:22:58 mpoeschl Exp $
*/
public interface LoggingConfig
{
@@ -77,10 +77,10 @@
public final static String LEVEL = "level";
/** default rollover file size */
- public static final long DEFAULT_FILE_SIZE=80000;
+ public static final long DEFAULT_FILE_SIZE = 80000;
/** default number of backup files */
- public static final int DEFAULT_BACKUP_FILES=1;
+ public static final int DEFAULT_BACKUP_FILES = 1;
public abstract void setInitResource(Object props);
@@ -135,11 +135,11 @@
public abstract void setEmailFrom(String emailFrom);
public abstract String getEmailTo();
-
+
public abstract void setEmailTo(String emailTo);
public abstract String getEmailSubject();
-
+
public abstract void setEmailSubject(String emailSubject);
public abstract void setDbLogger(String v);
1.8 +44 -44 jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingService.java
Index: LoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LoggingService.java 2001/04/08 16:41:08 1.7
+++ LoggingService.java 2001/04/12 02:22:58 1.8
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -66,27 +66,27 @@
/**
* A service that provides logging capabilities to Turbine.
* <p>
- * This interface specifies the various possibilities of
+ * This interface specifies the various possibilities of
* log message writing that are available to Turbine components
* and applications.
*
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: LoggingService.java,v 1.7 2001/04/08 16:41:08 ilkka Exp $
+ * @version $Id: LoggingService.java,v 1.8 2001/04/12 02:22:58 mpoeschl Exp $
*/
-public interface LoggingService extends Service
+public interface LoggingService extends Service
{
/** The name of the service */
public static final String SERVICE_NAME = "LoggingService";
- /**
+ /**
* This method returns default logger for Turbine System
*/
public Logger getLogger();
/**
- * This method returns logger with given name or default logger if
+ * This method returns logger with given name or default logger if
* the logger of specific name can't be found.
*/
public Logger getLogger(String logName);
@@ -99,7 +99,7 @@
/**
* This method sets the log level in the logger of given name
*/
- public void setLogLevel(String logName,int level);
+ public void setLogLevel(String logName, int level);
/**
* This method sets format style of the default logger
@@ -109,198 +109,198 @@
/**
* This method sets format style of the given logger.
*/
- public void setFormat(String logName,String format);
+ public void setFormat(String logName, String format);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the default logger
*/
public void debug(String message);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the default logger
*/
public void debug(String message, Throwable t);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the given logger
*/
public void debug(String logName, String message, Throwable t);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the given logger
*/
public void debug(String logName, String message);
-
+
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the default logger
*/
public void debug(String message, RunData data);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the default logger
*/
public void debug(String message, RunData data, Throwable t);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the given logger
*/
public void debug(String logName, String message, RunData data,
Throwable t);
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG,printing is done by
* the given logger
*/
public void debug(String logName, String message, RunData data);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the default logger
*/
public void info(String message);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the default logger
*/
public void info(String message, Throwable t);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the given logger
*/
public void info(String logName, String message);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the given logger
*/
public void info(String logName, String message, Throwable t);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the default logger
*/
public void info(String message, RunData data);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the default logger
*/
public void info(String message, RunData data, Throwable t);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the given logger
*/
public void info(String logName, String message, RunData data);
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the given logger
*/
public void info(String logName, String message, RunData data, Throwable t);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the default logger
*/
public void warn(String message);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the default logger
*/
public void warn(String message, Throwable t);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the given logger
*/
public void warn(String logName, String message);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the given logger
*/
public void warn(String logName, String message, Throwable t);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the default logger
*/
public void warn(String message, RunData data);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the default logger
*/
public void warn(String message, RunData data, Throwable t);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the given logger
*/
public void warn(String logName, String message, RunData data);
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the given logger
*/
public void warn(String logName, String message, RunData data, Throwable t);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the default logger
*/
public void error(String message);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the default logger
*/
public void error(String message, Throwable t);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the given logger
*/
public void error(String logName, String message);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the given logger
*/
public void error(String logName, String message, Throwable t);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the default logger
*/
public void error(String message, RunData data);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the default logger
*/
public void error(String message, RunData data, Throwable t);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the given logger
*/
public void error(String logName, String message, RunData data);
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR,printing is done by
* the given logger
*/
public void error(String logName, String message, RunData data,
1.8 +63 -62 jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLogger.java
Index: ServletLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLogger.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServletLogger.java 2001/03/06 06:12:28 1.7
+++ ServletLogger.java 2001/04/12 02:22:58 1.8
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -63,15 +63,15 @@
import org.apache.turbine.util.RunData;
-/**
- * This class implements Logger interface using log method from ServletContext.
+/**
+ * This class implements Logger interface using log method from ServletContext.
* This implementation is very simple, so there is no extracting data from RunData,
* and no log levels.
*
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: ServletLogger.java,v 1.7 2001/03/06 06:12:28 chrise Exp $
+ * @version $Id: ServletLogger.java,v 1.8 2001/04/12 02:22:58 mpoeschl Exp $
*/
public class ServletLogger extends BaseLogger
{
@@ -96,7 +96,7 @@
{
}
- /**
+ /**
* It performs action that are need for deterimne whether
* logger was well configured or has any output
*/
@@ -106,148 +106,149 @@
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log method with logLevel == DEBUG
*/
public void debug(String message)
{
- log(DEBUG,message,null,null);
+ log(DEBUG, message, null, null);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log method with logLevel == DEBUG
*/
- public void debug(String message,Throwable t)
+ public void debug(String message, Throwable t)
{
- log(DEBUG,message,null,t);
+ log(DEBUG, message, null, t);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log method with logLevel == DEBUG
*/
- public void debug(String message,RunData data)
+ public void debug(String message, RunData data)
{
- log(DEBUG,message,data,null);
+ log(DEBUG, message, data, null);
}
/**
- * This is a log metod with logLevel==DEBUG
+ * This is a log method with logLevel == DEBUG
*/
- public void debug(String message,RunData data,Throwable t)
+ public void debug(String message, RunData data, Throwable t)
{
- log(DEBUG,message,data,t);
+ log(DEBUG, message, data, t);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log method with logLevel == INFO
*/
public void info(String message)
{
- log(INFO,message,null,null);
+ log(INFO, message, null, null);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log method with logLevel == INFO
*/
- public void info(String message,Throwable t)
+ public void info(String message, Throwable t)
{
- log(INFO,message,null,t);
+ log(INFO, message, null, t);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log method with logLevel == INFO
*/
- public void info(String message,RunData data)
+ public void info(String message, RunData data)
{
- log(INFO,message,data,null);
+ log(INFO, message, data, null);
}
/**
- * This is a log metod with logLevel==INFO
+ * This is a log method with logLevel == INFO
*/
- public void info(String message,RunData data,Throwable t)
+ public void info(String message, RunData data, Throwable t)
{
- log(INFO,message,data,t);
+ log(INFO, message, data, t);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log method with logLevel == WARN
*/
public void warn(String message)
{
- log(WARN,message,null,null);
+ log(WARN, message, null, null);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log method with logLevel == WARN
*/
- public void warn(String message,Throwable t)
+ public void warn(String message, Throwable t)
{
- log(WARN,message,null,t);
+ log(WARN, message, null, t);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log method with logLevel == WARN
*/
- public void warn(String message,RunData data)
+ public void warn(String message, RunData data)
{
- log(WARN,message,data,null);
+ log(WARN, message, data, null);
}
/**
- * This is a log metod with logLevel==WARN
+ * This is a log method with logLevel == WARN
*/
- public void warn(String message,RunData data,Throwable t)
+ public void warn(String message, RunData data, Throwable t)
{
- log(WARN,message,data,t);
+ log(WARN, message, data, t);
}
/**
- * This is a log metod with logLevel==ERROR
+ * This is a log method with logLevel == ERROR
*/
public void error(String message)
{
- log(ERROR,message,null,null);
+ log(ERROR, message, null, null);
}
- public void error(String message,Throwable e)
+ public void error(String message, Throwable e)
{
- log(ERROR,message,null,e);
+ log(ERROR, message, null, e);
}
public void error(Throwable e)
{
- log(ERROR,null,null,e);
+ log(ERROR, null, null, e);
}
- public void error(String message,RunData data)
+ public void error(String message, RunData data)
{
- log(ERROR,message,data,null);
+ log(ERROR, message, data, null);
}
- public void error(String message,RunData data,Throwable e)
+ public void error(String message, RunData data, Throwable e)
{
- log(ERROR,message,data,e);
+ log(ERROR, message, data, e);
}
/** appends log level to the message */
- protected void log(int level,String message,RunData data,Throwable e)
+ protected void log(int level, String message, RunData data, Throwable e)
{
String levelS;
switch (level)
{
- case DEBUG: levelS=LEVELDEBUG; break;
- case INFO: levelS=LEVELINFO; break;
- case WARN: levelS=LEVELWARN; break;
- case ERROR: levelS=LEVELERROR; break;
- default: levelS=LEVELDEBUG;
+ case DEBUG: levelS = LEVELDEBUG; break;
+ case INFO: levelS = LEVELINFO; break;
+ case WARN: levelS = LEVELWARN; break;
+ case ERROR: levelS = LEVELERROR; break;
+ default: levelS = LEVELDEBUG;
}
-
- logAll(levelS,message,data,e);
+
+ logAll(levelS, message, data, e);
}
/** log message using context log method. */
- protected void logAll(String level,String description,RunData data,Throwable t)
+ protected void logAll(String level, String description, RunData data,
+ Throwable t)
{
boolean odp=true;
@@ -257,10 +258,10 @@
logEntry.append ( level );
logEntry.append ( " -- " );
logEntry.append ( description );
-
- if (t!=null)
+
+ if (t != null)
{
- context.log(logEntry.toString(),t);
+ context.log(logEntry.toString(), t);
}
else
{
1.8 +95 -95 jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLoggingService.java
Index: ServletLoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/ServletLoggingService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServletLoggingService.java 2001/03/06 06:12:29 1.7
+++ ServletLoggingService.java 2001/04/12 02:22:58 1.8
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -69,19 +69,19 @@
/**
* This service functions as a simple logger provider (with only one logger).
- * It need no configuration file because all messages are printed
- * using servlet log method.
+ * It needs no configuration file because all messages are printed
+ * using servlet log method.
*
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: ServletLoggingService.java,v 1.7 2001/03/06 06:12:29 chrise Exp $
+ * @version $Id: ServletLoggingService.java,v 1.8 2001/04/12 02:22:58 mpoeschl Exp $
*/
-public class ServletLoggingService
+public class ServletLoggingService
extends TurbineLoggingService
{
- /**
+ /**
* Inits the service
*/
public void init(ServletConfig config) throws InitializationException
@@ -107,7 +107,7 @@
}
else
{
- System.out.println("Servlet Logging Service - Failed to Start!" +
+ System.out.println("Servlet Logging Service - Failed to Start!" +
" Config == Null");
}
}
@@ -131,7 +131,7 @@
/**
* This method sets the log level in the default logger ignoring given name
*/
- public void setLogLevel(String logName,int level)
+ public void setLogLevel(String logName, int level)
{
getLogger().setLogLevel(level);
}
@@ -147,13 +147,13 @@
/**
* This method sets format style of the given logger.
*/
- public void setFormat(String logName,String format)
+ public void setFormat(String logName, String format)
{
getLogger().setFormat(format);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
public void debug(String message)
@@ -162,70 +162,70 @@
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
- public void debug(String message,Throwable t)
+ public void debug(String message, Throwable t)
{
- getLogger().debug(message,t);
+ getLogger().debug(message, t);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message,Throwable t)
+ public void debug(String logName, String message, Throwable t)
{
- getLogger().debug(message,t);
+ getLogger().debug(message, t);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message)
+ public void debug(String logName, String message)
{
getLogger().debug(message);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
- public void debug(String message,RunData data)
+ public void debug(String message, RunData data)
{
- getLogger().debug(message,data);
+ getLogger().debug(message, data);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
- public void debug(String message,RunData data,Throwable t)
+ public void debug(String message, RunData data, Throwable t)
{
- getLogger().debug(message,data,t);
+ getLogger().debug(message, data, t);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message,RunData data,Throwable t)
+ public void debug(String logName, String message, RunData data, Throwable t)
{
- getLogger().debug(message,data,t);
+ getLogger().debug(message, data, t);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message,RunData data)
+ public void debug(String logName, String message, RunData data)
{
- getLogger().debug(message,data);
+ getLogger().debug(message, data);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
public void info(String message)
@@ -234,69 +234,69 @@
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
- public void info(String message,Throwable t)
+ public void info(String message, Throwable t)
{
- getLogger().info(message,t);
+ getLogger().info(message, t);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message)
+ public void info(String logName, String message)
{
getLogger().info(message);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message,Throwable t)
+ public void info(String logName, String message, Throwable t)
{
- getLogger().info(message,t);
+ getLogger().info(message, t);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
- public void info(String message,RunData data)
+ public void info(String message, RunData data)
{
- getLogger().info(message,data);
+ getLogger().info(message, data);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
- public void info(String message,RunData data,Throwable t)
+ public void info(String message, RunData data, Throwable t)
{
- getLogger().info(message,data,t);
+ getLogger().info(message, data, t);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message,RunData data)
+ public void info(String logName, String message, RunData data)
{
- getLogger().info(message,data);
+ getLogger().info(message, data);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message,RunData data,Throwable t)
+ public void info(String logName, String message, RunData data, Throwable t)
{
- getLogger().info(message,data,t);
+ getLogger().info(message, data, t);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
public void warn(String message)
@@ -305,70 +305,70 @@
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
- public void warn(String message,Throwable t)
+ public void warn(String message, Throwable t)
{
- getLogger().warn(message,t);
+ getLogger().warn(message, t);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message)
+ public void warn(String logName, String message)
{
getLogger().warn(message);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message,Throwable t)
+ public void warn(String logName, String message, Throwable t)
{
- getLogger().warn(message,t);
+ getLogger().warn(message, t);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
- public void warn(String message,RunData data)
+ public void warn(String message, RunData data)
{
- getLogger().warn(message,data);
+ getLogger().warn(message, data);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
- public void warn(String message,RunData data,Throwable t)
+ public void warn(String message, RunData data, Throwable t)
{
- getLogger().warn(message,data,t);
+ getLogger().warn(message, data, t);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message,RunData data)
+ public void warn(String logName, String message, RunData data)
{
- getLogger().warn(message,data);
+ getLogger().warn(message, data);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message,RunData data,Throwable t)
+ public void warn(String logName, String message, RunData data, Throwable t)
{
- getLogger().warn(message,data,t);
+ getLogger().warn(message, data, t);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
public void error(String message)
@@ -377,16 +377,16 @@
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
- public void error(String message,Throwable t)
+ public void error(String message, Throwable t)
{
- getLogger().error(message,t);
+ getLogger().error(message, t);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
public void error(String logName, String message)
@@ -395,47 +395,47 @@
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
- public void error(String logName, String message,Throwable t)
+ public void error(String logName, String message, Throwable t)
{
- getLogger().error(message,t);
+ getLogger().error(message, t);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
- public void error(String message,RunData data)
+ public void error(String message, RunData data)
{
- getLogger().error(message,data);
+ getLogger().error(message, data);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
- public void error(String message,RunData data,Throwable t)
+ public void error(String message, RunData data, Throwable t)
{
- getLogger().error(message,data,t);
+ getLogger().error(message, data, t);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
- public void error(String logName, String message,RunData data)
+ public void error(String logName, String message, RunData data)
{
- getLogger().error(message,data);
+ getLogger().error(message, data);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
- public void error(String logName, String message,RunData data,Throwable t)
+ public void error(String logName, String message, RunData data, Throwable t)
{
- getLogger().error(message,data,t);
+ getLogger().error(message, data, t);
}
}
1.7 +96 -96 jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLogging.java
Index: TurbineLogging.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLogging.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineLogging.java 2001/03/06 06:12:29 1.6
+++ TurbineLogging.java 2001/04/12 02:22:58 1.7
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -66,12 +66,12 @@
*
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineLogging.java,v 1.6 2001/03/06 06:12:29 chrise Exp $
+ * @version $Id: TurbineLogging.java,v 1.7 2001/04/12 02:22:58 mpoeschl Exp $
*/
public class TurbineLogging
{
/**
- * Utility method for accessing the service
+ * Utility method for accessing the service
* implementation
*
* @return a LoggingService implementation instance
@@ -90,7 +90,7 @@
getService().shutdown();
}
- /**
+ /**
* This metod returns default logger for Turbine System
*
* @return The default logger for system.
@@ -135,13 +135,13 @@
/**
* This metod sets format style of the given logger.
*/
- public static void setFormat(String logName,String format)
+ public static void setFormat(String logName, String format)
{
getService().setFormat(logName,format);
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the default logger
*/
public static void debug(String message)
@@ -150,70 +150,70 @@
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the default logger
*/
- public static void debug(String message,Throwable t)
+ public static void debug(String message, throwable t)
{
- getService().debug(message,t);
+ getService().debug(message, t);
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the given logger
*/
- public static void debug(String logName,String message,Throwable t)
+ public static void debug(String logName, String message, throwable t)
{
- getService().debug(logName,message,t);
+ getService().debug(logName, message, t);
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the given logger
*/
- public static void debug(String logName,String message)
+ public static void debug(String logName, String message)
{
- getService().debug(logName,message);
+ getService().debug(logName, message);
}
-
+
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the default logger
*/
- public static void debug(String message,RunData data)
+ public static void debug(String message, RunData data)
{
- getService().debug(message,data);
+ getService().debug(message, data);
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the default logger
*/
- public static void debug(String message,RunData data,Throwable t)
+ public static void debug(String message, RunData data, throwable t)
{
- getService().debug(message,data,t);
+ getService().debug(message, data, t);
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the given logger
*/
- public static void debug(String logName,String message,RunData data,Throwable t)
+ public static void debug(String logName, String message, RunData data, throwable t)
{
- getService().debug(logName,message,data,t);
+ getService().debug(logName, message, data, t);
}
/**
- * This is a log metod with logLevel==DEBUG,printing is done by
+ * This is a log metod with logLevel == DEBUG, printing is done by
* the given logger
*/
- public static void debug(String logName,String message,RunData data)
+ public static void debug(String logName, String message, RunData data)
{
- getService().debug(logName,message,data);
+ getService().debug(logName, message, data);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the default logger
*/
public static void info(String message)
@@ -222,70 +222,70 @@
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the default logger
*/
- public static void info(String message,Throwable t)
+ public static void info(String message, throwable t)
{
- getService().info(message,t);
+ getService().info(message, t);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the given logger
*/
- public static void info(String logName,String message)
+ public static void info(String logName, String message)
{
- getService().info(logName,message);
+ getService().info(logName, message);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the given logger
*/
- public static void info(String logName,String message,Throwable t)
+ public static void info(String logName, String message, throwable t)
{
- getService().info(logName,message,t);
+ getService().info(logName, message, t);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the default logger
*/
- public static void info(String message,RunData data)
+ public static void info(String message, RunData data)
{
- getService().info(message,data);
+ getService().info(message, data);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the default logger
*/
- public static void info(String message,RunData data,Throwable t)
+ public static void info(String message, RunData data, throwable t)
{
- getService().info(message,data,t);
+ getService().info(message, data, t);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the given logger
*/
- public static void info(String logName,String message,RunData data)
+ public static void info(String logName, String message, RunData data)
{
- getService().info(logName,message,data);
+ getService().info(logName, message, data);
}
/**
- * This is a log metod with logLevel==INFO,printing is done by
+ * This is a log metod with logLevel == INFO, printing is done by
* the given logger
*/
- public static void info(String logName,String message,RunData data,Throwable t)
+ public static void info(String logName, String message, RunData data, throwable t)
{
- getService().info(logName,message,data,t);
+ getService().info(logName, message, data, t);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the default logger
*/
public static void warn(String message)
@@ -294,70 +294,70 @@
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the default logger
*/
- public static void warn(String message,Throwable t)
+ public static void warn(String message, throwable t)
{
- getService().warn(message,t);
+ getService().warn(message, t);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the given logger
*/
- public static void warn(String logName,String message)
+ public static void warn(String logName, String message)
{
- getService().warn(logName,message);
+ getService().warn(logName, message);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the given logger
*/
- public static void warn(String logName,String message,Throwable t)
+ public static void warn(String logName, String message, throwable t)
{
- getService().warn(logName,message,t);
+ getService().warn(logName, message, t);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the default logger
*/
- public static void warn(String message,RunData data)
+ public static void warn(String message, RunData data)
{
- getService().warn(message,data);
+ getService().warn(message, data);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the default logger
*/
- public static void warn(String message,RunData data,Throwable t)
+ public static void warn(String message, RunData data, throwable t)
{
- getService().warn(message,data,t);
+ getService().warn(message, data, t);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the given logger
*/
- public static void warn(String logName,String message,RunData data)
+ public static void warn(String logName, String message, RunData data)
{
- getService().warn(logName,message,data);
+ getService().warn(logName, message, data);
}
/**
- * This is a log metod with logLevel==WARN,printing is done by
+ * This is a log metod with logLevel == WARN, printing is done by
* the given logger
*/
- public static void warn(String logName,String message,RunData data,Throwable t)
+ public static void warn(String logName, String message, RunData data, throwable t)
{
- getService().warn(logName,message,data,t);
+ getService().warn(logName, message, data, t);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the default logger
*/
public static void error(String message)
@@ -366,65 +366,65 @@
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the default logger
*/
- public static void error(String message,Throwable t)
+ public static void error(String message, throwable t)
{
- getService().error(message,t);
+ getService().error(message, t);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the given logger
*/
public static void error(String logName, String message)
{
- getService().error(logName,message);
+ getService().error(logName, message);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the given logger
*/
- public static void error(String logName, String message,Throwable t)
+ public static void error(String logName, String message, throwable t)
{
- getService().error(logName,message,t);
+ getService().error(logName, message, t);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the default logger
*/
- public static void error(String message,RunData data)
+ public static void error(String message, RunData data)
{
- getService().error(message,data);
+ getService().error(message, data);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the default logger
*/
- public static void error(String message,RunData data,Throwable t)
+ public static void error(String message, RunData data, throwable t)
{
- getService().error(message,data,t);
+ getService().error(message, data, t);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the given logger
*/
- public static void error(String logName, String message,RunData data)
+ public static void error(String logName, String message, RunData data)
{
- getService().error(logName,message,data);
+ getService().error(logName, message, data);
}
/**
- * This is a log metod with logLevel==ERROR,printing is done by
+ * This is a log metod with logLevel == ERROR, printing is done by
* the given logger
*/
- public static void error(String logName, String message,RunData data,Throwable t)
+ public static void error(String logName, String message, RunData data, throwable t)
{
- getService().error(logName,message,data,t);
+ getService().error(logName, message, data, t);
}
}
1.11 +140 -138 jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java
Index: TurbineLoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbineLoggingService.java 2001/04/09 07:56:20 1.10
+++ TurbineLoggingService.java 2001/04/12 02:22:58 1.11
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -81,9 +81,9 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: TurbineLoggingService.java,v 1.10 2001/04/09 07:56:20 dlr Exp $
+ * @version $Id: TurbineLoggingService.java,v 1.11 2001/04/12 02:22:58 mpoeschl Exp $
*/
-public class TurbineLoggingService
+public class TurbineLoggingService
extends TurbineBaseService
implements LoggingService
{
@@ -112,7 +112,7 @@
defaultLogger = null;
}
- /**
+ /**
* Inits the service using servlet parameters to obtain path to the
* configuration file. Change relatives paths.
*/
@@ -120,7 +120,7 @@
{
context = config.getServletContext();
- // Create bootstrap logger, for handling exceptions during service
+ // Create bootstrap logger, for handling exceptions during service
// initialization.
defaultLogger = new ServletLogger();
@@ -150,30 +150,31 @@
if (loggingConfigClassName == null)
{
ResourceService props = getResources();
- loggingConfigClassName = props.getString(LoggingConfig.LOGGINGCONFIG,
+ loggingConfigClassName = props.getString(LoggingConfig.LOGGINGCONFIG,
"org.apache.turbine.services.logging.PropertiesLoggingConfig" );
}
-
+
try
{
- return (LoggingConfig)Class.forName(loggingConfigClassName).newInstance();
+ return (LoggingConfig)Class
+ .forName(loggingConfigClassName).newInstance();
}
catch (java.lang.InstantiationException ie)
{
throw new InitializationException(
- "LoggingService: Failed to instantiate LoggingConfig: " +
+ "LoggingService: Failed to instantiate LoggingConfig: " +
loggingConfigClassName);
}
catch (java.lang.IllegalAccessException iae)
{
throw new InitializationException(
- "LoggingService: Failed to instantiate LoggingConfig: " +
+ "LoggingService: Failed to instantiate LoggingConfig: " +
loggingConfigClassName);
}
catch (java.lang.ClassNotFoundException cnfe)
{
throw new InitializationException(
- "LoggingService: Failed to instantiate LoggingConfig: " +
+ "LoggingService: Failed to instantiate LoggingConfig: " +
loggingConfigClassName);
}
}
@@ -187,13 +188,13 @@
{
// Get the properties for this Service
resources = TurbineResources
- .getResources(TurbineServices.SERVICE_PREFIX +
+ .getResources(TurbineServices.SERVICE_PREFIX +
LoggingService.SERVICE_NAME);
}
return (resources);
}
- /**
+ /**
* This method initializes the service.
*/
private void internalInit() throws InitializationException
@@ -201,21 +202,21 @@
ResourceService props = getResources();
if (props == null)
{
- throw new InitializationException("LoggingService failed to " +
+ throw new InitializationException("LoggingService failed to " +
"get access to the properties for this service.");
}
-
+
// contains the logging configuration
Vector loggingConfig = new Vector(10);
-
+
//looking for default logger name
String defaultLoggerName = props.getString(LoggingConfig.DEFAULT);
//checking whether default logger is properly configured
if (defaultLoggerName == null)
{
- throw new InitializationException("LoggingService can't find default " +
- "logger name in the configuration file.");
+ throw new InitializationException("LoggingService can't find " +
+ "default logger name in the configuration file.");
}
// Get the list of facilities to configure
@@ -229,7 +230,7 @@
lc.setInitResource(props);
lc.setServletContext(context);
lc.init();
-
+
loggingConfig.add((Object)lc);
}
@@ -246,7 +247,7 @@
//checking whether default logger is properly configured
if (defaultLogger == null)
{
- throw new InitializationException("LoggingService can't find " +
+ throw new InitializationException("LoggingService can't find " +
"default logger in working loggers.");
}
}
@@ -265,20 +266,20 @@
if (className == null || className.trim().equals(""))
{
- throw new InitializationException("LoggingService can't find logger " +
- "provider class name");
+ throw new InitializationException("LoggingService can't find " +
+ "logger provider class name");
}
if (loggerName == null || loggerName.trim().equals(""))
{
- throw new InitializationException("LoggingService can't find logger " +
- "provider name");
+ throw new InitializationException("LoggingService can't find " +
+ "logger provider name");
}
if (loggersTable.containsKey(loggerName))
{
- throw new InitializationException("LoggingService has found another " +
- "logger of the name: " + loggerName);
+ throw new InitializationException("LoggingService has found " +
+ "another logger of the name: " + loggerName);
}
Logger logger=null;
@@ -289,20 +290,21 @@
}
catch (Exception e)
{
- throw new InitializationException("LoggingService can't load logger " +
- "provider: class doesn't implement Logger interface: "+e.getMessage());
+ throw new InitializationException("LoggingService can't load " +
+ "logger provider: class doesn't implement Logger interface: " +
+ e.getMessage());
}
-
+
//inits logger
logger.init(loggingConfig);
// store it for later
- loggersTable.put(loggerName,logger);
+ loggersTable.put(loggerName, logger);
}
/**
- * Shutdowns all loggers. After shutdown there is always aviable
- * servlet logger that prints using servlet log method
+ * Shutdowns all loggers. After shutdown servlet logger is still available
+ * using the servlet log method
*/
public void shutdown()
{
@@ -321,11 +323,11 @@
//some services may log using our services after shutdown
loggersTable.clear();
defaultLogger = simpleLogger;
-
- //we don't set init as false, becouse we can still log.
+
+ //we don't set init as false, because we can still log.
}
- /**
+ /**
* This method returns default logger for Turbine System
*/
public final Logger getLogger()
@@ -377,7 +379,7 @@
/**
* This method sets format style of the given logger.
*/
- public void setFormat(String logName,String format)
+ public void setFormat(String logName, String format)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
@@ -387,7 +389,7 @@
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
public void debug(String message)
@@ -396,36 +398,36 @@
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
- public void debug(String message,Throwable t)
+ public void debug(String message, Throwable t)
{
- defaultLogger.debug(message,t);
+ defaultLogger.debug(message, t);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message,Throwable t)
+ public void debug(String logName, String message, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.debug(message,t);
+ logger.debug(message, t);
}
else
{
- defaultLogger.debug("FROM logger:"+logName+": "+message);
+ defaultLogger.debug("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message)
+ public void debug(String logName, String message)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
@@ -434,64 +436,64 @@
}
else
{
- defaultLogger.debug("FROM logger:"+logName+": "+message);
+ defaultLogger.debug("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
- public void debug(String message,RunData data)
+ public void debug(String message, RunData data)
{
- defaultLogger.debug(message,data);
+ defaultLogger.debug(message, data);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the default logger
*/
- public void debug(String message,RunData data,Throwable t)
+ public void debug(String message, RunData data, Throwable t)
{
- defaultLogger.debug(message,data,t);
+ defaultLogger.debug(message, data, t);
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message,RunData data,Throwable t)
+ public void debug(String logName, String message, RunData data, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.debug(message,data,t);
+ logger.debug(message, data, t);
}
else
{
- defaultLogger.debug("FROM logger:"+logName+": "+message);
+ defaultLogger.debug("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==DEBUG,printing is done by
+ * This is a log method with logLevel == DEBUG, printing is done by
* the given logger
*/
- public void debug(String logName,String message,RunData data)
+ public void debug(String logName, String message, RunData data)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.debug(message,data);
+ logger.debug(message, data);
}
else
{
- defaultLogger.debug("FROM logger:"+logName+": "+message);
+ defaultLogger.debug("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
public void info(String message)
@@ -500,19 +502,19 @@
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
- public void info(String message,Throwable t)
+ public void info(String message, Throwable t)
{
- defaultLogger.info(message,t);
+ defaultLogger.info(message, t);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message)
+ public void info(String logName, String message)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
@@ -521,81 +523,81 @@
}
else
{
- defaultLogger.info("FROM logger:"+logName+": "+message);
+ defaultLogger.info("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message,Throwable t)
+ public void info(String logName, String message, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.info(message,t);
+ logger.info(message, t);
}
else
{
- defaultLogger.info("FROM logger:"+logName+": "+message);
+ defaultLogger.info("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the default logger
*/
- public void info(String message,RunData data)
+ public void info(String message, RunData data)
{
- defaultLogger.info(message,data);
+ defaultLogger.info(message, data);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO,printing is done by
* the default logger
*/
- public void info(String message,RunData data,Throwable t)
+ public void info(String message, RunData data, Throwable t)
{
- defaultLogger.info(message,data,t);
+ defaultLogger.info(message, data, t);
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message,RunData data)
+ public void info(String logName, String message, RunData data)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.info(message,data);
+ logger.info(message, data);
}
else
{
- defaultLogger.info("FROM logger:"+logName+": "+message);
+ defaultLogger.info("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==INFO,printing is done by
+ * This is a log method with logLevel == INFO, printing is done by
* the given logger
*/
- public void info(String logName,String message,RunData data,Throwable t)
+ public void info(String logName, String message, RunData data, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.info(message,data,t);
+ logger.info(message, data, t);
}
else
{
- defaultLogger.info("FROM logger:"+logName+": "+message);
+ defaultLogger.info("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
public void warn(String message)
@@ -604,19 +606,19 @@
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
- public void warn(String message,Throwable t)
+ public void warn(String message, Throwable t)
{
- defaultLogger.warn(message,t);
+ defaultLogger.warn(message, t);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message)
+ public void warn(String logName, String message)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
@@ -625,81 +627,81 @@
}
else
{
- defaultLogger.warn("FROM logger:"+logName+": "+message);
+ defaultLogger.warn("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message,Throwable t)
+ public void warn(String logName, String message, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.warn(message,t);
+ logger.warn(message, t);
}
else
{
- defaultLogger.warn("FROM logger:"+logName+": "+message);
+ defaultLogger.warn("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN,printing is done by
* the default logger
*/
- public void warn(String message,RunData data)
+ public void warn(String message, RunData data)
{
- defaultLogger.warn(message,data);
+ defaultLogger.warn(message, data);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the default logger
*/
- public void warn(String message,RunData data,Throwable t)
+ public void warn(String message, RunData data, Throwable t)
{
- defaultLogger.warn(message,data,t);
+ defaultLogger.warn(message, data, t);
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message,RunData data)
+ public void warn(String logName, String message, RunData data)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.warn(message,data);
+ logger.warn(message, data);
}
else
{
- defaultLogger.warn("FROM logger:"+logName+": "+message);
+ defaultLogger.warn("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==WARN,printing is done by
+ * This is a log method with logLevel == WARN, printing is done by
* the given logger
*/
- public void warn(String logName,String message,RunData data,Throwable t)
+ public void warn(String logName, String message, RunData data, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.warn(message,data,t);
+ logger.warn(message, data, t);
}
else
{
- defaultLogger.warn("FROM logger:"+logName+": "+message);
+ defaultLogger.warn("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
public void error(String message)
@@ -708,16 +710,16 @@
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
- public void error(String message,Throwable t)
+ public void error(String message, Throwable t)
{
- defaultLogger.error(message,t);
+ defaultLogger.error(message, t);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
public void error(String logName, String message)
@@ -729,76 +731,76 @@
}
else
{
- defaultLogger.error("FROM logger:"+logName+": "+message);
+ defaultLogger.error("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
- public void error(String logName, String message,Throwable t)
+ public void error(String logName, String message, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.error(message,t);
+ logger.error(message, t);
}
else
{
- defaultLogger.error("FROM logger:"+logName+": "+message);
+ defaultLogger.error("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
- public void error(String message,RunData data)
+ public void error(String message, RunData data)
{
- defaultLogger.error(message,data);
+ defaultLogger.error(message, data);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the default logger
*/
- public void error(String message,RunData data,Throwable t)
+ public void error(String message, RunData data, Throwable t)
{
- defaultLogger.error(message,data,t);
+ defaultLogger.error(message, data, t);
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
- public void error(String logName, String message,RunData data)
+ public void error(String logName, String message, RunData data)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.error(message,data);
+ logger.error(message, data);
}
else
{
- defaultLogger.error("FROM logger:"+logName+": "+message);
+ defaultLogger.error("FROM logger:" + logName + ": " + message);
}
}
/**
- * This is a log method with logLevel==ERROR,printing is done by
+ * This is a log method with logLevel == ERROR, printing is done by
* the given logger
*/
- public void error(String logName, String message,RunData data,Throwable t)
+ public void error(String logName, String message, RunData data, Throwable t)
{
Logger logger = (Logger)loggersTable.get(logName);
if (logger != null)
{
- logger.error(message,data,t);
+ logger.error(message, data, t);
}
else
{
- defaultLogger.error("FROM logger:"+logName+": "+message);
+ defaultLogger.error("FROM logger:" + logName + ": " + message);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org