giacomo 2002/09/27 09:27:38
Modified: src/documentation/xdocs/developing
parent-component-manager.xml
src/java/org/apache/cocoon/acting AbstractAction.java
src/java/org/apache/cocoon/components/language/generator
GeneratorSelector.java
src/java/org/apache/cocoon/components/language/markup
LogicsheetCodeGenerator.java
src/java/org/apache/cocoon/components/language/markup/xsp/java
log.xsl
src/java/org/apache/cocoon/components/modules/input
MapMetaModule.java XMLMetaModule.java
src/java/org/apache/cocoon/components/xslt
XSLTProcessorImpl.java
src/java/org/apache/cocoon/generation
ServerPagesGenerator.java
src/java/org/apache/cocoon/reading AbstractReader.java
src/java/org/apache/cocoon/servlet CocoonServlet.java
src/java/org/apache/cocoon/xml AbstractXMLProducer.java
src/scratchpad/src/org/apache/cocoon/components/source/impl
SlideSource.java
src/scratchpad/webapp/samples/slide web.xml
src/test/org/apache/cocoon/environment/commandline/test
CommandLineContextTestCase.java
Log:
remove Loggable in favor of LogEnabled (and all abstract classes there of)
Revision Changes Path
1.2 +3 -3
xml-cocoon2/src/documentation/xdocs/developing/parent-component-manager.xml
Index: parent-component-manager.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/developing/parent-component-manager.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parent-component-manager.xml 3 Jan 2002 12:31:03 -0000 1.1
+++ parent-component-manager.xml 27 Sep 2002 16:27:37 -0000 1.2
@@ -31,7 +31,7 @@
via the constructor that takes a single <code>String</code>
argument, passing
anything to the right of the first <code>'/'</code> in the
parameter value to the
constructor. Subsequently Cocoon examines whether the class
implements
- <code>org.apache.avalon.framework.logger.Loggable</code> and/or
+ <code>org.apache.avalon.framework.logger.LogEnabled</code>
and/or
<code>org.apache.avalon.framework.activity.Initializable</code>
and calls
<code>setLogger</code> and/or <code>initialize</code>, as
appropriate.
The instance is then used as a parent component manager.
@@ -149,12 +149,12 @@
<p>
After this Cocoon checks whether the parent component
manager class implements <code>Initializable</code> and/or
- <code>Loggable</code>. Since the
<code>ParentComponentManager</code> class implements both, Cocoon
+ <code>LogEnabled</code>. Since the
<code>ParentComponentManager</code> class implements both, Cocoon
does the following (with simplification):
</p>
<source>
-((Loggable) cm).setLogger(logger);
+((LogEnabled) cm).enableLogging(logger);
((Initializable) cm).initialize();</source>
<p>Finally, the instance is used as parent component manager of
Cocoon's own component manager.</p>
1.9 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractAction.java 21 Sep 2002 22:57:18 -0000 1.8
+++ AbstractAction.java 27 Sep 2002 16:27:37 -0000 1.9
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.excalibur.component.AbstractDualLogEnabled;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import java.util.Collections;
import java.util.Map;
@@ -64,7 +64,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
* @version CVS $Id$
*/
-public abstract class AbstractAction extends AbstractDualLogEnabled
+public abstract class AbstractAction extends AbstractLogEnabled
implements Action {
/**
1.13 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- GeneratorSelector.java 31 Jul 2002 13:13:23 -0000 1.12
+++ GeneratorSelector.java 27 Sep 2002 16:27:37 -0000 1.13
@@ -183,7 +183,7 @@
try {
final ComponentHandler handler =
generator.getHandler(newManager, this.context, this.roles,
this.logKitManager);
- handler.setLogger(getLogkitLogger());
+ handler.enableLogging(getLogger());
handler.initialize();
this.componentHandlers.put(hint, handler);
if (getLogger().isDebugEnabled()) {
1.14 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java
Index: LogicsheetCodeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LogicsheetCodeGenerator.java 19 Jul 2002 13:09:32 -0000 1.13
+++ LogicsheetCodeGenerator.java 27 Sep 2002 16:27:37 -0000 1.14
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.excalibur.component.AbstractDualLogEnabled;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.util.TraxErrorHandler;
@@ -77,7 +77,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @version CVS $Id$
*/
-public class LogicsheetCodeGenerator extends AbstractDualLogEnabled implements
MarkupCodeGenerator {
+public class LogicsheetCodeGenerator extends AbstractLogEnabled implements
MarkupCodeGenerator {
private ContentHandler serializerContentHandler;
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/log.xsl
Index: log.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/log.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- log.xsl 21 Feb 2002 03:36:09 -0000 1.4
+++ log.xsl 27 Sep 2002 16:27:37 -0000 1.5
@@ -121,7 +121,7 @@
}
-->
logger.setPriority(org.apache.log.Priority.getPriorityForName(<xsl:value-of
select="$level"/>));
- this.setLogger(logger);
+ this.enableLogging(new
org.apache.avalon.framework.logger.LogKitLogger(logger));
} catch (Exception e) {
getLogger().error("Could not create logger for \"" +
<xsl:value-of select="$name"/> + "\".", e);
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/MapMetaModule.java
Index: MapMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/MapMetaModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MapMetaModule.java 9 Aug 2002 08:32:11 -0000 1.1
+++ MapMetaModule.java 27 Sep 2002 16:27:37 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -83,7 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
* @version CVS $Id$
*/
-public class MapMetaModule extends AbstractLoggable
+public class MapMetaModule extends AbstractLogEnabled
implements InputModule, Configurable, Initializable, Composable, Disposable {
/** The component manager instance */
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java
Index: XMLMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/XMLMetaModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLMetaModule.java 9 Aug 2002 08:32:11 -0000 1.1
+++ XMLMetaModule.java 27 Sep 2002 16:27:37 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -119,7 +119,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
* @version CVS $Id$
*/
-public class XMLMetaModule extends AbstractLoggable
+public class XMLMetaModule extends AbstractLogEnabled
implements InputModule, Configurable, Initializable, Composable, Disposable {
/** The component manager instance */
1.26 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XSLTProcessorImpl.java 21 Sep 2002 04:03:51 -0000 1.25
+++ XSLTProcessorImpl.java 27 Sep 2002 16:27:38 -0000 1.26
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.xslt;
-import org.apache.avalon.excalibur.component.AbstractDualLogEnabled;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -120,7 +120,7 @@
* @since July 11, 2001
*/
public class XSLTProcessorImpl
- extends AbstractDualLogEnabled
+ extends AbstractLogEnabled
implements XSLTProcessor,
Composable,
Disposable,
1.21 +2 -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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ServerPagesGenerator.java 21 Sep 2002 02:26:08 -0000 1.20
+++ ServerPagesGenerator.java 27 Sep 2002 16:27:38 -0000 1.21
@@ -134,7 +134,7 @@
if (autoComplete) {
this.completionPipe = new CompletionPipe();
- this.completionPipe.setLogger(getLogkitLogger());
+ this.completionPipe.enableLogging(getLogger());
}
this.markupLanguage =
config.getChild("markup-language").getValue(DEFAULT_MARKUP_LANGUAGE);
1.9 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/reading/AbstractReader.java
Index: AbstractReader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/reading/AbstractReader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractReader.java 23 Aug 2002 06:49:01 -0000 1.8
+++ AbstractReader.java 27 Sep 2002 16:27:38 -0000 1.9
@@ -51,7 +51,7 @@
package org.apache.cocoon.reading;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.excalibur.component.AbstractDualLogEnabled;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
@@ -70,7 +70,7 @@
* @version CVS $Id$
*/
public abstract class AbstractReader
- extends AbstractDualLogEnabled
+ extends AbstractLogEnabled
implements Reader, Recyclable {
/** The current <code>SourceResolver</code>. */
1.39 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- CocoonServlet.java 21 Sep 2002 22:57:18 -0000 1.38
+++ CocoonServlet.java 27 Sep 2002 16:27:38 -0000 1.39
@@ -58,7 +58,6 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.cocoon.Constants;
@@ -1202,9 +1201,6 @@
Constructor pcmc = pcm.getConstructor(new Class[]{String.class});
parentComponentManager = (ComponentManager) pcmc.newInstance(new
Object[]{initParam});
- if (parentComponentManager instanceof Loggable) {
- ((Loggable) parentComponentManager).setLogger(log);
- }
if (parentComponentManager instanceof LogEnabled) {
((LogEnabled) parentComponentManager).enableLogging(new
LogKitLogger(log));
}
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java
Index: AbstractXMLProducer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLProducer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractXMLProducer.java 19 Jul 2002 13:09:32 -0000 1.6
+++ AbstractXMLProducer.java 27 Sep 2002 16:27:38 -0000 1.7
@@ -51,7 +51,7 @@
package org.apache.cocoon.xml;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.excalibur.component.AbstractDualLogEnabled;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
@@ -64,7 +64,7 @@
* @version CVS $Id$
*/
public abstract class AbstractXMLProducer
-extends AbstractDualLogEnabled
+extends AbstractLogEnabled
implements XMLProducer, Recyclable {
/** The <code>XMLConsumer</code> receiving SAX events. */
1.22 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSource.java
Index: SlideSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/SlideSource.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SlideSource.java 13 Sep 2002 07:30:50 -0000 1.21
+++ SlideSource.java 27 Sep 2002 16:27:38 -0000 1.22
@@ -249,7 +249,7 @@
/**
* Pass the Context to the component.
- * This method is called after the Loggable.setLogger() (if present)
+ * This method is called after the LogEnabled.enableLogging() (if present)
* method and before any other method.
*
* @param context the context
1.2 +1 -1 xml-cocoon2/src/scratchpad/webapp/samples/slide/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/scratchpad/webapp/samples/slide/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 1 Jul 2002 15:09:21 -0000 1.1
+++ web.xml 27 Sep 2002 16:27:38 -0000 1.2
@@ -181,7 +181,7 @@
String as a parameter. That String will be equal to the text after the
'/'.
- Cocoon honors the Loggable and Initializable interfaces for this class,
+ Cocoon honors the LogEnabled and Initializable interfaces for this class,
if it implements them.
If you uncomment the following lines the parent CM is set to the Parent CM
sample, which will look up
1.3 +2 -2
xml-cocoon2/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java
Index: CommandLineContextTestCase.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/test/org/apache/cocoon/environment/commandline/test/CommandLineContextTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CommandLineContextTestCase.java 22 Feb 2002 07:05:08 -0000 1.2
+++ CommandLineContextTestCase.java 27 Sep 2002 16:27:38 -0000 1.3
@@ -249,7 +249,7 @@
/**
* Setup a <code>Logger</code>.
* <p>
- * Setup a logger needed by AbstractLoggable objects.
+ * Setup a logger needed by AbstractLogEnabled objects.
* </p>
*
* @return Logger for logging
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
