sylvain 02/01/04 05:24:09
Modified: src/java/org/apache/cocoon/generation
ServerPagesGenerator.java
Log:
Make the XSP use the same logger as the generator (i.e. the one specified in the
sitemap, if any).
Revision Changes Path
1.2 +7 -2
xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerPagesGenerator.java 3 Jan 2002 12:31:16 -0000 1.1
+++ ServerPagesGenerator.java 4 Jan 2002 13:24:09 -0000 1.2
@@ -14,6 +14,7 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
@@ -58,7 +59,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/01/03 12:31:16 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/01/04 13:24:09 $
*/
public class ServerPagesGenerator extends ServletGenerator
implements Recyclable, Disposable, Cacheable, Configurable
@@ -85,7 +86,6 @@
super.compose(manager);
if (programGenerator == null) {
- getLogger().debug("Looking up " + ProgramGenerator.ROLE);
try {
this.programGenerator = (ProgramGenerator)
manager.lookup(ProgramGenerator.ROLE);
@@ -180,6 +180,11 @@
} catch (NoClassDefFoundError e) {
getLogger().warn("Failed to load class: " + e);
throw new ResourceNotFoundException(e.getMessage());
+ }
+
+ // Give our own logger to the generator so that logs go in the correct
category
+ if (generator instanceof Loggable) {
+ ((Loggable)generator).setLogger(getLogger());
}
generator.setup(this.resolver, this.objectModel, super.source,
this.parameters);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
