You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/03/02 04:04:02 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/logging BaseLogger.java BaseRunDataFilter.java FileLogger.java Log4JavaLogger.java Logger.java LoggingConfig.java LoggingService.java PropertiesLoggingConfig.java ServletLogger.java ServletLoggingService.java TurbineLoggingService.java
jon 01/03/01 19:04:02
Modified: src/java/org/apache/turbine/services/logging BaseLogger.java
BaseRunDataFilter.java FileLogger.java
Log4JavaLogger.java Logger.java LoggingConfig.java
LoggingService.java PropertiesLoggingConfig.java
ServletLogger.java ServletLoggingService.java
TurbineLoggingService.java
Log:
removed unnecessary dependencies on the servlet spec
there are still two files which have dependencies:
FileLogger and Log4JavaLogger
while these files have the dependencies, the core Logging API does
not. therefore, it is possible to provide alternative implementations
of these two files that don't have the dependencies however, it isn't
in Turbine's interest to do so right now. if someone has the itch,
please scratch it. it shouldn't be hard. else maybe clean up
those dependencies (the solution isn't obvious to me right now)
-jon
Revision Changes Path
1.7 +1 -3 jakarta-turbine/src/java/org/apache/turbine/services/logging/BaseLogger.java
Index: BaseLogger.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/BaseLogger.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseLogger.java 2001/02/13 23:55:15 1.6
+++ BaseLogger.java 2001/03/02 03:03:51 1.7
@@ -56,8 +56,6 @@
*
*/
-import javax.servlet.*;
-
import org.apache.turbine.services.resources.TurbineResources;
/**
@@ -68,7 +66,7 @@
* @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: BaseLogger.java,v 1.6 2001/02/13 23:55:15 sean Exp $
+ * @version $Id: BaseLogger.java,v 1.7 2001/03/02 03:03:51 jon Exp $
*/
public abstract class BaseLogger
implements Logger
1.4 +1 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseRunDataFilter.java 2001/01/30 04:17:45 1.3
+++ BaseRunDataFilter.java 2001/03/02 03:03:52 1.4
@@ -56,7 +56,6 @@
*
*/
-import javax.servlet.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.*;
@@ -102,7 +101,7 @@
* @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.3 2001/01/30 04:17:45 jonbolt Exp $
+ * @version $Id: BaseRunDataFilter.java,v 1.4 2001/03/02 03:03:52 jon Exp $
*/
public class BaseRunDataFilter implements RunDataFilter
{
1.7 +16 -15 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileLogger.java 2001/02/26 21:31:34 1.6
+++ FileLogger.java 2001/03/02 03:03:52 1.7
@@ -63,7 +63,7 @@
import java.util.*;
import java.io.*;
-import javax.servlet.*;
+import javax.servlet.ServletContext;
import org.apache.turbine.util.RunData;
@@ -74,7 +74,7 @@
* @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.6 2001/02/26 21:31:34 sean Exp $
+ * @version $Id: FileLogger.java,v 1.7 2001/03/02 03:03:52 jon Exp $
*/
public class FileLogger extends BaseLogger
{
@@ -90,13 +90,13 @@
/** class initialization */
static
{
- globalFilesTable=new Hashtable();
+ globalFilesTable = new Hashtable();
}
public FileLogger()
{
super();
- localFilesTable=new Hashtable();
+ localFilesTable = new Hashtable();
}
/** Initialize and create the writers */
@@ -116,20 +116,21 @@
{
String path = (String) fileList.nextElement();
//resolves relative paths
- String pathTmp=loggingConfig.getServletContext().getRealPath(path);
- if (pathTmp!=null)
+ String pathTmp = ((ServletContext)loggingConfig.getServletContext())
+ .getRealPath(path);
+ if (pathTmp != null)
{
- path=pathTmp;
+ path = pathTmp;
}
// 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)
+ FileWriter writer = (FileWriter)globalFilesTable.get(path);
+ if (writer == null)
{
try
{
- writer=new FileWriter(path,true);
+ writer = new FileWriter(path,true);
globalFilesTable.put(path,writer);
}
catch(Exception e)
@@ -321,11 +322,11 @@
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);
1.5 +6 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Log4JavaLogger.java 2001/02/13 23:55:17 1.4
+++ Log4JavaLogger.java 2001/03/02 03:03:53 1.5
@@ -57,11 +57,13 @@
*/
import java.util.*;
-import javax.servlet.*;
+
import org.apache.log4j.*;
import org.apache.log4j.net.*;
import org.apache.log4j.spi.*;
+import javax.servlet.ServletContext;
+
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
@@ -80,7 +82,7 @@
* @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:sean@informage.net">Sean Legassick</a>
- * @version $Id: Log4JavaLogger.java,v 1.4 2001/02/13 23:55:17 sean Exp $
+ * @version $Id: Log4JavaLogger.java,v 1.5 2001/03/02 03:03:53 jon Exp $
*/
public class Log4JavaLogger extends BaseLogger
{
@@ -138,7 +140,8 @@
{
String path = (String) filesEnum.nextElement();
//resolves relative paths
- String pathTmp=loggingConfig.getServletContext().getRealPath(path);
+ String pathTmp = ((ServletContext)loggingConfig.getServletContext())
+ .getRealPath(path);
if (pathTmp!=null)
{
path=pathTmp;
1.6 +1 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Logger.java 2001/02/13 23:55:17 1.5
+++ Logger.java 2001/03/02 03:03:53 1.6
@@ -57,7 +57,6 @@
*/
import org.apache.turbine.util.RunData;
-import javax.servlet.*;
/**
* Classes that implement the Logger interface allows loging.
@@ -69,7 +68,7 @@
*
* @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.5 2001/02/13 23:55:17 sean Exp $
+ * @version $Id: Logger.java,v 1.6 2001/03/02 03:03:53 jon Exp $
*/
public interface Logger
{
1.3 +3 -5 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoggingConfig.java 2001/02/13 23:55:17 1.2
+++ LoggingConfig.java 2001/03/02 03:03:53 1.3
@@ -59,8 +59,6 @@
import java.io.File;
import java.util.*;
-import javax.servlet.*;
-
import org.apache.turbine.services.*;
/**
@@ -69,7 +67,7 @@
* system.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: LoggingConfig.java,v 1.2 2001/02/13 23:55:17 sean Exp $
+ * @version $Id: LoggingConfig.java,v 1.3 2001/03/02 03:03:53 jon Exp $
*/
public interface LoggingConfig
{
@@ -90,9 +88,9 @@
public abstract void init() throws InitializationException;
- public abstract ServletContext getServletContext();
+ public abstract Object getServletContext();
- public abstract void setServletContext(ServletContext value);
+ public abstract void setServletContext(Object value);
public abstract String getFormat();
1.5 +1 -3 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggingService.java 2001/01/31 00:37:38 1.4
+++ LoggingService.java 2001/03/02 03:03:54 1.5
@@ -60,8 +60,6 @@
// Java Core Classes
import java.util.*;
import java.io.*;
-import javax.servlet.*;
-import java.util.Hashtable;
// Turbine Services Classes
import org.apache.turbine.services.*;
@@ -77,7 +75,7 @@
* @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.4 2001/01/31 00:37:38 dlr Exp $
+ * @version $Id: LoggingService.java,v 1.5 2001/03/02 03:03:54 jon Exp $
*/
public interface LoggingService extends Service
{
1.3 +4 -6 jakarta-turbine/src/java/org/apache/turbine/services/logging/PropertiesLoggingConfig.java
Index: PropertiesLoggingConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/PropertiesLoggingConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertiesLoggingConfig.java 2001/02/13 23:55:17 1.2
+++ PropertiesLoggingConfig.java 2001/03/02 03:03:54 1.3
@@ -59,8 +59,6 @@
import java.io.File;
import java.util.*;
-import javax.servlet.*;
-
import org.apache.turbine.services.*;
import org.apache.turbine.services.resources.*;
@@ -70,12 +68,12 @@
* file.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: PropertiesLoggingConfig.java,v 1.2 2001/02/13 23:55:17 sean Exp $
+ * @version $Id: PropertiesLoggingConfig.java,v 1.3 2001/03/02 03:03:54 jon Exp $
*/
public class PropertiesLoggingConfig implements LoggingConfig
{
private String name = null;
- private ServletContext context = null;
+ private Object context = null;
private Vector files = null;
@@ -199,12 +197,12 @@
}
}
- public ServletContext getServletContext()
+ public Object getServletContext()
{
return context;
}
- public void setServletContext(ServletContext value)
+ public void setServletContext(Object value)
{
this.context = value;
}
1.6 +3 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletLogger.java 2001/02/13 23:55:18 1.5
+++ ServletLogger.java 2001/03/02 03:03:54 1.6
@@ -61,7 +61,7 @@
import java.io.*;
import java.util.Date;
-import javax.servlet.*;
+import javax.servlet.ServletContext;
import org.apache.turbine.util.RunData;
@@ -73,7 +73,7 @@
* @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.5 2001/02/13 23:55:18 sean Exp $
+ * @version $Id: ServletLogger.java,v 1.6 2001/03/02 03:03:54 jon Exp $
*/
public class ServletLogger extends BaseLogger
{
@@ -90,7 +90,7 @@
/** Initialize*/
public void init(LoggingConfig loggingConfig)
{
- this.context=loggingConfig.getServletContext();
+ this.context = (ServletContext) loggingConfig.getServletContext();
}
/** Empty method*/
1.6 +4 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServletLoggingService.java 2001/02/08 20:42:31 1.5
+++ ServletLoggingService.java 2001/03/02 03:03:55 1.6
@@ -60,7 +60,8 @@
// Java Core Classes
import java.util.*;
import java.io.*;
-import javax.servlet.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
import java.util.Hashtable;
// Turbine Services Classes
@@ -77,7 +78,7 @@
* @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.5 2001/02/08 20:42:31 dlr Exp $
+ * @version $Id: ServletLoggingService.java,v 1.6 2001/03/02 03:03:55 jon Exp $
*/
public class ServletLoggingService
extends TurbineLoggingService
@@ -101,7 +102,7 @@
lc.setInitResource(null);
lc.setServletContext(config.getServletContext());
lc.init();
-
+
defaultLogger.init(lc);
setInit(true);
System.out.println("Starting Servlet Logging Service");
1.8 +3 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineLoggingService.java 2001/02/08 20:43:12 1.7
+++ TurbineLoggingService.java 2001/03/02 03:03:55 1.8
@@ -60,7 +60,8 @@
// Java Core Classes
import java.util.*;
import java.io.*;
-import javax.servlet.*;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
// Turbine Services Classes
import org.apache.turbine.services.*;
@@ -82,7 +83,7 @@
* @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.7 2001/02/08 20:43:12 dlr Exp $
+ * @version $Id: TurbineLoggingService.java,v 1.8 2001/03/02 03:03:55 jon Exp $
*/
public class TurbineLoggingService
extends TurbineBaseService