You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/02/23 15:26:43 UTC
svn commit: r380124 - in /cocoon/trunk: ./
cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/
cocoon-core/src/main/java/org/apache/cocoon/bean/
cocoon-core/src/main/java/org/apache/cocoon/core/ cocoon-core/sr...
Author: cziegeler
Date: Thu Feb 23 06:26:07 2006
New Revision: 380124
URL: http://svn.apache.org/viewcvs?rev=380124&view=rev
Log:
Make logging configurable again
Removed:
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/resources/WEB-INF/xconf/portal.logkit
cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/logkit.xconf
Modified:
cocoon/trunk/cli.xconf
cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BaseSettings.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BootstrapEnvironment.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/MutableSettings.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ApplicationContextFactory.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/logging/SettingsContext.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/SettingsHelper.java
cocoon/trunk/cocoon-core/src/test/java/org/apache/cocoon/bean/CocoonBeanTestCase.java
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java
cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/log4j.xconf
cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/properties/core.properties
cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/error2html.xslt
cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/exception2html.xslt
Modified: cocoon/trunk/cli.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cli.xconf?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cli.xconf (original)
+++ cocoon/trunk/cli.xconf Thu Feb 23 06:26:07 2006
@@ -49,7 +49,7 @@
| the CLI. See documentation at:
| /userdocs/offline/index.html and Wiki:CommandLine
|
- | CVS: $Id: cli.xconf,v 1.12 2004/03/08 06:07:14 antonio Exp $
+ | CVS: $Id$
+-->
<cocoon verbose="true"
@@ -135,7 +135,7 @@
| INFO and WARN ones.
| FATAL_ERROR: prints only log messages of this level
+-->
- <logging log-kit="build/webapp/WEB-INF/logkit.xconf" logger="cli" level="DEBUG" />
+ <logging log-kit="build/webapp/WEB-INF/log4j.xconf" logger="cli" level="DEBUG" />
<!--+
| Specifies the filename to be appended to URIs that
Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/BlocksManager.java Thu Feb 23 06:26:07 2006
@@ -48,6 +48,7 @@
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper;
+import org.apache.cocoon.core.MutableSettings;
import org.apache.cocoon.core.container.spring.ApplicationContextFactory;
import org.apache.cocoon.core.servlet.CoreUtil;
import org.apache.excalibur.source.Source;
@@ -85,7 +86,8 @@
throw new ServletException("Could not parse " + contextURL0, e);
}
- this.logger = ApplicationContextFactory.createRootLogger(this.getServletConfig().getServletContext(), "cocoon");
+ // FIXME - how do we get the settings object?
+ this.logger = ApplicationContextFactory.createRootLogger(this.getServletConfig().getServletContext(), new MutableSettings());
this.getLogger().debug("Initializing the Blocks Manager");
InputSource is = null;
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java Thu Feb 23 06:26:07 2006
@@ -96,8 +96,8 @@
*/
public void initialize() throws Exception {
// Install a temporary logger so that getDir() can log if needed
- final BootstrapEnvironment.LogLevel level = BootstrapEnvironment.LogLevel.getLogLevelForName(this.logLevel);
- final Logger envLogger = new ConsoleLogger(level.getLevel());
+ // FIXME - make the level configurable
+ final Logger envLogger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
this.log = envLogger;
this.context = getDir(this.contextDir, "context");
@@ -583,13 +583,6 @@
protected String configFile;
protected List loadClassList;
- /**
- * @see org.apache.cocoon.core.BootstrapEnvironment#getBootstrapLogger(org.apache.cocoon.core.BootstrapEnvironment.LogLevel)
- */
- public Logger getBootstrapLogger(LogLevel logLevel) {
- return new ConsoleLogger(logLevel.getLevel());
- }
-
public void setEnvironmentLogger(Logger log) {
this.environmentLogger = log;
}
@@ -650,13 +643,6 @@
settings.addToLoadClasses(i.next().toString());
}
}
- }
-
- /**
- * @see org.apache.cocoon.core.BootstrapEnvironment#configureLoggingContext(org.apache.avalon.framework.context.DefaultContext)
- */
- public void configureLoggingContext(DefaultContext context) {
- // nothing to add
}
/**
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BaseSettings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BaseSettings.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BaseSettings.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BaseSettings.java Thu Feb 23 06:26:07 2006
@@ -16,7 +16,6 @@
package org.apache.cocoon.core;
import java.util.List;
-import java.util.Map;
/**
* The settings (configuration) for the Cocoon core are described through the {@link BaseSettings}
@@ -42,11 +41,6 @@
/** The default running mode. */
String DEFAULT_RUNNING_MODE = "dev";
- /**
- * This parameter allows to set system properties
- */
- String KEY_FORCE_PROPERTIES = "system.properties";
-
/** This parameter specifies the class for the root processor */
String KEY_PROCESSOR_CLASS = "processor";
@@ -67,19 +61,12 @@
/**
* This parameter indicates the log level to use throughout startup of the
- * system. As soon as the logkit.xconf the setting of the logkit.xconf
- * configuration is used instead! Only for startup and if the logkit.xconf is
- * not readable/available this log level is of importance.
+ * system. As soon as the logging system is setup the setting of the log4j.xconf
+ * configuration is used instead! Only for startup this log level is of importance.
*/
String KEY_LOGGING_BOOTSTRAP_LOGLEVEL = "logging.bootstrap.loglevel";
/**
- * This parameter switches the logging system from LogKit to Log4J for Cocoon.
- * Log4J has to be configured already.
- */
- String KEY_LOGGING_MANAGER_CLASS = "logging.manager.class";
-
- /**
* This parameter is used to list classes that should be loaded at
* initialization time of the servlet. For example, JDBC Drivers used need to
* be named here. Additional entries may be inserted here during build
@@ -177,22 +164,10 @@
List getExtraClasspaths();
/**
- * @return Returns the forceProperties.
- * @see #KEY_FORCE_PROPERTIES
- */
- Map getForceProperties();
-
- /**
* @return Returns the loadClasses.
* @see #KEY_LOAD_CLASSES
*/
List getLoadClasses();
-
- /**
- * @return Returns the loggerManagerClassName.
- * @see #KEY_LOGGING_MANAGER_CLASS
- */
- String getLoggerManagerClassName();
/**
* @return Returns the loggingConfiguration.
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BootstrapEnvironment.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BootstrapEnvironment.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BootstrapEnvironment.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/BootstrapEnvironment.java Thu Feb 23 06:26:07 2006
@@ -36,60 +36,6 @@
public interface BootstrapEnvironment {
/**
- * Convenience class to define some constants for log levels.
- * @see BootstrapEnvironment#getBootstrapLogger(LogLevel)
- */
- public static final class LogLevel {
-
- public static final LogLevel DEBUG = new LogLevel( "DEBUG", 0 );
- public static final LogLevel INFO = new LogLevel( "INFO", 1 );
- public static final LogLevel WARN = new LogLevel( "WARN", 2 );
- public static final LogLevel ERROR = new LogLevel( "ERROR", 3 );
- public static final LogLevel FATAL_ERROR = new LogLevel( "FATAL_ERROR", 4 );
- public static final LogLevel DISABLED = new LogLevel( "NONE", 5 );
-
- public static LogLevel getLogLevelForName(final String name) {
- if( DEBUG.getName().equals( name ) ) {
- return DEBUG;
- } else if( INFO.getName().equals( name ) ) {
- return INFO;
- } else if( WARN.getName().equals( name ) ) {
- return WARN;
- } else if( ERROR.getName().equals( name ) ) {
- return ERROR;
- } else if( FATAL_ERROR.getName().equals( name ) ) {
- return FATAL_ERROR;
- } else if( DISABLED.getName().equals( name ) ) {
- return DISABLED;
- } else {
- return DEBUG;
- }
- }
-
- private final String name;
- private final int level;
-
- public LogLevel(String name, int level) {
- this.name = name;
- this.level = level;
- }
-
- public int getLevel() {
- return this.level;
- }
-
- public String getName() {
- return this.name;
- }
- }
-
- /**
- * Get the bootstrap logger.
- * @param logLevel The log level to use according to the {@link Logger} interface.
- */
- Logger getBootstrapLogger(LogLevel logLevel);
-
- /**
* Pass the root logger back to the environment. As soon as the
* logging system is set up, this method is called.
* @param rootLogger The root logger.
@@ -103,13 +49,6 @@
* @param settings The settings for Cocoon.
*/
void configure(MutableSettings settings);
-
- /**
- * This callback can be used by the environment to add environment specific
- * information for the logging system.
- * @param context The context passed to the logging system.
- */
- void configureLoggingContext(DefaultContext context);
/**
* This callback can be used by the environment to add environment specific
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java Thu Feb 23 06:26:07 2006
@@ -217,7 +217,8 @@
this.settings.setWorkDirectory(workDir.getAbsolutePath());
// Init logger
- this.log = ApplicationContextFactory.createRootLogger(servletContext, this.settings.getCocoonLogger());
+ this.log = ApplicationContextFactory.createRootLogger(servletContext,
+ this.settings);
this.env.setLogger(this.log);
// Output some debug info
@@ -306,7 +307,7 @@
// Set the system properties needed by Xalan2.
// FIXME Do we still need this?
- this.setSystemProperties();
+ //this.setSystemProperties();
// dump system properties
this.dumpSystemProperties();
@@ -609,7 +610,6 @@
this.updateEnvironment();
this.forceLoad();
- this.forceProperty();
try {
if (this.log.isInfoEnabled()) {
@@ -735,33 +735,6 @@
this.log.warn("Could not load class: " + fqcn, e);
}
// Do not throw an exception, because it is not a fatal error.
- }
- }
- }
-
- /**
- * Handle the "force-property" parameter.
- *
- * If you need to force more than one property to load, then
- * separate each entry with whitespace, a comma, or a semi-colon.
- * Cocoon will strip any whitespace from the entry.
- */
- protected void forceProperty() {
- if (this.settings.getForceProperties().size() > 0) {
- final Iterator i = this.settings.getForceProperties().entrySet().iterator();
- while (i.hasNext()) {
- final Map.Entry current = (Map.Entry)i.next();
- try {
- if (this.log.isDebugEnabled()) {
- this.log.debug("Setting: " + current.getKey() + "=" + current.getValue());
- }
- System.setProperty(current.getKey().toString(), current.getValue().toString());
- } catch (Exception e) {
- if (this.log.isWarnEnabled()) {
- this.log.warn("Could not set property: " + current.getKey(), e);
- }
- // Do not throw an exception, because it is not a fatal error.
- }
}
}
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/MutableSettings.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/MutableSettings.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/MutableSettings.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/MutableSettings.java Thu Feb 23 06:26:07 2006
@@ -16,7 +16,6 @@
package org.apache.cocoon.core;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -45,11 +44,6 @@
protected List properties = new ArrayList();
/**
- * This parameter allows to set system properties
- */
- protected Map forceProperties = new HashMap();
-
- /**
* This parameter indicates what class to use for the root processor.
*/
protected String processorClassName = DEFAULT_PROCESSOR_CLASS;
@@ -82,19 +76,11 @@
protected String cocoonLogger;
/**
- * This parameter indicates the log level to use throughout startup of the
- * system. As soon as the logkit.xconf the setting of the logkit.xconf
- * configuration is used instead! Only for startup and if the logkit.xconf is
- * not readable/available this log level is of importance.
+ * @see #setBootstrapLogLevel(String)
*/
protected String bootstrapLogLevel;
/**
- * This parameter switches the logging system from LogKit to Log4J for Cocoon.
- */
- protected String loggerManagerClassName;
-
- /**
* Allow reinstantiating (reloading) of the cocoon instance. If this is
* set to "yes" or "true", a new cocoon instance can be created using
* the request parameter "cocoon-reload". It also enables that Cocoon is
@@ -252,8 +238,6 @@
this.cocoonLogger = value;
} else if ( key.equals(KEY_LOGGING_BOOTSTRAP_LOGLEVEL) ) {
this.bootstrapLogLevel = value;
- } else if ( key.equals(KEY_LOGGING_MANAGER_CLASS) ) {
- this.loggerManagerClassName = value;
} else if ( key.equals(KEY_RELOADING) ) {
this.reloadingEnabled = BooleanUtils.toBoolean(value);
} else if ( key.equals(KEY_UPLOADS_ENABLE) ) {
@@ -290,9 +274,6 @@
this.addToExtraClasspaths(value);
} else if ( key.startsWith(KEY_PROPERTY_PROVIDER) ) {
this.addToPropertyProviders(value);
- } else if ( key.startsWith(KEY_FORCE_PROPERTIES) ) {
- key = key.substring(KEY_FORCE_PROPERTIES.length() + 1);
- this.addToForceProperties(key, value);
}
}
}
@@ -371,13 +352,6 @@
}
/**
- * @return Returns the forceProperties.
- */
- public Map getForceProperties() {
- return this.forceProperties;
- }
-
- /**
* @return Returns the formEncoding.
*/
public String getFormEncoding() {
@@ -392,13 +366,6 @@
}
/**
- * @return Returns the loggerClassName.
- */
- public String getLoggerManagerClassName() {
- return this.loggerManagerClassName;
- }
-
- /**
* @return Returns the loggingConfiguration.
*/
public String getLoggingConfiguration() {
@@ -543,8 +510,6 @@
value = this.cocoonLogger;
} else if ( sKey.equals(KEY_LOGGING_BOOTSTRAP_LOGLEVEL) ) {
value = this.bootstrapLogLevel;
- } else if ( sKey.equals(KEY_LOGGING_MANAGER_CLASS) ) {
- value = this.loggerManagerClassName;
} else if ( sKey.equals(KEY_RELOADING) ) {
value = String.valueOf(this.reloadingEnabled);
} else if ( sKey.equals(KEY_UPLOADS_ENABLE) ) {
@@ -577,8 +542,6 @@
value = this.toString(this.loadClasses);
} else if ( key.equals(KEY_EXTRA_CLASSPATHS) ) {
this.toString(this.extraClasspaths);
- } else if ( key.equals(KEY_FORCE_PROPERTIES) ) {
- this.toString(this.forceProperties);
} else if ( key.equals(KEY_PROPERTY_PROVIDER) ) {
this.toString(this.propertyProviders);
}
@@ -608,12 +571,10 @@
KEY_RELOADING + " : " + this.reloadingEnabled + '\n' +
KEY_EXTRA_CLASSPATHS + " : " + this.toString(this.extraClasspaths) + '\n' +
KEY_LOAD_CLASSES + " : " + this.toString(this.loadClasses) + '\n' +
- KEY_FORCE_PROPERTIES + " : " + this.toString(this.forceProperties) + '\n' +
KEY_LOGGING_CONFIGURATION + " : " + this.loggingConfiguration + '\n' +
KEY_LOGGING_ENVIRONMENT_LOGGER + " : " + this.environmentLogger + '\n' +
KEY_LOGGING_BOOTSTRAP_LOGLEVEL + " : " + this.bootstrapLogLevel + '\n' +
KEY_LOGGING_COCOON_LOGGER + " : " + this.cocoonLogger + '\n' +
- KEY_LOGGING_MANAGER_CLASS + " : " + this.loggerManagerClassName + '\n' +
KEY_LOGGING_OVERRIDE_LOGLEVEL + " : " + this.overrideLogLevel + '\n' +
KEY_MANAGE_EXCEPTIONS + " : " + this.manageExceptions + '\n' +
KEY_UPLOADS_DIRECTORY + " : " + this.uploadDirectory + '\n' +
@@ -743,15 +704,6 @@
}
/**
- * @param key The forceProperties to set.
- * @param value The forceProperties value to set.
- */
- public void addToForceProperties(String key, String value) {
- this.checkWriteable();
- this.forceProperties.put(key, value);
- }
-
- /**
* @param formEncoding The formEncoding to set.
*/
public void setFormEncoding(String formEncoding) {
@@ -765,14 +717,6 @@
public void addToLoadClasses(String className) {
this.checkWriteable();
this.loadClasses.add(className);
- }
-
- /**
- * @param loggerClassName The loggerClassName to set.
- */
- public void setLoggerManagerClassName(String loggerClassName) {
- this.checkWriteable();
- this.loggerManagerClassName = loggerClassName;
}
/**
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ApplicationContextFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ApplicationContextFactory.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ApplicationContextFactory.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ApplicationContextFactory.java Thu Feb 23 06:26:07 2006
@@ -15,18 +15,27 @@
*/
package org.apache.cocoon.core.container.spring;
+import java.io.File;
+import java.net.URL;
import java.util.Iterator;
import javax.servlet.ServletContext;
+import org.apache.avalon.excalibur.logger.Log4JConfLoggerManager;
+import org.apache.avalon.excalibur.logger.ServletLogger;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.Log4JLogger;
+import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.acting.Action;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.treeprocessor.ProcessorComponentInfo;
+import org.apache.cocoon.configuration.ConfigurationBuilder;
import org.apache.cocoon.core.Core;
+import org.apache.cocoon.core.CoreInitializationException;
import org.apache.cocoon.core.Settings;
+import org.apache.cocoon.core.logging.SettingsContext;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.matching.Matcher;
import org.apache.cocoon.reading.Reader;
@@ -111,18 +120,95 @@
return context;
}
- public static Logger createRootLogger(ServletContext context, String category) {
+ /**
+ * Create the root logger for Cocoon.
+ * If the root spring application context is setup (using the spring listener) and
+ * if it contains a Logger bean (a bean with the name of the Logger class), then
+ * that bean is used as the root logger.
+ * If either the context is not available or the Logger bean is not defined, we setup
+ * our own Logger based on Log4j.
+ *
+ * @param context The servlet context.
+ * @param settings The core settings.
+ * @return The root logger for Cocoon.
+ */
+ public static Logger createRootLogger(ServletContext context,
+ Settings settings) {
final ApplicationContext parent = (ApplicationContext)context.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
// test for a logger in the parent context
if ( parent != null && parent.containsBean(Logger.class.getName()) ) {
- if ( category == null || category.length() == 0 ) {
+ if ( settings.getEnvironmentLogger() == null || settings.getEnvironmentLogger().length() == 0 ) {
return (Logger)parent.getBean(Logger.class.getName());
}
- return ((Logger)parent.getBean(Logger.class.getName())).getChildLogger(category);
+ return ((Logger)parent.getBean(Logger.class.getName())).getChildLogger(settings.getEnvironmentLogger());
}
// create a new log4j logger
- org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(category);
- return new Log4JLogger(logger);
+ try {
+ return initLogger(context, settings);
+ } catch (Exception ce) {
+ ce.printStackTrace();
+ throw new CoreInitializationException("Cannot setup log4j logging system.", ce);
+ }
+ }
+
+ protected static Logger initLogger(ServletContext servletContext,
+ Settings settings)
+ throws Exception {
+ // create a bootstrap logger
+ int logLevel;;
+ final String logLevelString = settings.getBootstrapLogLevel();
+ if ( "DEBUG".equalsIgnoreCase(logLevelString) ) {
+ logLevel = ServletLogger.LEVEL_DEBUG;
+ } else if ( "WARN".equalsIgnoreCase(logLevelString) ) {
+ logLevel = ServletLogger.LEVEL_WARN;
+ } else if ( "ERROR".equalsIgnoreCase(logLevelString) ) {
+ logLevel = ServletLogger.LEVEL_ERROR;
+ } else {
+ logLevel = ServletLogger.LEVEL_INFO;
+ }
+ final Logger bootstrapLogger = new ServletLogger(servletContext, "Cocoon", logLevel);
+
+
+ // create an own context for the logger manager
+ final DefaultContext subcontext = new SettingsContext(settings);
+ subcontext.put("context-work", new File(settings.getWorkDirectory()));
+ final File logSCDir = new File(settings.getWorkDirectory(), "cocoon-logs");
+ logSCDir.mkdirs();
+ subcontext.put("log-dir", logSCDir.toString());
+ subcontext.put("servlet-context", servletContext);
+
+ final Log4JConfLoggerManager loggerManager = new Log4JConfLoggerManager();
+ loggerManager.enableLogging(bootstrapLogger);
+ loggerManager.contextualize(subcontext);
+
+ // Configure the log4j manager
+ String loggerConfig = settings.getLoggingConfiguration();
+ if ( !loggerConfig.startsWith("/") ) {
+ loggerConfig = '/' + loggerConfig;
+ }
+ if ( loggerConfig != null ) {
+ final URL url = servletContext.getResource(loggerConfig);
+ if ( url != null ) {
+ final ConfigurationBuilder builder = new ConfigurationBuilder(settings);
+ final Configuration conf = builder.build(servletContext.getResourceAsStream(loggerConfig));
+ // override log level?
+ if (settings.getOverrideLogLevel() != null) {
+ // TODO
+ }
+ loggerManager.configure(conf);
+ } else {
+ bootstrapLogger.warn("The logging configuration '" + loggerConfig + "' is not available.");
+ loggerManager.configure(new DefaultConfiguration("empty"));
+ }
+ } else {
+ loggerManager.configure(new DefaultConfiguration("empty"));
+ }
+
+ String accesslogger = settings.getEnvironmentLogger();
+ if (accesslogger == null) {
+ accesslogger = "cocoon";
+ }
+ return loggerManager.getLoggerForCategory(accesslogger);
}
protected static void prepareApplicationContext(CocoonXmlWebApplicationContext context) {
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/logging/SettingsContext.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/logging/SettingsContext.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/logging/SettingsContext.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/logging/SettingsContext.java Thu Feb 23 06:26:07 2006
@@ -21,7 +21,7 @@
import org.apache.cocoon.core.Settings;
/**
- * This is an extension the default context implementation.
+ * This is an extension of the default context implementation.
* It first looks into the settings object and only if the key
* is not found there, it delegates to the parent.
*
@@ -34,6 +34,11 @@
public SettingsContext(Context parentContext, Settings s) {
super(parentContext);
+ this.settings = s;
+ }
+
+ public SettingsContext(Settings s) {
+ super();
this.settings = s;
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/servlet/CoreUtil.java Thu Feb 23 06:26:07 2006
@@ -67,7 +67,7 @@
s.setWorkDirectory(workDir1.getAbsolutePath());
}
if (s.getLoggingConfiguration() == null) {
- s.setLoggingConfiguration("/WEB-INF/logkit.xconf");
+ s.setLoggingConfiguration("/WEB-INF/log4j.xconf");
}
MutableSettings settings = s;
ServletContext servletContext = servletConfig.getServletContext();
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java Thu Feb 23 06:26:07 2006
@@ -476,11 +476,9 @@
this.addValue(Settings.KEY_CONFIGURATION, s.getConfiguration());
this.addMultilineValue(Settings.KEY_EXTRA_CLASSPATHS, s.getExtraClasspaths());
this.addMultilineValue(Settings.KEY_LOAD_CLASSES, s.getLoadClasses());
- this.addValue(Settings.KEY_FORCE_PROPERTIES, s.getForceProperties());
this.addValue(Settings.KEY_PROPERTY_PROVIDER, s.getPropertyProviders());
this.addValue(Settings.KEY_LOGGING_CONFIGURATION, s.getLoggingConfiguration());
this.addValue(Settings.KEY_LOGGING_BOOTSTRAP_LOGLEVEL, s.getBootstrapLogLevel());
- this.addValue(Settings.KEY_LOGGING_MANAGER_CLASS, s.getLoggerManagerClassName());
this.addValue(Settings.KEY_LOGGING_COCOON_LOGGER, s.getCocoonLogger());
this.addValue(Settings.KEY_LOGGING_ENVIRONMENT_LOGGER, s.getEnvironmentLogger());
this.addValue(Settings.KEY_LOGGING_OVERRIDE_LOGLEVEL, s.getOverrideLogLevel());
@@ -618,23 +616,6 @@
first = false;
}
buffer.append(value.next());
- }
- addValue(name, buffer.toString(), null);
- }
-
- /** Utility function to begin and end a <code>value</code> tag pair. */
- private void addValue(String name, Map value) throws SAXException {
- final StringBuffer buffer = new StringBuffer();
- final Iterator i = value.entrySet().iterator();
- boolean first = true;
- while ( i.hasNext() ) {
- if ( !first ) {
- buffer.append(',');
- } else {
- first = false;
- }
- Map.Entry current = (Map.Entry)i.next();
- buffer.append(current.getKey()).append('=').append(current.getValue());
}
addValue(name, buffer.toString(), null);
}
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java Thu Feb 23 06:26:07 2006
@@ -613,13 +613,6 @@
}
/**
- * @see org.apache.cocoon.core.BootstrapEnvironment#getBootstrapLogger(org.apache.cocoon.core.BootstrapEnvironment.LogLevel)
- */
- public Logger getBootstrapLogger(BootstrapEnvironment.LogLevel logLevel) {
- return new ServletLogger(this.config, logLevel.getLevel());
- }
-
- /**
* @see org.apache.cocoon.core.BootstrapEnvironment#setLogger(org.apache.avalon.framework.logger.Logger)
*/
public void setLogger(Logger rootLogger) {
@@ -637,7 +630,7 @@
settings.setWorkDirectory(workDir.getAbsolutePath());
}
if ( settings.getLoggingConfiguration() == null ) {
- settings.setLoggingConfiguration("/WEB-INF/logkit.xconf");
+ settings.setLoggingConfiguration("/WEB-INF/log4j.xconf");
}
}
@@ -661,13 +654,6 @@
*/
public File getContextForWriting() {
return this.writeableContextPath;
- }
-
- /**
- * @see org.apache.cocoon.core.BootstrapEnvironment#configureLoggingContext(org.apache.avalon.framework.context.DefaultContext)
- */
- public void configureLoggingContext(DefaultContext context) {
- context.put("servlet-context", this.config.getServletContext());
}
/**
Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/SettingsHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/SettingsHelper.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/SettingsHelper.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/servlet/SettingsHelper.java Thu Feb 23 06:26:07 2006
@@ -20,7 +20,6 @@
import javax.servlet.ServletConfig;
import org.apache.cocoon.core.MutableSettings;
-import org.apache.cocoon.util.StringUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.SystemUtils;
@@ -39,8 +38,6 @@
public static void fill(MutableSettings s, ServletConfig config) {
String value;
- handleForceProperty(getInitParameter(config, "force-property"), s);
-
value = getInitParameter(config, "configurations");
if ( value != null ) {
s.setConfiguration(value);
@@ -48,16 +45,9 @@
s.setConfiguration("/WEB-INF/cocoon.xconf");
}
- // upto 2.1.x the logging configuration was named "logkit-config"
- // we still support this, but provide a new unbiased name as well
- value = getInitParameter(config, "logkit-config");
+ value = getInitParameter(config, "logging-config");
if ( value != null ) {
- s.setLoggingConfiguration("context:/" + value);
- } else {
- value = getInitParameter(config, "logging-config");
- if ( value != null ) {
- s.setLoggingConfiguration("context:/" + value);
- }
+ s.setLoggingConfiguration("context:/" + value);
}
value = getInitParameter(config, "servlet-logger");
@@ -75,11 +65,6 @@
s.setBootstrapLogLevel(value);
}
- value = getInitParameter(config, "logger-class");
- if ( value != null ) {
- s.setLoggerManagerClassName(value);
- }
-
s.setReloadingEnabled(getInitParameterAsBoolean(config, "allow-reload", s.isReloadingEnabled(null)));
handleLoadClass(getInitParameter(config, "load-class"), s);
@@ -157,36 +142,6 @@
while (tokenizer.hasMoreTokens()) {
final String value = tokenizer.nextToken().trim();
s.addToLoadClasses(value);
- }
- }
-
- /**
- * Handle the "force-property" parameter.
- *
- * If you need to force more than one property to load, then
- * separate each entry with whitespace, a comma, or a semi-colon.
- * Cocoon will strip any whitespace from the entry.
- */
- private static void handleForceProperty(String forceSystemProperty, MutableSettings s) {
- if (forceSystemProperty != null) {
- StringTokenizer tokenizer = new StringTokenizer(forceSystemProperty, " \t\r\n\f;,", false);
-
- while (tokenizer.hasMoreTokens()) {
- final String property = tokenizer.nextToken().trim();
- if (property.indexOf('=') == -1) {
- continue;
- }
- try {
- String key = property.substring(0, property.indexOf('='));
- String value = property.substring(property.indexOf('=') + 1);
- if (value.indexOf("${") != -1) {
- value = StringUtils.replaceToken(value);
- }
- s.addToForceProperties(key, value);
- } catch (Exception e) {
- // Do not throw an exception, because it is not a fatal error.
- }
- }
}
}
Modified: cocoon/trunk/cocoon-core/src/test/java/org/apache/cocoon/bean/CocoonBeanTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/test/java/org/apache/cocoon/bean/CocoonBeanTestCase.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/test/java/org/apache/cocoon/bean/CocoonBeanTestCase.java (original)
+++ cocoon/trunk/cocoon-core/src/test/java/org/apache/cocoon/bean/CocoonBeanTestCase.java Thu Feb 23 06:26:07 2006
@@ -59,7 +59,7 @@
cocoon.setConfigFile("WEB-INF/cocoon.xconf");
cocoon.setPrecompileOnly(false);
cocoon.setWorkDir("build/work");
- cocoon.setLogKit("build/webapp/WEB-INF/logkit.xconf");
+ cocoon.setLogKit("build/webapp/WEB-INF/log4j.xconf");
cocoon.setLogger("cli-test");
cocoon.setLogLevel("DEBUG");
//cocoon.setAgentOptions(*something*));
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java Thu Feb 23 06:26:07 2006
@@ -789,13 +789,6 @@
}
/**
- * @see org.apache.cocoon.core.BootstrapEnvironment#getBootstrapLogger(org.apache.cocoon.core.BootstrapEnvironment.LogLevel)
- */
- public Logger getBootstrapLogger(LogLevel logLevel) {
- return new PortletLogger(this.config.getPortletContext(), logLevel.getLevel());
- }
-
- /**
* @see org.apache.cocoon.core.BootstrapEnvironment#setLogger(org.apache.avalon.framework.logger.Logger)
*/
public void setLogger(Logger rootLogger) {
@@ -834,13 +827,6 @@
*/
public File getContextForWriting() {
return this.writeableContextPath;
- }
-
- /**
- * @see org.apache.cocoon.core.BootstrapEnvironment#configureLoggingContext(org.apache.avalon.framework.context.DefaultContext)
- */
- public void configureLoggingContext(DefaultContext context) {
- context.put("servlet-context", this.config.getPortletContext());
}
/**
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Thu Feb 23 06:26:07 2006
@@ -39,6 +39,7 @@
import org.apache.cocoon.components.notification.DefaultNotifyingBuilder;
import org.apache.cocoon.components.notification.Notifier;
import org.apache.cocoon.components.notification.Notifying;
+import org.apache.cocoon.core.MutableSettings;
import org.apache.cocoon.core.container.spring.ApplicationContextFactory;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.portlet.PortletContext;
@@ -213,7 +214,8 @@
this.workDir.mkdirs();
// Init logger
- this.log = ApplicationContextFactory.createRootLogger(this.envPortletContext, "cocoon");
+ // FIXME - how do we get the settings object?
+ this.log = ApplicationContextFactory.createRootLogger(this.envPortletContext, new MutableSettings());
final String uploadDirParam = conf.getInitParameter("upload-directory");
if (uploadDirParam != null) {
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java Thu Feb 23 06:26:07 2006
@@ -20,7 +20,6 @@
import javax.portlet.PortletConfig;
import org.apache.cocoon.core.MutableSettings;
-import org.apache.cocoon.util.StringUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.SystemUtils;
@@ -39,8 +38,6 @@
public static void fill(MutableSettings s, PortletConfig config) {
String value;
- handleForceProperty(getInitParameter(config, "force-property"), s);
-
value = getInitParameter(config, "configurations");
if ( value != null ) {
s.setConfiguration(value);
@@ -68,11 +65,6 @@
s.setBootstrapLogLevel(value);
}
- value = getInitParameter(config, "logger-class");
- if ( value != null ) {
- s.setLoggerManagerClassName(value);
- }
-
s.setReloadingEnabled(getInitParameterAsBoolean(config, "allow-reload", s.isReloadingEnabled(null)));
handleLoadClass(getInitParameter(config, "load-class"), s);
@@ -148,36 +140,6 @@
while (tokenizer.hasMoreTokens()) {
final String value = tokenizer.nextToken().trim();
s.addToLoadClasses(value);
- }
- }
-
- /**
- * Handle the "force-property" parameter.
- *
- * If you need to force more than one property to load, then
- * separate each entry with whitespace, a comma, or a semi-colon.
- * Cocoon will strip any whitespace from the entry.
- */
- private static void handleForceProperty(String forceSystemProperty, MutableSettings s) {
- if (forceSystemProperty != null) {
- StringTokenizer tokenizer = new StringTokenizer(forceSystemProperty, " \t\r\n\f;,", false);
-
- while (tokenizer.hasMoreTokens()) {
- final String property = tokenizer.nextToken().trim();
- if (property.indexOf('=') == -1) {
- continue;
- }
- try {
- String key = property.substring(0, property.indexOf('='));
- String value = property.substring(property.indexOf('=') + 1);
- if (value.indexOf("${") != -1) {
- value = StringUtils.replaceToken(value);
- }
- s.addToForceProperties(key, value);
- } catch (Exception e) {
- // Do not throw an exception, because it is not a fatal error.
- }
- }
}
}
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/log4j.xconf
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/log4j.xconf?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/log4j.xconf (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/log4j.xconf Thu Feb 23 06:26:07 2006
@@ -14,8 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<!-- This is a sample configuration for log4j.
@@ -24,7 +22,7 @@
Note, that you can use properties for value substitution.
-->
<appender name="COCOON_DEFAULT" class="org.apache.log4j.FileAppender">
- <param name="File" value="${context-root}/WEB-INF/logs/log4j.log" />
+ <param name="File" value="${log-dir}/WEB-INF/logs/log4j.log" />
<param name="Append" value="false" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/>
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/properties/core.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/properties/core.properties?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/properties/core.properties (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/WEB-INF/properties/core.properties Thu Feb 23 06:26:07 2006
@@ -36,14 +36,8 @@
#org.apache.cocoon.reloading.config=yes
#org.apache.cocoon.reloading.flow=yes
-# This parameter switches the logging system from LogKit to Log4J (or
-# any other logging implementation) for Cocoon.
-# Log4J has to be configured already.
-# org.apache.cocoon.logging.manager.class=org.apache.avalon.excalibur.logger.Log4JLoggerManager
-
-# This parameter indicates the configuration file of the logging
-# system, e.g. LogKit or Log4J.
-org.apache.cocoon.logging.configuration=WEB-INF/logkit.xconf
+# This parameter indicates the log4j configuration file.
+org.apache.cocoon.logging.configuration=WEB-INF/log4j.xconf
# This parameter indicates the category id of the logger
# configuration used by the environment Cocoon runs in (CLI, Servlet etc.).
@@ -168,9 +162,3 @@
# Set form encoding. This will be the character set used to decode request
# parameters. If not set the ISO-8859-1 encoding will be assumed.
org.apache.cocoon.formencoding=ISO-8859-1
-
-# This property allows to set system properties.
-# Everything after 'org.apache.cocoon.system.properties.' builds
-# the name of the system property and the value is the value
-# to be set.
-#org.apache.cocoon.system.properties.org.apache.commons.logging.Log=org.apache.commons.logging.impl.LogKitLogger
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/error2html.xslt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/error2html.xslt?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/error2html.xslt (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/error2html.xslt Thu Feb 23 06:26:07 2006
@@ -83,7 +83,7 @@
the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
If the logs don't give you enough information, you might want to increase the
log level by changing the Logging configuration which is by default the
- <code>WEB-INF/logkit.xconf</code> file.
+ <code>WEB-INF/log4j.xconf</code> file.
</p>
<p>
Modified: cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/exception2html.xslt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/exception2html.xslt?rev=380124&r1=380123&r2=380124&view=diff
==============================================================================
--- cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/exception2html.xslt (original)
+++ cocoon/trunk/cocoon-webapp/src/main/webapp/stylesheets/system/exception2html.xslt Thu Feb 23 06:26:07 2006
@@ -118,7 +118,7 @@
the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
If the logs don't give you enough information, you might want to increase the
log level by changing the Logging configuration which is by default the
- <code>WEB-INF/logkit.xconf</code> file.
+ <code>WEB-INF/log4j.xconf</code> file.
</p>
<p>