bloritsch 01/02/21 07:16:29
Modified: src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
Add changes to support Log Directory, and make it configurable.
Revision Changes Path
No revision
No revision
1.1.4.62 +17 -7
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.61
retrieving revision 1.1.4.62
diff -u -r1.1.4.61 -r1.1.4.62
--- CocoonServlet.java 2001/02/21 07:36:19 1.1.4.61
+++ CocoonServlet.java 2001/02/21 15:16:27 1.1.4.62
@@ -60,7 +60,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.61 $ $Date: 2001/02/21 07:36:19 $
+ * @version CVS $Revision: 1.1.4.62 $ $Date: 2001/02/21 15:16:27 $
*/
public class CocoonServlet extends HttpServlet {
@@ -71,8 +71,8 @@
static final long minute = 60 * second;
static final long hour = 60 * minute;
- protected long creationTime = 0;
- protected Cocoon cocoon;
+ private long creationTime = 0;
+ private Cocoon cocoon;
protected Exception exception;
protected DefaultContext appContext = new DefaultContext();
@@ -100,7 +100,7 @@
this.appContext.put(Constants.CONTEXT_SERVLET_CONTEXT, context);
- this.initLogger(conf.getInitParameter("log-level"), context);
+ this.initLogger(context);
this.appContext.put(Constants.CONTEXT_CLASSPATH,
this.getClassPath(context));
@@ -171,9 +171,20 @@
*
* @throws ServletException
*/
- private void initLogger(final String logLevel, final ServletContext
context)
+ private void initLogger(final ServletContext context)
throws ServletException {
final Priority.Enum logPriority;
+ String logDir = getInitParameter("log-dir");
+ String logLevel = getInitParameter("log-level");
+ if (logLevel != null) {
+ logLevel.trim();
+ }
+
+ if (logDir == null) {
+ logDir = context.getRealPath("/") + "/WEB-INF/logs/";
+ }
+
+ this.appContext.put(Constants.CONTEXT_LOG_DIR, logDir);
if (logLevel != null) {
logPriority = LogKit.getPriorityForName(logLevel);
@@ -182,8 +193,7 @@
}
try {
- final String path = context.getRealPath("/") +
- "/WEB-INF/logs/cocoon.log";
+ final String path = logDir + "cocoon.log";
final Category cocoonCategory = LogKit.createCategory("cocoon",
logPriority);
this.log = LogKit.createLogger(cocoonCategory, new LogTarget[] {
@@ -383,7 +393,7 @@
/**
* Create the environment for the request
*/
- protected Environment getEnvironment(String uri,
+ private Environment getEnvironment(String uri,
HttpServletRequest req,
HttpServletResponse res)
throws Exception {
