You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2005/03/30 21:10:44 UTC
svn commit: r159512 -
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java
Author: vgritsenko
Date: Wed Mar 30 11:10:43 2005
New Revision: 159512
URL: http://svn.apache.org/viewcvs?view=rev&rev=159512
Log:
give cocoon object its own sub-category.
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java?view=diff&r1=159511&r2=159512
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Cocoon.java Wed Mar 30 11:10:43 2005
@@ -15,21 +15,10 @@
*/
package org.apache.cocoon;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.avalon.excalibur.component.ComponentProxyGenerator;
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
-
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Component;
@@ -46,6 +35,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.CocoonComponentManager;
@@ -59,8 +49,8 @@
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.Deprecation;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang.SystemUtils;
import org.apache.excalibur.instrument.InstrumentManageable;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.source.Source;
@@ -68,9 +58,17 @@
import org.apache.excalibur.source.impl.URLSource;
import org.apache.excalibur.xml.impl.XercesParser;
import org.apache.excalibur.xml.sax.SAXParser;
-
import org.xml.sax.InputSource;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+
/**
* The Cocoon Object is the main Kernel for the entire Cocoon system.
*
@@ -92,6 +90,9 @@
InstrumentManageable {
static Cocoon instance;
+ /** The root Cocoon logger */
+ private Logger rootLogger;
+
/** The application context */
private Context context;
@@ -119,13 +120,13 @@
/** The parent component manager. */
private ComponentManager parentComponentManager;
- /** flag for disposed or not */
- private boolean disposed = false;
+ /** Flag for disposed or not */
+ private boolean disposed;
- /** active request count */
- private volatile int activeRequestCount = 0;
+ /** Active request count */
+ private volatile int activeRequestCount;
- /** the Processor if it is ThreadSafe */
+ /** The Processor if it is ThreadSafe */
private Processor threadSafeProcessor;
/** The source resolver */
@@ -148,6 +149,11 @@
instance = this;
}
+ public void enableLogging(Logger logger) {
+ this.rootLogger = logger;
+ super.enableLogging(logger.getChildLogger("cocoon"));
+ }
+
/**
* Get the parent component manager. For purposes of
* avoiding extra method calls, the manager parameter may be null.
@@ -220,13 +226,10 @@
} else {
this.componentManager = new CocoonComponentManager((ClassLoader) this.context.get(Constants.CONTEXT_CLASS_LOADER));
}
- ContainerUtil.enableLogging(this.componentManager, getLogger().getChildLogger("manager"));
+ ContainerUtil.enableLogging(this.componentManager, this.rootLogger.getChildLogger("manager"));
ContainerUtil.contextualize(this.componentManager, this.context);
this.componentManager.setInstrumentManager(this.instrumentManager);
-
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("New Cocoon object.");
- }
+ getLogger().debug("New Cocoon object.");
// Log the System Properties.
dumpSystemProperties();
@@ -250,13 +253,13 @@
parser = getSystemProperty(Constants.PARSER_PROPERTY, Constants.DEFAULT_PARSER);
}
if (getLogger().isDebugEnabled()) {
- getLogger().debug("Using parser: " + parser);
- getLogger().debug("Classpath = " + classpath);
- getLogger().debug("Work directory = " + workDir.getCanonicalPath());
+ getLogger().debug("Parser: " + parser);
+ getLogger().debug("Classpath: " + classpath);
+ getLogger().debug("Work directory: " + workDir.getCanonicalPath());
}
ExcaliburComponentManager startupManager = new ExcaliburComponentManager((ClassLoader) this.context.get(Constants.CONTEXT_CLASS_LOADER));
- ContainerUtil.enableLogging(startupManager, getLogger().getChildLogger("startup"));
+ ContainerUtil.enableLogging(startupManager, this.rootLogger.getChildLogger("startup"));
ContainerUtil.contextualize(startupManager, this.context);
startupManager.setLoggerManager(this.loggerManager);
@@ -349,7 +352,7 @@
}
DefaultRoleManager drm = new DefaultRoleManager();
- ContainerUtil.enableLogging(drm, getLogger().getChildLogger("roles"));
+ ContainerUtil.enableLogging(drm, this.rootLogger.getChildLogger("roles"));
ContainerUtil.configure(drm, roleConfig);
roleConfig = null;
@@ -401,7 +404,7 @@
}
DefaultRoleManager urm = new DefaultRoleManager(drm);
- ContainerUtil.enableLogging(urm, getLogger().getChildLogger("roles").getChildLogger("user"));
+ ContainerUtil.enableLogging(urm, this.rootLogger.getChildLogger("roles").getChildLogger("user"));
ContainerUtil.configure(urm, roleConfig);
roleConfig = null;
drm = urm;
@@ -410,9 +413,7 @@
this.componentManager.setRoleManager(drm);
this.componentManager.setLoggerManager(this.loggerManager);
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("Setting up components...");
- }
+ getLogger().debug("Setting up components...");
ContainerUtil.configure(this.componentManager, conf);
}
@@ -686,7 +687,7 @@
try {
if (getLogger().isDebugEnabled()) {
++activeRequestCount;
- this.debug(environment, true);
+ debug(environment, true);
}
if (this.threadSafeProcessor != null) {