stephan 2002/07/31 06:13:33
Modified: . changes.xml
src/java/org/apache/cocoon Cocoon.java Main.java
src/java/org/apache/cocoon/acting AbstractAction.java
ServerPagesAction.java
src/java/org/apache/cocoon/components LifecycleHelper.java
src/java/org/apache/cocoon/components/classloader
RepositoryClassLoader.java
src/java/org/apache/cocoon/components/crawler
SimpleCocoonCrawlerImpl.java
src/java/org/apache/cocoon/components/deli DeliImpl.java
src/java/org/apache/cocoon/components/elementprocessor/impl
AbstractElementProcessorFactory.java
src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements
BaseElementProcessor.java Sheet.java
src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
ContinuationsManagerImpl.java
src/java/org/apache/cocoon/components/flow/javascript
JSLog.java JavaScriptInterpreter.java
src/java/org/apache/cocoon/components/hsqldb ServerImpl.java
src/java/org/apache/cocoon/components/jsp JSPEngineImpl.java
JSPEngineImplNamedDispatcherInclude.java
JSPEngineImplWLS.java
src/java/org/apache/cocoon/components/language/generator
GeneratorSelector.java ProgramGeneratorImpl.java
src/java/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java
CocoonMarkupLanguage.java Logicsheet.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPMarkupLanguage.java
src/java/org/apache/cocoon/components/language/programming
AbstractProgrammingLanguage.java
src/java/org/apache/cocoon/components/language/programming/java
AbstractJavaCompiler.java JavaLanguage.java
JstyleFormatter.java NullFormatter.java
src/java/org/apache/cocoon/components/modules/database
AbstractAutoIncrementModule.java
src/java/org/apache/cocoon/components/modules/input
AbstractInputModule.java CollectionMetaModule.java
DefaultsMetaModule.java DigestMetaModule.java
src/java/org/apache/cocoon/components/modules/output
AbstractOutputModule.java
RequestAttributeOutputModule.java
SessionAttributeOutputModule.java
src/java/org/apache/cocoon/components/profiler
SimpleProfiler.java
src/java/org/apache/cocoon/components/resolver
ResolverImpl.java
src/java/org/apache/cocoon/components/search
SimpleLuceneCocoonIndexerImpl.java
SimpleLuceneCocoonSearcherImpl.java
SimpleLuceneXMLIndexerImpl.java
src/java/org/apache/cocoon/components/source
AbstractSAXSource.java AbstractStreamSource.java
CocoonSourceFactory.java FileSourceFactory.java
SitemapSource.java SourceHandler.java
SourceHandlerImpl.java XMLDBSource.java
XMLDBSourceFactory.java
src/java/org/apache/cocoon/components/source/impl
CocoonSourceFactory.java SitemapSource.java
SourceFactoryWrapper.java URLFactoryWrapper.java
src/java/org/apache/cocoon/components/store
FilesystemStore.java JispFilesystemStore.java
MRUMemoryStore.java StoreJanitorImpl.java
src/java/org/apache/cocoon/components/treeprocessor
AbstractParentProcessingNodeBuilder.java
AbstractProcessingNode.java
AbstractProcessingNodeBuilder.java
DefaultTreeBuilder.java InvokeContext.java
TreeProcessor.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
PipelineNode.java
src/java/org/apache/cocoon/components/url
ContextURLFactory.java ResourceURLFactory.java
URLFactoryImpl.java
src/java/org/apache/cocoon/components/xpath
JaxenProcessorImpl.java XPathProcessorImpl.java
src/java/org/apache/cocoon/components/xscript
XScriptManagerImpl.java
src/java/org/apache/cocoon/environment
AbstractEnvironment.java ForwardRedirector.java
src/java/org/apache/cocoon/environment/commandline
AbstractCommandLineEnvironment.java
CommandlineContext.java FileSavingEnvironment.java
LinkSamplingEnvironment.java
src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
src/java/org/apache/cocoon/generation
ServerPagesGenerator.java
src/java/org/apache/cocoon/matching
AbstractPreparableMatcher.java
AbstractWildcardMatcher.java CookieMatcher.java
RegexpURIMatcher.java RequestParamMatcher.java
WildcardURIMatcher.java
src/java/org/apache/cocoon/reading AbstractReader.java
src/java/org/apache/cocoon/samples/parentcm
ParentComponentManager.java
src/java/org/apache/cocoon/selection
AbstractSwitchSelector.java CookieSelector.java
HeaderSelector.java HostSelector.java
NamedPatternsSelector.java
RequestAttributeSelector.java
RequestMethodSelector.java
SessionAttributeSelector.java
SessionStateSelector.java
src/java/org/apache/cocoon/serialization
ElementProcessorSerializer.java RTFSerializer.java
src/java/org/apache/cocoon/servlet CocoonServlet.java
src/java/org/apache/cocoon/transformation
TraxTransformer.java
src/java/org/apache/cocoon/webapps/portal/components
CopletThread.java
src/java/org/apache/cocoon/webapps/session/components
AbstractSessionComponent.java SessionManager.java
src/java/org/apache/cocoon/webapps/session/connector
ResourceConnectorImpl.java
src/java/org/apache/cocoon/xml AbstractXMLConsumer.java
DocumentHandlerWrapper.java
LoggingContentHandler.java
LoggingEntityResolver.java
src/java/org/apache/cocoon/xml/dom SVGBuilder.java
src/scratchpad/src/org/apache/cocoon/acting
CookieValidatorAction.java
src/scratchpad/src/org/apache/cocoon/components/source
BlobSourceFactory.java
src/scratchpad/src/org/apache/cocoon/components/source/impl
XPathSourceInspector.java
src/scratchpad/src/org/apache/cocoon/precept
InstanceFactory.java
src/scratchpad/src/org/apache/cocoon/precept/preceptors
AbstractPreceptor.java
src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax
PreceptorBuilderImpl.java
src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints
AbstractConstraint.java
src/scratchpad/src/org/apache/cocoon/precept/stores
AbstractInstance.java
src/scratchpad/src/org/apache/cocoon/storejanitor
StoreJanitorImpl.java
src/scratchpad/src/org/apache/cocoon/taglib TagSupport.java
src/webapp/WEB-INF web.xml
Log:
Replaced Loggable by LogEnabled.
Revision Changes Path
1.224 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- changes.xml 30 Jul 2002 01:18:30 -0000 1.223
+++ changes.xml 31 Jul 2002 13:13:21 -0000 1.224
@@ -39,6 +39,10 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="SMS" type="update">
+ Replaced implementation from Loggable by LogEnabled to use
+ the Avalon Logger instead of the LogKit Logger.
+ </action>
<action dev="VG" type="update">
XScript now has better variable management: variables of request,
session, global, and page scope are stored not in the XScriptManager,
1.33 +7 -7 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Cocoon.java 4 Jul 2002 11:46:05 -0000 1.32
+++ Cocoon.java 31 Jul 2002 13:13:21 -0000 1.33
@@ -66,7 +66,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.language.generator.CompiledComponent;
@@ -100,7 +100,7 @@
* @version CVS $Id$
*/
public class Cocoon
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements ThreadSafe,
Component,
Initializable,
@@ -221,7 +221,7 @@
} else {
this.componentManager = new
CocoonComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
}
-
this.componentManager.setLogger(getLogger().getChildLogger("manager"));
+
this.componentManager.enableLogging(getLogger().getChildLogger("manager"));
this.componentManager.contextualize(this.context);
if (getLogger().isDebugEnabled()) {
@@ -251,7 +251,7 @@
getLogger().debug("Using parser: " + parser);
}
ExcaliburComponentManager startupManager = new
ExcaliburComponentManager((ClassLoader)this.context.get(Constants.CONTEXT_CLASS_LOADER));
- startupManager.setLogger(getLogger().getChildLogger("startup"));
+ startupManager.enableLogging(getLogger().getChildLogger("startup"));
startupManager.contextualize(this.context);
startupManager.setLogKitManager(this.logKitManager);
@@ -343,7 +343,7 @@
}
DefaultRoleManager drm = new DefaultRoleManager();
- drm.setLogger(getLogger().getChildLogger("roles"));
+ drm.enableLogging(getLogger().getChildLogger("roles"));
drm.configure(roleConfig);
roleConfig = null;
@@ -397,7 +397,7 @@
}
DefaultRoleManager urm = new DefaultRoleManager(drm);
-
urm.setLogger(getLogger().getChildLogger("roles").getChildLogger("user"));
+
urm.enableLogging(getLogger().getChildLogger("roles").getChildLogger("user"));
urm.configure(roleConfig);
roleConfig = null;
drm = urm;
1.23 +14 -9 xml-cocoon2/src/java/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Main.java 26 Jul 2002 17:06:44 -0000 1.22
+++ Main.java 31 Jul 2002 13:13:21 -0000 1.23
@@ -58,6 +58,8 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.DefaultContext;
+//import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.commandline.CommandlineContext;
import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
@@ -381,7 +383,7 @@
DefaultContext appContext = new DefaultContext();
appContext.put(Constants.CONTEXT_CLASS_LOADER,
Main.class.getClassLoader());
CommandlineContext clContext = new
CommandlineContext(contextDir);
- clContext.setLogger(log);
+ clContext.enableLogging(new LogKitLogger(log));
appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, clContext);
DefaultLogKitManager logKitManager = null;
if (logKit != null) {
@@ -417,7 +419,7 @@
if (verbose) System.out.print(".");
- c.setLogger(log);
+ c.enableLogging(new LogKitLogger(log));
c.contextualize(appContext);
c.setLogKitManager(logKitManager);
c.initialize();
@@ -586,7 +588,8 @@
if (verbose) System.out.println("Warming up...");
//log.info(" [Cocoon might need to compile the sitemaps, this might
take a while]");
//cocoon.process(new LinkSamplingEnvironment("/", context,
attributes, null));
- cocoon.generateSitemap(new LinkSamplingEnvironment("/", context,
attributes, null, this.log));
+ cocoon.generateSitemap(new LinkSamplingEnvironment("/", context,
attributes, null,
+ new
LogKitLogger(this.log)));
}
/**
@@ -682,7 +685,8 @@
public void processXSP(String uri) throws Exception {
String markupLanguage = "xsp";
String programmingLanguage = "java";
- Environment env = new LinkSamplingEnvironment("/", context,
attributes, null, this.log);
+ Environment env = new LinkSamplingEnvironment("/", context,
attributes, null,
+ new
LogKitLogger(this.log));
cocoon.precompile(uri, env, markupLanguage, programmingLanguage);
}
@@ -695,7 +699,8 @@
public void processXMAP(String uri) throws Exception {
String markupLanguage = "sitemap";
String programmingLanguage = "java";
- Environment env = new LinkSamplingEnvironment("/", context,
attributes, null, this.log);
+ Environment env = new LinkSamplingEnvironment("/", context,
attributes, null,
+ new
LogKitLogger(this.log));
cocoon.precompile(uri, env, markupLanguage, programmingLanguage);
}
@@ -940,7 +945,7 @@
context,
attributes,
parameters,
- this.log);
+ new LogKitLogger(this.log));
cocoon.process(env);
return env.getLinks();
}
@@ -962,7 +967,7 @@
parameters,
links,
stream,
- this.log);
+ new LogKitLogger(this.log));
cocoon.process(env);
return env.getContentType();
}
@@ -990,7 +995,7 @@
parameters,
empty,
new NullOutputStream(),
- this.log);
+ new LogKitLogger(this.log));
cocoon.process(env);
return env.getContentType();
}
1.6 +4 -4
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractAction.java 22 Feb 2002 06:59:26 -0000 1.5
+++ AbstractAction.java 31 Jul 2002 13:13:21 -0000 1.6
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.acting;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import java.util.Collections;
import java.util.Map;
@@ -64,8 +64,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public abstract class AbstractAction extends AbstractLoggable
-implements Action {
+public abstract class AbstractAction extends AbstractLogEnabled
+ implements Action {
/**
* Empty unmodifiable map. Replace with Collections.EMPTY_MAP when
1.8 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java
Index: ServerPagesAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/ServerPagesAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ServerPagesAction.java 4 Jun 2002 07:11:26 -0000 1.7
+++ ServerPagesAction.java 31 Jul 2002 13:13:21 -0000 1.8
@@ -131,7 +131,7 @@
null // LogKitManager
);
- this.generatorHandler.setLogger(getLogger());
+ this.generatorHandler.enableLogging(getLogger());
this.generatorHandler.initialize();
} catch(Exception e) {
@@ -167,7 +167,7 @@
XMLByteStreamCompiler compiler = null;
try {
- generator.setLogger(getLogger());
+ generator.enableLogging(getLogger());
generator.compose(this.manager);
generator.setup(resolver, objectModel, source, parameters);
1.2 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/components/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/LifecycleHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LifecycleHelper.java 4 Mar 2002 18:16:45 -0000 1.1
+++ LifecycleHelper.java 31 Jul 2002 13:13:21 -0000 1.2
@@ -59,8 +59,9 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -70,8 +71,6 @@
import org.apache.avalon.excalibur.logger.LogKitManager;
import org.apache.avalon.excalibur.logger.LogKitManageable;
-import org.apache.log.Logger;
-
/**
* Utility class for setting up Avalon components. Similar to Excalibur's
* <code>DefaultComponentFactory</code>, but on existing objects.
@@ -116,7 +115,7 @@
* the corresponding method isn't called (e.g. if
<code>configuration</code> is
* <code>null</code>, <code>configure()</code> isn't called).
*
- * @param logger the <code>Logger</code> to pass to
<code>Loggable</code>s, unless there is
+ * @param logger the <code>Logger</code> to pass to
<code>LogEnabled</code>s, unless there is
* a <code>LogKitManager</code> and the configuration specifies a
logger name.
* @param context the <code>Context</code> to pass to
<code>Contexutalizable</code>s.
* @param componentManager the component manager to pass to
<code>Composable</code>s.
@@ -211,7 +210,7 @@
final boolean initializeAndStart )
throws Exception
{
- if( component instanceof Loggable )
+ if( component instanceof LogEnabled )
{
Logger usedLogger;
if( null == logkit )
@@ -232,11 +231,11 @@
}
else
{
- usedLogger = logkit.getLogger( loggerName );
+ usedLogger = new LogKitLogger(logkit.getLogger(
loggerName ));
}
}
- ((Loggable)component).setLogger( usedLogger );
+ ((LogEnabled)component).enableLogging( usedLogger );
}
if( null != context && component instanceof Contextualizable )
1.7 +10 -5
xml-cocoon2/src/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java
Index: RepositoryClassLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RepositoryClassLoader.java 1 Mar 2002 14:31:22 -0000 1.6
+++ RepositoryClassLoader.java 31 Jul 2002 13:13:21 -0000 1.7
@@ -50,9 +50,9 @@
*/
package org.apache.cocoon.components.classloader;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.log.Logger;
import java.io.File;
import java.io.IOException;
@@ -72,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @version CVS $Id$
*/
-public class RepositoryClassLoader extends URLClassLoader implements
Loggable {
+public class RepositoryClassLoader extends URLClassLoader implements
LogEnabled {
/**
* The logger
@@ -100,7 +100,12 @@
super(urls, parentClassLoader);
}
- public void setLogger(Logger logger) {
+ /**
+ * Provide component with a logger.
+ *
+ * @param logger the logger
+ */
+ public void enableLogging(Logger logger) {
if (this.log == null) {
this.log = logger;
}
1.11 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java
Index: SimpleCocoonCrawlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SimpleCocoonCrawlerImpl.java 4 Jun 2002 09:27:20 -0000 1.10
+++ SimpleCocoonCrawlerImpl.java 31 Jul 2002 13:13:21 -0000 1.11
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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.excalibur.pool.Recyclable;
@@ -84,7 +84,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
* @version CVS $Id$
*/
-public class SimpleCocoonCrawlerImpl extends AbstractLoggable
+public class SimpleCocoonCrawlerImpl extends AbstractLogEnabled
implements CocoonCrawler, Configurable, Disposable, Recyclable
{
1.19 +10 -11
xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java
Index: DeliImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/deli/DeliImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DeliImpl.java 22 May 2002 15:17:44 -0000 1.18
+++ DeliImpl.java 31 Jul 2002 13:13:22 -0000 1.19
@@ -60,7 +60,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-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.parameters.Parameterizable;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -111,15 +111,14 @@
* @version CVS $ $ $Date$
*/
-public final class DeliImpl
-extends AbstractLoggable
-implements Parameterizable,
- Deli,
- Composable,
- Disposable,
- Initializable,
- ThreadSafe,
- Contextualizable {
+public final class DeliImpl extends AbstractLogEnabled
+ implements Parameterizable,
+ Deli,
+ Composable,
+ Disposable,
+ Initializable,
+ ThreadSafe,
+ Contextualizable {
/** The path to the Cocoon configuration files */
private String defaultPath = null;
1.2 +9 -11
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java
Index: AbstractElementProcessorFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractElementProcessorFactory.java 6 Mar 2002 16:58:02 -0000
1.1
+++ AbstractElementProcessorFactory.java 31 Jul 2002 13:13:22 -0000
1.2
@@ -51,7 +51,7 @@
package org.apache.cocoon.components.elementprocessor.impl;
import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.elementprocessor.*;
import org.apache.cocoon.components.elementprocessor.types.*;
@@ -68,7 +68,7 @@
*/
public abstract class AbstractElementProcessorFactory
- extends AbstractLoggable implements ElementProcessorFactory, Component
+ extends AbstractLogEnabled implements ElementProcessorFactory, Component
{
// uses XML element names as keys and ElementProcessor progenitors
@@ -176,11 +176,9 @@
protected Object lookupElementProcessorProgenitor(final String name)
{
Object o = _element_processor_map.get(name);
- if ((o == null) && (!name.equals("*")))
- {
- o = lookupElementProcessorProgenitor("*");
- }
- return o;
+ if ((o == null) && (!name.equals("*"))) {
+ o = lookupElementProcessorProgenitor("*");
+ } return o;
}
/**
@@ -224,9 +222,9 @@
try
{
rval = ( ElementProcessor ) progenitor.newInstance();
- if(rval instanceof
org.apache.avalon.framework.logger.AbstractLoggable)
+ if(rval instanceof AbstractLogEnabled)
{
- ((AbstractLoggable)rval).setLogger(getLogger());
+ ((AbstractLogEnabled)rval).enableLogging(getLogger());
}
}
catch (ExceptionInInitializerError e)
@@ -294,9 +292,9 @@
rval = ( ElementProcessor ) progenitor
.newInstance(new Object[ 0 ]);
- if(rval instanceof
org.apache.avalon.framework.logger.AbstractLoggable)
+ if(rval instanceof AbstractLogEnabled)
{
- ((AbstractLoggable)rval).setLogger(getLogger());
+ ((AbstractLogEnabled)rval).enableLogging(getLogger());
}
}
catch (ExceptionInInitializerError e)
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/BaseElementProcessor.java
Index: BaseElementProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/BaseElementProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseElementProcessor.java 6 Mar 2002 16:58:02 -0000 1.1
+++ BaseElementProcessor.java 31 Jul 2002 13:13:22 -0000 1.2
@@ -56,7 +56,7 @@
import org.apache.cocoon.components.elementprocessor.types.*;
import
org.apache.cocoon.components.elementprocessor.impl.poi.POIFSElementProcessor;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import java.util.*;
@@ -75,7 +75,7 @@
* @author Marc Johnson ([EMAIL PROTECTED])
*/
-public abstract class BaseElementProcessor extends AbstractLoggable
+public abstract class BaseElementProcessor extends AbstractLogEnabled
implements POIFSElementProcessor
{
private Map _attributes;
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
Index: Sheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Sheet.java 22 Jul 2002 15:18:57 -0000 1.3
+++ Sheet.java 31 Jul 2002 13:13:22 -0000 1.4
@@ -71,7 +71,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* internal representation of a Sheet
@@ -81,7 +81,7 @@
*/
// package scope
-class Sheet extends AbstractLoggable
+class Sheet extends AbstractLogEnabled
{
private HSSFSheet _sheet;
private String _name;
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractInterpreter.java 2 Jul 2002 08:32:07 -0000 1.4
+++ AbstractInterpreter.java 31 Jul 2002 13:13:22 -0000 1.5
@@ -60,7 +60,7 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.source.SourceFactory;
@@ -79,7 +79,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
* @since March 15, 2002
*/
-public abstract class AbstractInterpreter extends AbstractLoggable
+public abstract class AbstractInterpreter extends AbstractLogEnabled
implements Component, Composable, Contextualizable, Interpreter, ThreadSafe
{
/**
1.3 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Index: ContinuationsManagerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContinuationsManagerImpl.java 2 Jul 2002 08:32:07 -0000 1.2
+++ ContinuationsManagerImpl.java 31 Jul 2002 13:13:22 -0000 1.3
@@ -64,7 +64,7 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
/**
@@ -75,9 +75,9 @@
* @see ContinuationsManager
*/
public class ContinuationsManagerImpl
- extends AbstractLoggable
- implements ContinuationsManager, Component, Configurable, ThreadSafe
-{
+ extends AbstractLogEnabled
+ implements ContinuationsManager, Component, Configurable, ThreadSafe {
+
static final int CONTINUATION_ID_LENGTH = 20;
protected SecureRandom random = null;
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JSLog.java
Index: JSLog.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JSLog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSLog.java 2 Jul 2002 08:32:07 -0000 1.2
+++ JSLog.java 31 Jul 2002 13:13:22 -0000 1.3
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.flow.javascript;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
import org.mozilla.javascript.ScriptableObject;
/**
@@ -70,7 +70,7 @@
return "Log";
}
- public void setLogger(Logger logger)
+ public void enableLogging(Logger logger)
{
this.logger = logger;
}
1.4 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
Index: JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaScriptInterpreter.java 2 Jul 2002 08:32:07 -0000 1.3
+++ JavaScriptInterpreter.java 31 Jul 2002 13:13:22 -0000 1.4
@@ -130,7 +130,7 @@
// Define some global variables in JavaScript
Object args[] = {};
Scriptable log = context.newObject(scope, "Log", args);
- ((JSLog)log).setLogger(getLogger());
+ ((JSLog)log).enableLogging(getLogger());
scope.put("log", scope, log);
}
1.12 +9 -10
xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Index: ServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/ServerImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ServerImpl.java 24 Jul 2002 03:38:44 -0000 1.11
+++ ServerImpl.java 31 Jul 2002 13:13:22 -0000 1.12
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-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.parameters.Parameterizable;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -76,14 +76,13 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public class ServerImpl
-extends AbstractLoggable
-implements Server,
- Parameterizable,
- Contextualizable,
- ThreadSafe,
- Runnable,
- Startable {
+public class ServerImpl extends AbstractLogEnabled
+ implements Server,
+ Parameterizable,
+ Contextualizable,
+ ThreadSafe,
+ Runnable,
+ Startable {
/** Port which HSQLDB server will listen to */
private String port;
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/jsp/JSPEngineImpl.java
Index: JSPEngineImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/jsp/JSPEngineImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JSPEngineImpl.java 22 Feb 2002 07:00:07 -0000 1.6
+++ JSPEngineImpl.java 31 Jul 2002 13:13:23 -0000 1.7
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.jsp;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -77,7 +77,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @version CVS $Id$
*/
-public class JSPEngineImpl extends AbstractLoggable
+public class JSPEngineImpl extends AbstractLogEnabled
implements JSPEngine, Parameterizable, ThreadSafe {
/** The Servlet Include Path */
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java
Index: JSPEngineImplNamedDispatcherInclude.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/jsp/JSPEngineImplNamedDispatcherInclude.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JSPEngineImplNamedDispatcherInclude.java 22 Feb 2002 07:00:07 -0000
1.6
+++ JSPEngineImplNamedDispatcherInclude.java 31 Jul 2002 13:13:23 -0000
1.7
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.jsp;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
* @version CVS $Id$
*/
-public class JSPEngineImplNamedDispatcherInclude extends AbstractLoggable
+public class JSPEngineImplNamedDispatcherInclude extends AbstractLogEnabled
implements JSPEngine, Parameterizable, ThreadSafe {
/** The Servlet Include Path */
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java
Index: JSPEngineImplWLS.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/jsp/JSPEngineImplWLS.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JSPEngineImplWLS.java 22 Feb 2002 07:00:07 -0000 1.6
+++ JSPEngineImplWLS.java 31 Jul 2002 13:13:23 -0000 1.7
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.jsp;
-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.parameters.Parameterizable;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
* @version CVS $Id$
*/
-public class JSPEngineImplWLS extends AbstractLoggable
+public class JSPEngineImplWLS extends AbstractLogEnabled
implements JSPEngine, Parameterizable, ThreadSafe {
/** The Servlet Include Path */
1.12 +4 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GeneratorSelector.java 25 Jun 2002 13:35:07 -0000 1.11
+++ GeneratorSelector.java 31 Jul 2002 13:13:23 -0000 1.12
@@ -145,7 +145,7 @@
try {
this.classManager.addDirectory((File)
this.m_context.get(Constants.CONTEXT_WORK_DIR));
} catch (Exception e) {
- throw new ComponentException("Could not add repository to
ClassLoaderManager", e);
+ throw new ComponentException(ROLE, "Could not add repository to
ClassLoaderManager", e);
}
}
@@ -153,7 +153,7 @@
ComponentHandler handler = (ComponentHandler)
this.componentHandlers.get(hint);
if (handler == null) {
- throw new ComponentException("Could not find component for hint:
" + hint);
+ throw new ComponentException(ROLE, "Could not find component for
hint: " + hint);
}
try {
@@ -162,7 +162,7 @@
return component;
} catch (Exception ce) {
getLogger().debug("Could not access component for hint: " +
hint, ce);
- throw new ComponentException("Could not access component for
hint: " + hint, ce);
+ throw new ComponentException(ROLE, "Could not access component
for hint: " + hint, ce);
}
}
1.20 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ProgramGeneratorImpl.java 25 Jul 2002 14:00:31 -0000 1.19
+++ ProgramGeneratorImpl.java 31 Jul 2002 13:13:23 -0000 1.20
@@ -59,7 +59,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-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.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.ParameterException;
@@ -91,7 +91,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Torsten Curdt</a>
* @version CVS $Id$
*/
-public class ProgramGeneratorImpl extends AbstractLoggable
+public class ProgramGeneratorImpl extends AbstractLogEnabled
implements ProgramGenerator, Contextualizable, Composable,
Parameterizable,
Disposable, ThreadSafe {
1.20 +6 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractMarkupLanguage.java 15 Jul 2002 14:48:29 -0000 1.19
+++ AbstractMarkupLanguage.java 31 Jul 2002 13:13:23 -0000 1.20
@@ -57,7 +57,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -100,7 +100,7 @@
* @version CVS $Id$
*/
public abstract class AbstractMarkupLanguage
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements MarkupLanguage, Composable, Configurable, Parameterizable,
Recyclable, Disposable
{
@@ -204,14 +204,14 @@
NamedLogicsheet namedLogicsheet =
new NamedLogicsheet(location, manager, resolver);
- namedLogicsheet.setLogger(getLogger());
+ namedLogicsheet.enableLogging(getLogger());
namedLogicsheet.setURI(uri);
namedLogicsheet.setPrefix(prefix);
logicsheet = namedLogicsheet;
} else {
String location = params.getParameter("core-logicsheet", null);
logicsheet = new Logicsheet(location, manager, resolver);
- logicsheet.setLogger(getLogger());
+ logicsheet.enableLogging(getLogger());
}
String logicsheetName = logicsheet.getSystemId();
@@ -374,7 +374,7 @@
preprocessFilter.setParent(reader);
// Create code generator
LogicsheetCodeGenerator codeGenerator = new
LogicsheetCodeGenerator();
- codeGenerator.setLogger(getLogger());
+ codeGenerator.enableLogging(getLogger());
codeGenerator.initialize();
// set the transformer chain builder filter
TransformerChainBuilderFilter tranBuilder =
1.7 +14 -9
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java
Index: CocoonMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/CocoonMarkupLanguage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CocoonMarkupLanguage.java 29 Apr 2002 12:53:16 -0000 1.6
+++ CocoonMarkupLanguage.java 31 Jul 2002 13:13:23 -0000 1.7
@@ -50,13 +50,13 @@
*/
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.excalibur.source.SourceResolver;
-import org.apache.log.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
@@ -121,7 +121,7 @@
*/
protected XMLFilter getPreprocessFilter(String filename,
ProgrammingLanguage language) {
PreProcessFilter filter = new PreProcessFilter(filename, language);
- filter.setLogger(getLogger());
+ filter.enableLogging(getLogger());
return filter;
}
@@ -143,7 +143,7 @@
CocoonTransformerChainBuilderFilter filter =
new CocoonTransformerChainBuilderFilter(
logicsheetMarkupGenerator, resolver);
- filter.setLogger(getLogger());
+ filter.enableLogging(getLogger());
return filter;
}
@@ -199,7 +199,7 @@
*
* @see org.xml.sax.ContentHandler
*/
- public class PreProcessFilter extends XMLFilterImpl implements Loggable {
+ public class PreProcessFilter extends XMLFilterImpl implements
LogEnabled {
protected Logger log;
protected String filename;
@@ -220,7 +220,7 @@
this.language = language;
}
- public void setLogger(Logger logger) {
+ public void enableLogging(Logger logger) {
if (this.log == null) {
this.log = logger;
}
@@ -297,7 +297,7 @@
*/
public class CocoonTransformerChainBuilderFilter
extends TransformerChainBuilderFilter
- implements Loggable {
+ implements LogEnabled {
protected Logger log;
@@ -326,7 +326,12 @@
super(logicsheetMarkupGenerator, resolver);
}
- public void setLogger(Logger logger) {
+ /**
+ * Provide component with a logger.
+ *
+ * @param logger the logger
+ */
+ public void enableLogging(Logger logger) {
if (this.log == null) {
this.log = logger;
}
1.15 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Logicsheet.java 16 Jun 2002 22:33:36 -0000 1.14
+++ Logicsheet.java 31 Jul 2002 13:13:23 -0000 1.15
@@ -52,7 +52,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.excalibur.xml.xslt.XSLTProcessor;
import org.apache.avalon.excalibur.xml.xslt.XSLTProcessorException;
@@ -89,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a>
* @version CVS $Id$
*/
-public class Logicsheet extends AbstractLoggable
+public class Logicsheet extends AbstractLogEnabled
{
/**
* The Source Resolver object for this logicsheet.
1.13 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
Index: XSPMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSPMarkupLanguage.java 20 Apr 2002 03:38:34 -0000 1.12
+++ XSPMarkupLanguage.java 31 Jul 2002 13:13:23 -0000 1.13
@@ -95,7 +95,7 @@
protected XMLFilter getPreprocessFilter( String filename,
ProgrammingLanguage language )
{
PreProcessFilter filter = new PreProcessFilter(filename, language);
- filter.setLogger(getLogger());
+ filter.enableLogging(getLogger());
return filter;
}
1.8 +6 -6
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/AbstractProgrammingLanguage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractProgrammingLanguage.java 29 Mar 2002 20:32:01 -0000 1.7
+++ AbstractProgrammingLanguage.java 31 Jul 2002 13:13:24 -0000 1.8
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.ParameterException;
@@ -71,7 +71,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public abstract class AbstractProgrammingLanguage extends AbstractLoggable
+public abstract class AbstractProgrammingLanguage extends AbstractLogEnabled
implements ProgrammingLanguage, Parameterizable {
/** The source code formatter */
@@ -109,8 +109,8 @@
if (this.codeFormatter != null) {
try {
CodeFormatter formatter = (CodeFormatter)
this.codeFormatter.newInstance();
- if (formatter instanceof Loggable) {
- ((Loggable) formatter).setLogger(this.getLogger());
+ if (formatter instanceof LogEnabled) {
+ ((LogEnabled) formatter).enableLogging(this.getLogger());
}
return formatter;
} catch (Exception e) {
1.8 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java
Index: AbstractJavaCompiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/AbstractJavaCompiler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractJavaCompiler.java 29 Mar 2002 20:32:01 -0000 1.7
+++ AbstractJavaCompiler.java 31 Jul 2002 13:13:24 -0000 1.8
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.cocoon.components.language.programming.LanguageCompiler;
@@ -66,7 +66,7 @@
* @version CVS $Id$
* @since 2.0
*/
-public abstract class AbstractJavaCompiler extends AbstractLoggable
implements LanguageCompiler, Recyclable {
+public abstract class AbstractJavaCompiler extends AbstractLogEnabled
implements LanguageCompiler, Recyclable {
/**
* The source program filename
1.13 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JavaLanguage.java 25 Jul 2002 14:07:51 -0000 1.12
+++ JavaLanguage.java 31 Jul 2002 13:13:24 -0000 1.13
@@ -201,8 +201,8 @@
try {
AbstractJavaCompiler compiler = (AbstractJavaCompiler)
this.compilerClass.newInstance();
- // AbstractJavaCompiler is Loggable
- compiler.setLogger(getLogger());
+ // AbstractJavaCompiler is LogEnabled
+ compiler.enableLogging(getLogger());
int pos = name.lastIndexOf(File.separatorChar);
String filename = name.substring(pos + 1);
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java
Index: JstyleFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JstyleFormatter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JstyleFormatter.java 22 Feb 2002 07:00:09 -0000 1.5
+++ JstyleFormatter.java 31 Jul 2002 13:13:24 -0000 1.6
@@ -52,7 +52,7 @@
import jstyle.JSBeautifier;
import jstyle.JSFormatter;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.language.programming.CodeFormatter;
import java.io.*;
@@ -65,7 +65,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
* @version CVS $Id$
*/
-public class JstyleFormatter extends AbstractLoggable implements
CodeFormatter {
+public class JstyleFormatter extends AbstractLogEnabled implements
CodeFormatter {
/**
* The default preferred line length. Should be parametrized!
*/
1.5 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/NullFormatter.java
Index: NullFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/NullFormatter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NullFormatter.java 22 Feb 2002 07:00:09 -0000 1.4
+++ NullFormatter.java 31 Jul 2002 13:13:24 -0000 1.5
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.language.programming.java;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.components.language.programming.CodeFormatter;
/**
@@ -61,7 +61,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @version CVS $Id$
*/
-public class NullFormatter extends AbstractLoggable implements CodeFormatter
{
+public class NullFormatter extends AbstractLogEnabled implements
CodeFormatter {
/**
* This is a dummy <code>CodeFormatter</code>
@@ -72,7 +72,7 @@
* @return The formatted source code
*/
public String format(String code, String encoding) {
- getLogger().debug("NullFormatter called");
+ getLogger().debug("NullFormatter called");
return code;
}
}
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/database/AbstractAutoIncrementModule.java
Index: AbstractAutoIncrementModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/database/AbstractAutoIncrementModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractAutoIncrementModule.java 15 Mar 2002 15:15:08 -0000 1.1
+++ AbstractAutoIncrementModule.java 31 Jul 2002 13:13:24 -0000 1.2
@@ -55,7 +55,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.util.HashMap;
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public abstract class AbstractAutoIncrementModule extends AbstractLoggable
+public abstract class AbstractAutoIncrementModule extends AbstractLogEnabled
implements AutoIncrementModule, Configurable, Disposable {
/**
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractInputModule.java
Index: AbstractInputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/AbstractInputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractInputModule.java 15 Mar 2002 15:15:08 -0000 1.1
+++ AbstractInputModule.java 31 Jul 2002 13:13:24 -0000 1.2
@@ -55,7 +55,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.util.HashMap;
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public abstract class AbstractInputModule extends AbstractLoggable
+public abstract class AbstractInputModule extends AbstractLogEnabled
implements InputModule, Configurable, Disposable {
/**
1.4 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java
Index: CollectionMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CollectionMetaModule.java 31 May 2002 07:41:19 -0000 1.3
+++ CollectionMetaModule.java 31 Jul 2002 13:13:24 -0000 1.4
@@ -60,7 +60,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;
@@ -95,7 +95,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public class CollectionMetaModule extends AbstractLoggable
+public class CollectionMetaModule 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/DefaultsMetaModule.java
Index: DefaultsMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultsMetaModule.java 31 May 2002 07:41:19 -0000 1.1
+++ DefaultsMetaModule.java 31 Jul 2002 13:13:24 -0000 1.2
@@ -60,7 +60,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;
@@ -89,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public class DefaultsMetaModule extends AbstractLoggable
+public class DefaultsMetaModule extends AbstractLogEnabled
implements InputModule, Configurable, Initializable, Composable,
Disposable {
/** The component manager instance */
1.3 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java
Index: DigestMetaModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/input/DigestMetaModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DigestMetaModule.java 28 May 2002 13:41:28 -0000 1.2
+++ DigestMetaModule.java 31 Jul 2002 13:13:24 -0000 1.3
@@ -66,7 +66,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;
@@ -97,7 +97,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public class DigestMetaModule extends AbstractLoggable
+public class DigestMetaModule 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/output/AbstractOutputModule.java
Index: AbstractOutputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/AbstractOutputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractOutputModule.java 15 Mar 2002 15:15:08 -0000 1.1
+++ AbstractOutputModule.java 31 Jul 2002 13:13:24 -0000 1.2
@@ -55,7 +55,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.util.HashMap;
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a>
* @version CVS $Id$
*/
-public abstract class AbstractOutputModule extends AbstractLoggable
+public abstract class AbstractOutputModule extends AbstractLogEnabled
implements OutputModule, Configurable, Disposable {
/**
1.3 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
Index: RequestAttributeOutputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestAttributeOutputModule.java 28 May 2002 13:41:29 -0000 1.2
+++ RequestAttributeOutputModule.java 31 Jul 2002 13:13:24 -0000 1.3
@@ -55,7 +55,6 @@
import java.util.Map;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.configuration.Configuration;
/**
1.3 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
Index: SessionAttributeOutputModule.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionAttributeOutputModule.java 28 May 2002 13:41:29 -0000 1.2
+++ SessionAttributeOutputModule.java 31 Jul 2002 13:13:24 -0000 1.3
@@ -55,7 +55,6 @@
import java.util.Map;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.configuration.Configuration;
/**
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/profiler/SimpleProfiler.java
Index: SimpleProfiler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/profiler/SimpleProfiler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleProfiler.java 22 Feb 2002 07:00:11 -0000 1.4
+++ SimpleProfiler.java 31 Jul 2002 13:13:24 -0000 1.5
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.profiler;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import java.util.Collection;
@@ -64,7 +64,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public class SimpleProfiler extends AbstractLoggable
+public class SimpleProfiler extends AbstractLogEnabled
implements Profiler, ThreadSafe //, Composable, Configurable, Disposable
{
private static final int RESULTS_COUNT = 10;
1.11 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java
Index: ResolverImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/resolver/ResolverImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResolverImpl.java 16 Jun 2002 05:35:51 -0000 1.10
+++ ResolverImpl.java 31 Jul 2002 13:13:25 -0000 1.11
@@ -61,7 +61,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-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;
@@ -94,8 +94,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Crossley</a>
* @version CVS $Id$
*/
-public class ResolverImpl
- extends AbstractLoggable
+public class ResolverImpl extends AbstractLogEnabled
implements EntityResolver,
Resolver,
Contextualizable,
1.8 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java
Index: SimpleLuceneCocoonIndexerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/SimpleLuceneCocoonIndexerImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SimpleLuceneCocoonIndexerImpl.java 18 Apr 2002 12:56:41 -0000
1.7
+++ SimpleLuceneCocoonIndexerImpl.java 31 Jul 2002 13:13:25 -0000
1.8
@@ -65,7 +65,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
@@ -91,7 +91,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
* @version CVS $Id$
*/
-public class SimpleLuceneCocoonIndexerImpl extends AbstractLoggable
+public class SimpleLuceneCocoonIndexerImpl extends AbstractLogEnabled
implements LuceneCocoonIndexer, Configurable, Composable, Disposable
{
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java
Index: SimpleLuceneCocoonSearcherImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleLuceneCocoonSearcherImpl.java 22 Feb 2002 07:00:12 -0000
1.5
+++ SimpleLuceneCocoonSearcherImpl.java 31 Jul 2002 13:13:25 -0000
1.6
@@ -63,7 +63,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.util.ClassUtils;
@@ -99,7 +99,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
* @version CVS $Id$
*/
-public class SimpleLuceneCocoonSearcherImpl extends AbstractLoggable
+public class SimpleLuceneCocoonSearcherImpl extends AbstractLogEnabled
implements LuceneCocoonSearcher, Configurable, Composable,
Disposable, Recyclable
{
1.12 +4 -7
xml-cocoon2/src/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java
Index: SimpleLuceneXMLIndexerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/search/SimpleLuceneXMLIndexerImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SimpleLuceneXMLIndexerImpl.java 22 Jul 2002 22:55:43 -0000 1.11
+++ SimpleLuceneXMLIndexerImpl.java 31 Jul 2002 13:13:25 -0000 1.12
@@ -71,9 +71,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-
-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;
import org.apache.cocoon.ProcessingException;
@@ -98,9 +96,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Bernhard Huber</a>
* @version CVS $Id$
*/
-public class SimpleLuceneXMLIndexerImpl extends AbstractLoggable
- implements LuceneXMLIndexer, Configurable, Composable, ThreadSafe
-{
+public class SimpleLuceneXMLIndexerImpl extends AbstractLogEnabled
+ implements LuceneXMLIndexer, Configurable, Composable, ThreadSafe {
/**
* The component manager instance
1.7 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractSAXSource.java
Index: AbstractSAXSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractSAXSource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractSAXSource.java 4 Jun 2002 07:11:27 -0000 1.6
+++ AbstractSAXSource.java 31 Jul 2002 13:13:25 -0000 1.7
@@ -53,13 +53,14 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.ModifiableSource;
import org.apache.cocoon.serialization.Serializer;
-import org.apache.log.Logger;
import org.xml.sax.InputSource;
import org.xml.sax.ContentHandler;
1.5 +9 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractStreamSource.java
Index: AbstractStreamSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractStreamSource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractStreamSource.java 4 Jun 2002 07:11:27 -0000 1.4
+++ AbstractStreamSource.java 31 Jul 2002 13:13:25 -0000 1.5
@@ -56,19 +56,24 @@
package org.apache.cocoon.components.source;
import org.apache.avalon.excalibur.xml.Parser;
+
import org.apache.excalibur.source.SourceParameters;
import org.apache.excalibur.source.SourceUtil;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.ComponentManager;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ModifiableSource;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.xml.XMLConsumer;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
import org.w3c.dom.Document;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -81,6 +86,7 @@
import java.net.URL;
import java.util.Iterator;
import java.util.Properties;
+
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
@@ -104,7 +110,7 @@
* @version $Id$
*/
-public abstract class AbstractStreamSource extends AbstractLoggable
+public abstract class AbstractStreamSource extends AbstractLogEnabled
implements ModifiableSource {
// FIXME(SW) : this implements *Modifiable*Source just to call refresh()
// if JTidy fails. Can we avoid this ?
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/CocoonSourceFactory.java
Index: CocoonSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/CocoonSourceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CocoonSourceFactory.java 22 Feb 2002 07:00:13 -0000 1.4
+++ CocoonSourceFactory.java 31 Jul 2002 13:13:25 -0000 1.5
@@ -51,7 +51,7 @@
package org.apache.cocoon.components.source;
import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
@@ -71,7 +71,7 @@
*/
public final class CocoonSourceFactory
-extends AbstractLoggable
+extends AbstractLogEnabled
implements SourceFactory {
/** The processor */
1.3 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/components/source/FileSourceFactory.java
Index: FileSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/FileSourceFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileSourceFactory.java 14 Mar 2002 12:55:10 -0000 1.2
+++ FileSourceFactory.java 31 Jul 2002 13:13:25 -0000 1.3
@@ -58,7 +58,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.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceFactory;
@@ -77,7 +77,7 @@
* @version $Id$
*/
-public class FileSourceFactory extends AbstractLoggable
+public class FileSourceFactory extends AbstractLogEnabled
implements SourceFactory, Composable, ThreadSafe {
private ComponentManager manager;
@@ -98,4 +98,4 @@
return getSource(environment, new URL(base,
location).toExternalForm());
}
}
-
\ No newline at end of file
+
1.21 +5 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SitemapSource.java 4 Jul 2002 07:12:20 -0000 1.20
+++ SitemapSource.java 31 Jul 2002 13:13:25 -0000 1.21
@@ -53,7 +53,10 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.excalibur.source.SourceException;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
@@ -70,7 +73,6 @@
import org.apache.cocoon.xml.ContentHandlerWrapper;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.log.Logger;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -142,7 +144,7 @@
throws IOException, ProcessingException {
this.manager = manager;
- this.setLogger(logger);
+ this.enableLogging(logger);
boolean rawMode = false;
// remove the protocol
1.5 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceHandler.java
Index: SourceHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SourceHandler.java 26 Apr 2002 10:42:16 -0000 1.4
+++ SourceHandler.java 31 Jul 2002 13:13:25 -0000 1.5
@@ -87,7 +87,7 @@
* Add a new source factory.
* The factory is initialized by the handler, this means the
* handler test for the Avalon interfaces <code>Composable</code>,
- * <code>Contextualizable</code> and <code>Loggable</code>.
+ * <code>Contextualizable</code> and <code>LogEnabled</code>.
* When the handler is disposed it should also test the
* <code>Disposable</code> interface.
* If a factory with the protocol already exists it is
1.10 +11 -9
xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceHandlerImpl.java
Index: SourceHandlerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SourceHandlerImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SourceHandlerImpl.java 26 Apr 2002 10:42:16 -0000 1.9
+++ SourceHandlerImpl.java 31 Jul 2002 13:13:25 -0000 1.10
@@ -61,9 +61,10 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.environment.Environment;
@@ -83,9 +84,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version $Id$
*/
-public final class SourceHandlerImpl
-extends AbstractLoggable
-implements Configurable, Disposable, Composable, Contextualizable,
SourceHandler {
+public final class SourceHandlerImpl extends AbstractLogEnabled
+ implements Configurable, Disposable, Composable, Contextualizable,
SourceHandler {
/** The component manager */
private ComponentManager manager;
@@ -181,7 +181,9 @@
// default implementation
Source result = new URLSource(this.urlFactory.getURL(location),
this.manager);
- this.setupLogger(result);
+ if (result instanceof LogEnabled) {
+ ((LogEnabled)result).enableLogging(getLogger());
+ }
return result;
}
@@ -225,8 +227,8 @@
*/
private void init(SourceFactory factory, Configuration config)
throws ContextException, ComponentException, ConfigurationException {
- if (factory instanceof Loggable) {
- ((Loggable) factory).setLogger(getLogger());
+ if (factory instanceof LogEnabled) {
+ ((LogEnabled) factory).enableLogging(getLogger());
}
if (factory instanceof Contextualizable) {
((Contextualizable) factory).contextualize (this.context);
1.8 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java
Index: XMLDBSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLDBSource.java 22 Feb 2002 07:00:13 -0000 1.7
+++ XMLDBSource.java 31 Jul 2002 13:13:25 -0000 1.8
@@ -52,6 +52,8 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.xml.IncludeXMLConsumer;
@@ -59,7 +61,6 @@
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.ModifiableSource;
import org.apache.cocoon.serialization.Serializer;
-import org.apache.log.Logger;
import org.xmldb.api.DatabaseManager;
import org.xmldb.api.base.Collection;
1.5 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSourceFactory.java
Index: XMLDBSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/XMLDBSourceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDBSourceFactory.java 22 Feb 2002 07:00:13 -0000 1.4
+++ XMLDBSourceFactory.java 31 Jul 2002 13:13:25 -0000 1.5
@@ -55,7 +55,8 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.Source;
@@ -77,7 +78,7 @@
*/
public final class XMLDBSourceFactory
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements SourceFactory, Configurable, Composable {
1.2 +7 -4
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/CocoonSourceFactory.java
Index: CocoonSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/CocoonSourceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CocoonSourceFactory.java 24 Apr 2002 09:59:48 -0000 1.1
+++ CocoonSourceFactory.java 31 Jul 2002 13:13:25 -0000 1.2
@@ -53,12 +53,15 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Map;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceFactory;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.Processor;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.environment.Environment;
@@ -73,7 +76,7 @@
*/
public final class CocoonSourceFactory
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements SourceFactory, ThreadSafe, Composable
{
/** The <code>ComponentManager</code> */
1.16 +5 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SitemapSource.java 4 Jul 2002 07:12:21 -0000 1.15
+++ SitemapSource.java 31 Jul 2002 13:13:25 -0000 1.16
@@ -55,11 +55,14 @@
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.AggregatedValidity;
+
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.excalibur.xml.XMLizable;
+
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
@@ -76,7 +79,6 @@
import org.apache.cocoon.xml.ContentHandlerWrapper;
import org.apache.cocoon.xml.XMLConsumer;
import org.apache.cocoon.xml.XMLProducer;
-import org.apache.log.Logger;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -153,7 +155,7 @@
throws MalformedURLException {
this.manager = manager;
- this.setLogger(logger);
+ this.enableLogging(logger);
boolean rawMode = false;
// remove the protocol
1.2 +9 -7
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SourceFactoryWrapper.java
Index: SourceFactoryWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SourceFactoryWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceFactoryWrapper.java 24 Apr 2002 12:05:59 -0000 1.1
+++ SourceFactoryWrapper.java 31 Jul 2002 13:13:25 -0000 1.2
@@ -53,8 +53,10 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Map;
+
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceFactory;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -66,9 +68,10 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.environment.Environment;
@@ -82,9 +85,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
*/
-
public final class SourceFactoryWrapper
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements SourceFactory,
ThreadSafe,
Configurable,
@@ -183,8 +185,8 @@
private void init(org.apache.cocoon.components.source.SourceFactory
factory,
Configuration config)
throws ContextException, ComponentException, ConfigurationException {
- if (factory instanceof Loggable) {
- ((Loggable) factory).setLogger(getLogger());
+ if (factory instanceof LogEnabled) {
+ ((LogEnabled) factory).enableLogging(getLogger());
}
if (factory instanceof Contextualizable) {
((Contextualizable) factory).contextualize (this.context);
1.2 +9 -6
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/URLFactoryWrapper.java
Index: URLFactoryWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/URLFactoryWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLFactoryWrapper.java 29 Apr 2002 09:31:40 -0000 1.1
+++ URLFactoryWrapper.java 31 Jul 2002 13:13:25 -0000 1.2
@@ -54,9 +54,11 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
+
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.impl.URLSource;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
@@ -68,9 +70,10 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.environment.Environment;
@@ -87,7 +90,7 @@
*/
public final class URLFactoryWrapper
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements SourceFactory,
ThreadSafe,
Configurable,
@@ -179,8 +182,8 @@
private void init(URLFactory factory,
Configuration config)
throws ContextException, ComponentException, ConfigurationException {
- if (factory instanceof Loggable) {
- ((Loggable) factory).setLogger(getLogger());
+ if (factory instanceof LogEnabled) {
+ ((LogEnabled) factory).enableLogging(getLogger());
}
if (factory instanceof Contextualizable) {
((Contextualizable) factory).contextualize (this.context);
1.17 +4 -5
xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FilesystemStore.java 4 Jul 2002 15:48:20 -0000 1.16
+++ FilesystemStore.java 31 Jul 2002 13:13:26 -0000 1.17
@@ -53,7 +53,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -77,9 +77,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public final class FilesystemStore
-extends AbstractLoggable
-implements Store, Contextualizable, Parameterizable, ThreadSafe {
+public final class FilesystemStore extends AbstractLogEnabled
+ implements Store, Contextualizable, Parameterizable, ThreadSafe {
protected File workDir;
protected File cacheDir;
1.4 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/components/store/JispFilesystemStore.java
Index: JispFilesystemStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/JispFilesystemStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JispFilesystemStore.java 6 May 2002 12:28:50 -0000 1.3
+++ JispFilesystemStore.java 31 Jul 2002 13:13:26 -0000 1.4
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -83,13 +83,12 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public final class JispFilesystemStore
-extends AbstractLoggable
-implements org.apache.excalibur.store.Store,
- Contextualizable,
- ThreadSafe,
- Initializable,
- Parameterizable {
+public final class JispFilesystemStore extends AbstractLogEnabled
+ implements org.apache.excalibur.store.Store,
+ Contextualizable,
+ ThreadSafe,
+ Initializable,
+ Parameterizable {
protected File workDir;
protected File cacheDir;
1.17 +4 -5
xml-cocoon2/src/java/org/apache/cocoon/components/store/MRUMemoryStore.java
Index: MRUMemoryStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/MRUMemoryStore.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MRUMemoryStore.java 6 May 2002 12:28:50 -0000 1.16
+++ MRUMemoryStore.java 31 Jul 2002 13:13:26 -0000 1.17
@@ -54,7 +54,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.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -84,9 +84,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public final class MRUMemoryStore
-extends AbstractLoggable
-implements Store, Parameterizable, Composable, Disposable, ThreadSafe {
+public final class MRUMemoryStore extends AbstractLogEnabled
+ implements Store, Parameterizable, Composable, Disposable, ThreadSafe {
private int maxobjects;
private boolean persistent;
1.14 +8 -9
xml-cocoon2/src/java/org/apache/cocoon/components/store/StoreJanitorImpl.java
Index: StoreJanitorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/StoreJanitorImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StoreJanitorImpl.java 6 May 2002 12:28:51 -0000 1.13
+++ StoreJanitorImpl.java 31 Jul 2002 13:13:26 -0000 1.14
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -73,13 +73,12 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Royal</a>
* @version CVS $Id$
*/
-public class StoreJanitorImpl
-extends AbstractLoggable
-implements StoreJanitor,
- Configurable,
- ThreadSafe,
- Runnable,
- Startable {
+public class StoreJanitorImpl extends AbstractLogEnabled
+ implements StoreJanitor,
+ Configurable,
+ ThreadSafe,
+ Runnable,
+ Startable {
private int freememory = -1;
private int heapsize = -1;
1.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNodeBuilder.java
Index: AbstractParentProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractParentProcessingNodeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractParentProcessingNodeBuilder.java 5 Mar 2002 08:26:22 -0000
1.1
+++ AbstractParentProcessingNodeBuilder.java 31 Jul 2002 13:13:26 -0000
1.2
@@ -54,8 +54,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-
import org.apache.cocoon.util.StringUtils;
import java.util.*;
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNode.java
Index: AbstractProcessingNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractProcessingNode.java 5 Mar 2002 08:26:22 -0000 1.1
+++ AbstractProcessingNode.java 31 Jul 2002 13:13:26 -0000 1.2
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.environment.SourceResolver;
@@ -62,7 +62,7 @@
* @version CVS $Id$
*/
-public abstract class AbstractProcessingNode extends AbstractLoggable
implements ProcessingNode {
+public abstract class AbstractProcessingNode extends AbstractLogEnabled
implements ProcessingNode {
protected String location = "unknown location";
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java
Index: AbstractProcessingNodeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/AbstractProcessingNodeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractProcessingNodeBuilder.java 25 Jun 2002 07:55:13 -0000
1.5
+++ AbstractProcessingNodeBuilder.java 31 Jul 2002 13:13:26 -0000
1.6
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.treeprocessor;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.component.ComponentManager;
@@ -74,7 +74,7 @@
*/
-public abstract class AbstractProcessingNodeBuilder extends AbstractLoggable
+public abstract class AbstractProcessingNodeBuilder extends
AbstractLogEnabled
implements ProcessingNodeBuilder, Recomposable {
protected TreeBuilder treeBuilder;
1.11 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
Index: DefaultTreeBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultTreeBuilder.java 24 Jun 2002 20:32:18 -0000 1.10
+++ DefaultTreeBuilder.java 31 Jul 2002 13:13:26 -0000 1.11
@@ -77,7 +77,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.ExtendedComponentSelector;
import org.apache.cocoon.components.LifecycleHelper;
@@ -99,7 +99,7 @@
* @version CVS $Id$
*/
-public class DefaultTreeBuilder extends AbstractLoggable implements
TreeBuilder,
+public class DefaultTreeBuilder extends AbstractLogEnabled implements
TreeBuilder,
Recomposable, Configurable, Contextualizable, LogKitManageable,
RoleManageable, Recyclable, Disposable {
/**
1.12 +9 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
Index: InvokeContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- InvokeContext.java 24 Jun 2002 20:32:18 -0000 1.11
+++ InvokeContext.java 31 Jul 2002 13:13:26 -0000 1.12
@@ -56,12 +56,13 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.environment.Environment;
-import org.apache.log.Logger;
import java.util.*;
@@ -80,7 +81,7 @@
* @version CVS $Id$
*/
-public class InvokeContext implements Recomposable, Disposable, Loggable {
+public class InvokeContext implements Recomposable, Disposable, LogEnabled {
private List mapStack = new ArrayList();
@@ -126,9 +127,11 @@
}
/**
- * Loggable interface
+ * Provide component with a logger.
+ *
+ * @param logger the logger
*/
- public void setLogger(Logger logger) {
+ public void enableLogging(Logger logger) {
this.logger = logger;
}
1.20 +6 -6
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TreeProcessor.java 4 Jul 2002 11:46:06 -0000 1.19
+++ TreeProcessor.java 31 Jul 2002 13:13:26 -0000 1.20
@@ -73,7 +73,7 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Processor;
@@ -98,7 +98,7 @@
*/
public class TreeProcessor
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements ThreadSafe,
Processor,
Composable,
@@ -205,7 +205,7 @@
// FIXME(VG): Why child isn't configure()d/contextualize(d)/etc ???
TreeProcessor child = new TreeProcessor(this, manager, language);
- child.setLogger(getLogger());
+ child.enableLogging(getLogger());
child.source = new DelayedRefreshSourceWrapper(source,
lastModifiedDelay);
return child;
}
@@ -303,7 +303,7 @@
public boolean process(Environment environment) throws Exception {
InvokeContext context = new InvokeContext();
- context.setLogger(getLogger());
+ context.enableLogging(getLogger());
try {
return process(environment, context);
@@ -340,7 +340,7 @@
throws Exception {
InvokeContext context = new InvokeContext( true );
- context.setLogger(getLogger());
+ context.enableLogging(getLogger());
CocoonComponentManager.enterEnvironment(environment,
environment.getObjectModel(), this);
environment.setComponentManager(this.manager);
1.12 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Index: PipelineNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PipelineNode.java 24 Jun 2002 20:32:19 -0000 1.11
+++ PipelineNode.java 31 Jul 2002 13:13:26 -0000 1.12
@@ -200,7 +200,7 @@
// Build a new context
errorContext = new InvokeContext();
- errorContext.setLogger(getLogger());
+ errorContext.enableLogging(getLogger());
errorContext.compose(this.manager);
// Create a Notifying
1.6 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/url/ContextURLFactory.java
Index: ContextURLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/ContextURLFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextURLFactory.java 26 Apr 2002 11:01:33 -0000 1.5
+++ ContextURLFactory.java 31 Jul 2002 13:13:26 -0000 1.6
@@ -52,7 +52,8 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Context;
@@ -65,7 +66,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @version $Id$
*/
-public class ContextURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
+public class ContextURLFactory extends AbstractLogEnabled implements
URLFactory, Contextualizable {
/**
* The context
1.5 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/components/url/ResourceURLFactory.java
Index: ResourceURLFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/ResourceURLFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ResourceURLFactory.java 26 Apr 2002 11:01:33 -0000 1.4
+++ ResourceURLFactory.java 31 Jul 2002 13:13:26 -0000 1.5
@@ -53,7 +53,8 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
import org.apache.cocoon.util.ClassUtils;
import java.net.MalformedURLException;
@@ -65,7 +66,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @version $Id$
*/
-public class ResourceURLFactory extends AbstractLoggable implements
URLFactory, Contextualizable {
+public class ResourceURLFactory extends AbstractLogEnabled implements
URLFactory, Contextualizable {
/**
* The context
1.8 +7 -8
xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactoryImpl.java
Index: URLFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactoryImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- URLFactoryImpl.java 31 May 2002 14:22:38 -0000 1.7
+++ URLFactoryImpl.java 31 Jul 2002 13:13:26 -0000 1.8
@@ -61,8 +61,8 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.ParameterException;
@@ -84,9 +84,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @version $Id$
*/
-public class URLFactoryImpl
-extends AbstractLoggable
-implements ThreadSafe, Configurable, Disposable, Composable,
Contextualizable, URLFactory {
+public class URLFactoryImpl extends AbstractLogEnabled
+ implements ThreadSafe, Configurable, Disposable, Composable,
Contextualizable, URLFactory {
/**
* The context
@@ -229,8 +228,8 @@
*/
private void init(URLFactory factory, Configuration config)
throws ContextException, ComponentException, ConfigurationException,
ParameterException {
- if (factory instanceof Loggable) {
- ((Loggable) factory).setLogger(getLogger());
+ if (factory instanceof LogEnabled) {
+ ((LogEnabled) factory).enableLogging(getLogger());
}
if (factory instanceof Contextualizable) {
((Contextualizable) factory).contextualize (this.context);
1.10 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java
Index: JaxenProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xpath/JaxenProcessorImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JaxenProcessorImpl.java 27 Jun 2002 19:04:55 -0000 1.9
+++ JaxenProcessorImpl.java 31 Jul 2002 13:13:26 -0000 1.10
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.xpath;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.jaxen.dom.DOMXPath;
@@ -76,7 +76,7 @@
* @version CVS $Id$
*/
public class JaxenProcessorImpl
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements XPathProcessor, ThreadSafe
{
/**
1.8 +4 -6
xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xpath/XPathProcessorImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XPathProcessorImpl.java 13 Mar 2002 16:28:02 -0000 1.7
+++ XPathProcessorImpl.java 31 Jul 2002 13:13:26 -0000 1.8
@@ -51,7 +51,7 @@
package org.apache.cocoon.components.xpath;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -72,10 +72,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @version CVS $Id$
*/
-public class XPathProcessorImpl
- extends AbstractLoggable
- implements XPathProcessor, ThreadSafe
-{
+public class XPathProcessorImpl extends AbstractLogEnabled
+ implements XPathProcessor, ThreadSafe {
/**
* Use an XPath string to select a single node. XPath namespace
* prefixes are resolved from the context node, which may not
1.10 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
Index: XScriptManagerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XScriptManagerImpl.java 30 Jul 2002 01:18:30 -0000 1.9
+++ XScriptManagerImpl.java 31 Jul 2002 13:13:26 -0000 1.10
@@ -54,7 +54,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.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
@@ -78,7 +78,7 @@
* @since August 4, 2001
*/
public class XScriptManagerImpl
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements XScriptManager, Composable, Component, Parameterizable,
Contextualizable, ThreadSafe
{
public static final String CONTEXT =
"org.apache.cocoon.components.xscript.scope";
1.25 +7 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AbstractEnvironment.java 15 Jul 2002 11:32:35 -0000 1.24
+++ AbstractEnvironment.java 31 Jul 2002 13:13:27 -0000 1.25
@@ -51,14 +51,18 @@
package org.apache.cocoon.environment;
import org.apache.avalon.excalibur.collections.IteratorEnumeration;
+
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.components.source.SourceUtil;
+
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.xmlizer.XMLizer;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -77,7 +81,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
*/
-public abstract class AbstractEnvironment extends AbstractLoggable
implements Environment {
+public abstract class AbstractEnvironment extends AbstractLogEnabled
implements Environment {
/** The current uri in progress */
protected String uris;
1.5 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/environment/ForwardRedirector.java
Index: ForwardRedirector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/ForwardRedirector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ForwardRedirector.java 28 May 2002 14:03:18 -0000 1.4
+++ ForwardRedirector.java 31 Jul 2002 13:13:27 -0000 1.5
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.environment;
-import org.apache.log.Logger;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
@@ -69,7 +69,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @version CVS $Id$
*/
-public class ForwardRedirector extends AbstractLoggable implements
Redirector {
+public class ForwardRedirector extends AbstractLogEnabled implements
Redirector {
/** Was there a call to <code>redirect()</code> ? */
private boolean hasRedirected = false;
1.9 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
Index: AbstractCommandLineEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractCommandLineEnvironment.java 13 Jun 2002 09:28:15 -0000
1.8
+++ AbstractCommandLineEnvironment.java 31 Jul 2002 13:13:27 -0000
1.9
@@ -50,6 +50,8 @@
*/
package org.apache.cocoon.environment.commandline;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.AbstractEnvironment;
@@ -57,7 +59,6 @@
import org.apache.cocoon.environment.Session;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import org.apache.log.Logger;
import org.xml.sax.SAXException;
import java.io.File;
@@ -89,7 +90,7 @@
Logger log)
throws MalformedURLException {
super(uri, view, context);
- this.setLogger(log);
+ this.enableLogging(log);
this.stream = stream;
}
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/CommandlineContext.java
Index: CommandlineContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/CommandlineContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandlineContext.java 22 Feb 2002 07:03:50 -0000 1.6
+++ CommandlineContext.java 31 Jul 2002 13:13:27 -0000 1.7
@@ -51,7 +51,7 @@
package org.apache.cocoon.environment.commandline;
import org.apache.avalon.excalibur.collections.IteratorEnumeration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.cocoon.environment.Context;
import java.io.File;
@@ -69,7 +69,7 @@
* @version CVS $Id$
*/
-public class CommandlineContext extends AbstractLoggable implements Context {
+public class CommandlineContext extends AbstractLogEnabled implements
Context {
/** The context directory path*/
private String contextDir;
1.6 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java
Index: FileSavingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/FileSavingEnvironment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileSavingEnvironment.java 22 Feb 2002 07:03:50 -0000 1.5
+++ FileSavingEnvironment.java 31 Jul 2002 13:13:28 -0000 1.6
@@ -50,9 +50,10 @@
*/
package org.apache.cocoon.environment.commandline;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.log.Logger;
import java.io.File;
import java.io.OutputStream;
1.8 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java
Index: LinkSamplingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/commandline/LinkSamplingEnvironment.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LinkSamplingEnvironment.java 22 Feb 2002 07:03:50 -0000 1.7
+++ LinkSamplingEnvironment.java 31 Jul 2002 13:13:28 -0000 1.8
@@ -50,9 +50,10 @@
*/
package org.apache.cocoon.environment.commandline;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.log.Logger;
import java.io.*;
import java.net.MalformedURLException;
1.19 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- EnvironmentWrapper.java 4 Jul 2002 07:12:21 -0000 1.18
+++ EnvironmentWrapper.java 31 Jul 2002 13:13:29 -0000 1.19
@@ -51,6 +51,8 @@
package org.apache.cocoon.environment.wrapper;
import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.logger.Logger;
+
import org.apache.cocoon.Processor;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.CocoonComponentManager;
@@ -58,7 +60,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.log.Logger;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import java.io.IOException;
@@ -145,7 +146,7 @@
throws MalformedURLException {
super(env.getURI(), env.getView(), env.getRootContext(),
env.getAction());
this.setComponents(env.getSourceResolver(), null);
- this.setLogger(logger);
+ this.enableLogging(logger);
this.environment = env;
this.manager = manager;
1.18 +2 -5
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ServerPagesGenerator.java 19 Jul 2002 13:09:31 -0000 1.17
+++ ServerPagesGenerator.java 31 Jul 2002 13:13:29 -0000 1.18
@@ -56,7 +56,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
@@ -217,9 +216,7 @@
}
// Give our own logger to the generator so that logs go in the
correct category
- if (generator instanceof Loggable) {
- ((Loggable) generator).setLogger(getLogkitLogger());
- } else if (generator instanceof LogEnabled) {
+ if (generator instanceof LogEnabled) {
((LogEnabled) generator).enableLogging(getLogger());
}
1.5 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java
Index: AbstractPreparableMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractPreparableMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractPreparableMatcher.java 22 Feb 2002 07:03:52 -0000 1.4
+++ AbstractPreparableMatcher.java 31 Jul 2002 13:13:29 -0000 1.5
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.sitemap.PatternException;
@@ -65,7 +65,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @version CVS $Id$
*/
-public abstract class AbstractPreparableMatcher extends AbstractLoggable
implements PreparableMatcher {
+public abstract class AbstractPreparableMatcher extends AbstractLogEnabled
implements PreparableMatcher {
/**
* Match the pattern by preparing it and matching the prepared pattern.
@@ -74,4 +74,4 @@
throws PatternException {
return preparedMatch(preparePattern(pattern), objectModel,
parameters);
}
-}
\ No newline at end of file
+}
1.5 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java
Index: AbstractWildcardMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/AbstractWildcardMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractWildcardMatcher.java 22 Feb 2002 07:03:52 -0000 1.4
+++ AbstractWildcardMatcher.java 31 Jul 2002 13:13:29 -0000 1.5
@@ -51,7 +51,6 @@
package org.apache.cocoon.matching;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -60,7 +59,6 @@
import java.util.HashMap;
import java.util.Map;
-
/**
* Base class for wildcard matchers
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/matching/CookieMatcher.java
Index: CookieMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/CookieMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CookieMatcher.java 11 Jun 2002 23:54:54 -0000 1.2
+++ CookieMatcher.java 31 Jul 2002 13:13:29 -0000 1.3
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Cookie;
@@ -66,7 +66,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Maciek Kaminski</a>
*/
-public class CookieMatcher extends AbstractLoggable implements Matcher {
+public class CookieMatcher extends AbstractLogEnabled implements Matcher {
public Map match(String pattern, Map objectModel, Parameters parameters)
throws PatternException {
1.7 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java
Index: RegexpURIMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RegexpURIMatcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RegexpURIMatcher.java 6 Jun 2002 14:43:41 -0000 1.6
+++ RegexpURIMatcher.java 31 Jul 2002 13:13:29 -0000 1.7
@@ -50,19 +50,15 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.sitemap.PatternException;
import org.apache.regexp.RE;
import org.apache.regexp.RECompiler;
import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
-import java.util.HashMap;
import java.util.Map;
/**
1.7 +5 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/RequestParamMatcher.java
Index: RequestParamMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/RequestParamMatcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestParamMatcher.java 22 Feb 2002 07:03:52 -0000 1.6
+++ RequestParamMatcher.java 31 Jul 2002 13:13:29 -0000 1.7
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
@@ -59,9 +59,9 @@
* @version CVS $Id$
*/
public class RequestParamMatcher extends RequestParameterMatcher
- implements Loggable
+ implements LogEnabled
{
- public void setLogger(Logger logger) {
+ public void enableLogging(Logger logger) {
logger.warn("RequestParamMatcher is deprecated. Please use
RequestParameterMatcher");
}
}
1.6 +1 -5
xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java
Index: WildcardURIMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/matching/WildcardURIMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WildcardURIMatcher.java 22 Feb 2002 07:03:52 -0000 1.5
+++ WildcardURIMatcher.java 31 Jul 2002 13:13:29 -0000 1.6
@@ -50,14 +50,10 @@
*/
package org.apache.cocoon.matching;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
-import java.util.HashMap;
import java.util.Map;
/**
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractReader.java 27 Jun 2002 12:28:51 -0000 1.6
+++ AbstractReader.java 31 Jul 2002 13:13:29 -0000 1.7
@@ -51,7 +51,7 @@
package org.apache.cocoon.reading;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+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 AbstractLoggable
+ extends AbstractLogEnabled
implements Reader, Recyclable {
/** The current <code>SourceResolver</code>. */
1.5 +11 -6
xml-cocoon2/src/java/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Index: ParentComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/samples/parentcm/ParentComponentManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParentComponentManager.java 22 Feb 2002 07:03:54 -0000 1.4
+++ ParentComponentManager.java 31 Jul 2002 13:13:30 -0000 1.5
@@ -58,8 +58,8 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import javax.naming.Context;
import java.util.Hashtable;
@@ -72,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a>
* @version CVS $Id$
*/
-public class ParentComponentManager implements ComponentManager, Loggable,
Initializable {
+public class ParentComponentManager implements ComponentManager, LogEnabled,
Initializable {
/**
* Our logger.
@@ -125,7 +125,7 @@
// We ignore the setRoleManager call, as ExcaliburComponentManager
handles that
// in configure().
- this.delegate.setLogger(logger);
+ this.delegate.enableLogging(logger);
this.delegate.contextualize(new DefaultContext());
this.delegate.configure(config);
this.delegate.initialize();
@@ -141,7 +141,12 @@
this.delegate.release(component);
}
- public void setLogger(final Logger logger) {
+ /**
+ * Provide component with a logger.
+ *
+ * @param logger the logger
+ */
+ public void enableLogging(Logger logger) {
this.logger = logger;
}
}
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
Index: AbstractSwitchSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSwitchSelector.java 17 Apr 2002 21:50:46 -0000 1.1
+++ AbstractSwitchSelector.java 31 Jul 2002 13:13:30 -0000 1.2
@@ -52,7 +52,7 @@
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import java.util.Map;
/**
@@ -62,7 +62,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @version CVS $Id$
*/
-public abstract class AbstractSwitchSelector extends AbstractLoggable
+public abstract class AbstractSwitchSelector extends AbstractLogEnabled
implements SwitchSelector {
/**
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/selection/CookieSelector.java
Index: CookieSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/CookieSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CookieSelector.java 5 Mar 2002 01:09:20 -0000 1.1
+++ CookieSelector.java 31 Jul 2002 13:13:30 -0000 1.2
@@ -53,7 +53,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -75,7 +75,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Matteo Di Giovinazzo</a>
*/
-public class CookieSelector extends AbstractLoggable
+public class CookieSelector extends AbstractLogEnabled
implements Configurable, Selector, ThreadSafe {
protected String defaultName;
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/selection/HeaderSelector.java
Index: HeaderSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/HeaderSelector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HeaderSelector.java 22 Feb 2002 07:03:54 -0000 1.4
+++ HeaderSelector.java 31 Jul 2002 13:13:30 -0000 1.5
@@ -53,7 +53,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -75,7 +75,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @version CVS $Id$
*/
-public class HeaderSelector extends AbstractLoggable
+public class HeaderSelector extends AbstractLogEnabled
implements Configurable, ThreadSafe, Selector {
protected String defaultName;
1.7 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java
Index: HostSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/HostSelector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HostSelector.java 30 Jun 2002 23:26:57 -0000 1.6
+++ HostSelector.java 31 Jul 2002 13:13:30 -0000 1.7
@@ -50,13 +50,10 @@
*/
package org.apache.cocoon.selection;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java
Index: NamedPatternsSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/NamedPatternsSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NamedPatternsSelector.java 22 Feb 2002 07:03:54 -0000 1.5
+++ NamedPatternsSelector.java 31 Jul 2002 13:13:30 -0000 1.6
@@ -53,7 +53,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -72,7 +72,7 @@
* @version CVS $Id$
*/
-public abstract class NamedPatternsSelector extends AbstractLoggable
+public abstract class NamedPatternsSelector extends AbstractLogEnabled
implements Configurable, ThreadSafe, Selector {
/**
1.7 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/selection/RequestAttributeSelector.java
Index: RequestAttributeSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestAttributeSelector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RequestAttributeSelector.java 22 Feb 2002 07:03:54 -0000 1.6
+++ RequestAttributeSelector.java 31 Jul 2002 13:13:30 -0000 1.7
@@ -53,7 +53,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public class RequestAttributeSelector extends AbstractLoggable
+public class RequestAttributeSelector extends AbstractLogEnabled
implements Configurable, ThreadSafe, Selector {
protected String defaultName;
1.3 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/selection/RequestMethodSelector.java
Index: RequestMethodSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/RequestMethodSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestMethodSelector.java 23 Apr 2002 17:17:39 -0000 1.2
+++ RequestMethodSelector.java 31 Jul 2002 13:13:30 -0000 1.3
@@ -52,7 +52,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -64,7 +64,7 @@
/** A <code>Selector</code> that matches a getMethod() of the HTTP request.
* @author <a href="mailto:[EMAIL PROTECTED]">Maciek Kaminski</a>
*/
-public class RequestMethodSelector extends AbstractLoggable
+public class RequestMethodSelector extends AbstractLogEnabled
implements ThreadSafe, Selector {
public boolean select(
@@ -73,4 +73,4 @@
String method =
ObjectModelHelper.getRequest(objectModel).getMethod();
return method.equals(expression);
}
-}
\ No newline at end of file
+}
1.8 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/selection/SessionAttributeSelector.java
Index: SessionAttributeSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/SessionAttributeSelector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SessionAttributeSelector.java 22 Feb 2002 07:03:54 -0000 1.7
+++ SessionAttributeSelector.java 31 Jul 2002 13:13:30 -0000 1.8
@@ -53,7 +53,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -75,7 +75,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a>
* @version CVS $Id$
*/
-public class SessionAttributeSelector extends AbstractLoggable
+public class SessionAttributeSelector extends AbstractLogEnabled
implements Configurable, ThreadSafe, Selector {
protected String defaultName;
1.5 +2 -4
xml-cocoon2/src/java/org/apache/cocoon/selection/SessionStateSelector.java
Index: SessionStateSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/selection/SessionStateSelector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SessionStateSelector.java 22 Feb 2002 07:03:54 -0000 1.4
+++ SessionStateSelector.java 31 Jul 2002 13:13:30 -0000 1.5
@@ -54,9 +54,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -90,4 +88,4 @@
{
// ignore
}
-}
\ No newline at end of file
+}
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/serialization/ElementProcessorSerializer.java
Index: ElementProcessorSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/ElementProcessorSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementProcessorSerializer.java 6 Mar 2002 16:58:50 -0000 1.1
+++ ElementProcessorSerializer.java 31 Jul 2002 13:13:30 -0000 1.2
@@ -60,7 +60,7 @@
import org.apache.cocoon.components.elementprocessor.*;
import org.apache.cocoon.components.elementprocessor.types.*;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -89,7 +89,7 @@
*/
public abstract class ElementProcessorSerializer
- extends AbstractLoggable implements Serializer, Composable
+ extends AbstractLogEnabled implements Serializer, Composable
{
private static final boolean _should_set_content_length = false;
private OutputStream _output_stream;
1.9 +6 -24
xml-cocoon2/src/java/org/apache/cocoon/serialization/RTFSerializer.java
Index: RTFSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/RTFSerializer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RTFSerializer.java 21 Jul 2002 22:34:24 -0000 1.8
+++ RTFSerializer.java 31 Jul 2002 13:13:30 -0000 1.9
@@ -55,11 +55,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.Loggable;
-import org.apache.avalon.framework.logger.Logger;
-
-import org.apache.log.Priority;
-import org.apache.log.util.OutputStreamLogger;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.jfor.jfor.converter.Converter;
@@ -84,17 +80,13 @@
*/
public class RTFSerializer extends AbstractTextSerializer
- implements Composable, Loggable {
+ implements Composable, LogEnabled {
private Writer rtfWriter = null;
private Converter handler = null;
- private OutputStreamLogger cocoonLogger = null;
private ComponentManager manager = null;
- public RTFSerializer() {
- }
-
/**
* Set the current <code>ComponentManager</code> instance used by this
* <code>Composable</code>.
@@ -104,17 +96,6 @@
}
/**
- * Provide component with a logger.
- *
- * @param logger the logger
- */
- public void setLogger(org.apache.log.Logger logger) {
- // FIXME Find a way to work with the
org.apache.avalon.framework.logger.Logger
- cocoonLogger =
- new OutputStreamLogger(logger, Priority.DEBUG);
- }
-
- /**
* Set the OutputStream where the serializer will write to.
*
* @param out the OutputStream
@@ -123,8 +104,10 @@
try {
rtfWriter =
new BufferedWriter(new OutputStreamWriter(out, "ISO-8859-1"));
+
+ // FIXME Find a way to work with the
org.apache.avalon.framework.logger.Logger
handler = new Converter(rtfWriter,
- Converter.createConverterOption(cocoonLogger));
+ Converter.createConverterOption(System.out));
super.setContentHandler(handler);
} catch (Exception e) {
@@ -140,6 +123,5 @@
super.recycle();
rtfWriter = null;
handler = null;
- cocoonLogger = null;
}
}
1.33 +4 -4
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CocoonServlet.java 19 Jul 2002 06:50:27 -0000 1.32
+++ CocoonServlet.java 31 Jul 2002 13:13:30 -0000 1.33
@@ -1149,7 +1149,7 @@
(HttpContext)this.appContext.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT),
this.containerEncoding,
formEncoding);
- env.setLogger(this.log);
+ env.enableLogging(new LogKitLogger(this.log));
return env;
}
@@ -1225,9 +1225,9 @@
Cocoon c = (Cocoon)
ClassUtils.newInstance("org.apache.cocoon.Cocoon");
final String rootlogger = getInitParameter("cocoon-logger");
if (rootlogger != null) {
- c.setLogger(this.logKitManager.getLogger(rootlogger));
+ c.enableLogging(new
LogKitLogger(this.logKitManager.getLogger(rootlogger)));
} else {
- c.setLogger(log);
+ c.enableLogging(new LogKitLogger(log));
}
c.contextualize(this.appContext);
c.compose(getParentComponentManager ());
1.32 +1 -4
xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TraxTransformer.java 21 Jul 2002 23:09:52 -0000 1.31
+++ TraxTransformer.java 31 Jul 2002 13:13:31 -0000 1.32
@@ -64,7 +64,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
@@ -397,8 +396,6 @@
if (transformerHandler instanceof LogEnabled) {
((LogEnabled)transformerHandler).enableLogging(getLogger());
- } else if(transformerHandler instanceof Loggable) {
- ((Loggable)transformerHandler).setLogger(getLogkitLogger());
}
// According to TrAX specs, all TransformerHandlers are
LexicalHandlers
SAXResult result = new SAXResult(consumer);
1.4 +3 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/CopletThread.java
Index: CopletThread.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/CopletThread.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CopletThread.java 13 Jun 2002 09:28:16 -0000 1.3
+++ CopletThread.java 31 Jul 2002 13:13:31 -0000 1.4
@@ -64,7 +64,9 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
+
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.sax.XMLSerializer;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -80,7 +82,6 @@
import org.apache.cocoon.webapps.session.xml.XMLUtil;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.log.Logger;
/**
1.3 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/AbstractSessionComponent.java
Index: AbstractSessionComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/AbstractSessionComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractSessionComponent.java 19 Apr 2002 11:02:58 -0000 1.2
+++ AbstractSessionComponent.java 31 Jul 2002 13:13:31 -0000 1.3
@@ -57,7 +57,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Recomposable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -79,9 +79,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
*/
-public abstract class AbstractSessionComponent
-extends AbstractLoggable
-implements Component, Composable, Recomposable, Recyclable,
RequestLifecycleComponent {
+public abstract class AbstractSessionComponent extends AbstractLogEnabled
+ implements Component, Composable, Recomposable, Recyclable,
RequestLifecycleComponent {
private SessionManager sessionManager;
private ResourceConnector resourceConnectorComponent;
@@ -194,4 +193,4 @@
throw new ProcessingException(errorMessage, rnfe);
}
}
-}
\ No newline at end of file
+}
1.6 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/SessionManager.java
Index: SessionManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/SessionManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SessionManager.java 5 Jul 2002 15:22:27 -0000 1.5
+++ SessionManager.java 31 Jul 2002 13:13:31 -0000 1.6
@@ -61,7 +61,7 @@
import org.apache.avalon.framework.component.Recomposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
-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.excalibur.pool.Recyclable;
@@ -108,7 +108,7 @@
* @version CVS $Id$
*/
public final class SessionManager
-extends AbstractLoggable
+extends AbstractLogEnabled
implements Composable, Component, Recomposable, Recyclable,
RequestLifecycleComponent {
/** Avalon role */
1.6 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnectorImpl.java
Index: ResourceConnectorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnectorImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceConnectorImpl.java 4 Jun 2002 07:31:53 -0000 1.5
+++ ResourceConnectorImpl.java 31 Jul 2002 13:13:32 -0000 1.6
@@ -68,7 +68,7 @@
import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
-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.activity.Disposable;
@@ -100,10 +100,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Id$
*/
-public final class ResourceConnectorImpl
-extends AbstractLoggable
-implements Recyclable, ResourceConnector,
- Composable, RequestLifecycleComponent {
+public final class ResourceConnectorImpl extends AbstractLogEnabled
+ implements Recyclable, ResourceConnector,
+ Composable, RequestLifecycleComponent {
/** The <code>ComponentManager</code> */
protected ComponentManager manager;
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
Index: AbstractXMLConsumer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/AbstractXMLConsumer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractXMLConsumer.java 22 Feb 2002 07:03:58 -0000 1.4
+++ AbstractXMLConsumer.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -63,7 +63,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @version CVS $Id$
*/
-public abstract class AbstractXMLConsumer extends AbstractLoggable
implements XMLConsumer {
+public abstract class AbstractXMLConsumer extends AbstractLogEnabled
implements XMLConsumer {
/**
* Receive an object for locating the origin of SAX document events.
1.5 +11 -5
xml-cocoon2/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
Index: DocumentHandlerWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DocumentHandlerWrapper.java 22 Feb 2002 07:03:58 -0000 1.4
+++ DocumentHandlerWrapper.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -50,8 +50,9 @@
*/
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+
import org.xml.sax.Attributes;
import org.xml.sax.DocumentHandler;
import org.xml.sax.Locator;
@@ -74,7 +75,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @version CVS $Id$
*/
-public class DocumentHandlerWrapper extends AbstractXMLConsumer implements
Loggable /*, Recyclable*/ {
+public class DocumentHandlerWrapper extends AbstractXMLConsumer implements
LogEnabled /*, Recyclable*/ {
protected Logger log;
@@ -101,7 +102,12 @@
this.setDocumentHandler(document);
}
- public void setLogger(Logger logger) {
+ /**
+ * Provide component with a logger.
+ *
+ * @param logger the logger
+ */
+ public void enableLogging(Logger logger) {
if (this.log == null) {
this.log = logger;
}
1.6 +3 -13
xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingContentHandler.java
Index: LoggingContentHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingContentHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoggingContentHandler.java 4 Jun 2002 09:27:21 -0000 1.5
+++ LoggingContentHandler.java 31 Jul 2002 13:13:32 -0000 1.6
@@ -50,29 +50,19 @@
*/
package org.apache.cocoon.xml;
-import org.apache.avalon.excalibur.pool.Poolable;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
import org.xml.sax.ContentHandler;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Map;
-
/**
* Logging content handler logs all events going through to the logger.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public class LoggingContentHandler extends AbstractLoggable implements
ContentHandler {
+public class LoggingContentHandler extends AbstractLogEnabled implements
ContentHandler {
/**
* All debug messages from this handler are prefixed with this id.
1.5 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingEntityResolver.java
Index: LoggingEntityResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/LoggingEntityResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoggingEntityResolver.java 22 Feb 2002 07:03:58 -0000 1.4
+++ LoggingEntityResolver.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.xml;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -66,7 +66,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
* @version CVS $Id$
*/
-public class LoggingEntityResolver extends AbstractLoggable implements
EntityResolver {
+public class LoggingEntityResolver extends AbstractLogEnabled implements
EntityResolver {
protected EntityResolver resolver;
protected Set dependencies;
1.6 +10 -5
xml-cocoon2/src/java/org/apache/cocoon/xml/dom/SVGBuilder.java
Index: SVGBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/SVGBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGBuilder.java 5 Jun 2002 00:46:11 -0000 1.5
+++ SVGBuilder.java 31 Jul 2002 13:13:32 -0000 1.6
@@ -50,13 +50,13 @@
*/
package org.apache.cocoon.xml.dom;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.util.XMLResourceDescriptor;
import org.apache.cocoon.xml.XMLConsumer;
-import org.apache.log.Logger;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -67,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
* @version CVS $Id$
*/
-public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, Loggable {
+public class SVGBuilder extends SAXSVGDocumentFactory implements
XMLConsumer, LogEnabled {
protected Logger log;
private static final String SAX_PARSER
@@ -92,7 +92,12 @@
super(SAX_PARSER);
}
- public void setLogger(Logger logger) {
+ /**
+ * Provide component with a logger.
+ *
+ * @param logger the logger
+ */
+ public void enableLogging(Logger logger) {
if (this.log == null) {
this.log = logger;
}
1.7 +1 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieValidatorAction.java
Index: CookieValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/acting/CookieValidatorAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CookieValidatorAction.java 22 Feb 2002 06:58:02 -0000 1.6
+++ CookieValidatorAction.java 31 Jul 2002 13:13:32 -0000 1.7
@@ -51,7 +51,6 @@
package org.apache.cocoon.acting;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper;
@@ -61,7 +60,6 @@
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.util.Tokenizer;
-import org.apache.log.Logger;
import java.util.Collections;
import java.util.HashMap;
1.2 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/BlobSourceFactory.java
Index: BlobSourceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/BlobSourceFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlobSourceFactory.java 15 Mar 2002 18:49:32 -0000 1.1
+++ BlobSourceFactory.java 31 Jul 2002 13:13:32 -0000 1.2
@@ -58,7 +58,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.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceFactory;
@@ -77,7 +77,7 @@
* @version $Id$
*/
-public class BlobSourceFactory extends AbstractLoggable
+public class BlobSourceFactory extends AbstractLogEnabled
implements SourceFactory, Composable, ThreadSafe {
private ComponentManager manager;
@@ -98,4 +98,4 @@
return getSource(environment, new URL(base,
location).toExternalForm());
}
}
-
\ No newline at end of file
+
1.2 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java
Index: XPathSourceInspector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/source/impl/XPathSourceInspector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathSourceInspector.java 24 Jun 2002 16:26:15 -0000 1.1
+++ XPathSourceInspector.java 31 Jul 2002 13:13:32 -0000 1.2
@@ -62,7 +62,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.parameters.Parameterizable;
import org.apache.avalon.framework.thread.ThreadSafe;
@@ -87,7 +87,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stephan Michels</a>
* @version $Id$
*/
-public class XPathSourceInspector extends AbstractLoggable implements
+public class XPathSourceInspector extends AbstractLogEnabled implements
SourceInspector, ThreadSafe, Parameterizable {
private String propertynamespace =
"http://xml.apache.org/cocoon/XPathSourceInspector";;
1.5 +2 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/InstanceFactory.java
Index: InstanceFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/InstanceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InstanceFactory.java 6 Jun 2002 14:43:41 -0000 1.4
+++ InstanceFactory.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -102,8 +102,7 @@
package org.apache.cocoon.precept;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.*;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -124,7 +123,7 @@
*/
-public class InstanceFactory extends AbstractLoggable implements Component,
Configurable, Composable, ThreadSafe {
+public class InstanceFactory extends AbstractLogEnabled implements
Component, Configurable, Composable, ThreadSafe {
public final static String ROLE =
"org.apache.cocoon.precept.InstanceFactory";
1.5 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/AbstractPreceptor.java
Index: AbstractPreceptor.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/AbstractPreceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractPreceptor.java 6 Jun 2002 14:43:41 -0000 1.4
+++ AbstractPreceptor.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -105,7 +105,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.configuration.Configuration;
@@ -118,7 +118,7 @@
* @author Torsten Curdt <[EMAIL PROTECTED]>
*/
-public abstract class AbstractPreceptor extends AbstractLoggable implements
Preceptor, Composable {
+public abstract class AbstractPreceptor extends AbstractLogEnabled
implements Preceptor, Composable {
protected ComponentManager manager;
1.5 +4 -4
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/PreceptorBuilderImpl.java
Index: PreceptorBuilderImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/PreceptorBuilderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PreceptorBuilderImpl.java 6 Jun 2002 14:43:41 -0000 1.4
+++ PreceptorBuilderImpl.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -109,7 +109,7 @@
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.cocoon.components.sax.XMLByteStreamInterpreter;
import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.cocoon.xml.AbstractXMLConsumer;
@@ -210,7 +210,7 @@
public void startDocument() throws SAXException {
currentPath = new StringBuffer();
preceptor = new PreceptorImpl();
- preceptor.setLogger(getLogger());
+ preceptor.enableLogging(getLogger());
text = new StringBuffer();
environments = new Stack();
environment = new Environment();
@@ -401,8 +401,8 @@
else {
Constraint constraint =
constraintFactory.createConstraintInstance(constraintType, constraintName,
constraintContext, configurationHandler.getConfiguration());
- if (constraint instanceof Loggable) {
- ((Loggable)constraint).setLogger(getLogger());
+ if (constraint instanceof LogEnabled) {
+ ((LogEnabled)constraint).enableLogging(getLogger());
}
if (constraint instanceof Configurable) {
1.5 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints/AbstractConstraint.java
Index: AbstractConstraint.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/preceptors/easyrelax/constraints/AbstractConstraint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractConstraint.java 6 Jun 2002 14:43:42 -0000 1.4
+++ AbstractConstraint.java 31 Jul 2002 13:13:32 -0000 1.5
@@ -106,7 +106,7 @@
import org.apache.cocoon.precept.Constraint;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.Component;
@@ -120,7 +120,7 @@
*/
-public abstract class AbstractConstraint extends AbstractLoggable implements
Constraint, Component {
+public abstract class AbstractConstraint extends AbstractLogEnabled
implements Constraint, Component {
protected String id = null;
1.4 +3 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/AbstractInstance.java
Index: AbstractInstance.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/precept/stores/AbstractInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractInstance.java 6 Jun 2002 14:43:42 -0000 1.3
+++ AbstractInstance.java 31 Jul 2002 13:13:32 -0000 1.4
@@ -104,7 +104,7 @@
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.Composable;
@@ -132,7 +132,8 @@
*/
-public abstract class AbstractInstance extends AbstractLoggable implements
Instance, Composable, Disposable, HttpSessionBindingListener {
+public abstract class AbstractInstance extends AbstractLogEnabled
+ implements Instance, Composable, Disposable, HttpSessionBindingListener {
protected ComponentManager manager;
1.4 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/storejanitor/StoreJanitorImpl.java
Index: StoreJanitorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/storejanitor/StoreJanitorImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StoreJanitorImpl.java 6 May 2002 12:28:52 -0000 1.3
+++ StoreJanitorImpl.java 31 Jul 2002 13:13:33 -0000 1.4
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-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;
@@ -78,7 +78,7 @@
[EMAIL PROTECTED] CVS $Id$
*/
public class StoreJanitorImpl
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements StoreJanitor,
Configurable,
ThreadSafe,
1.2 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/TagSupport.java
Index: TagSupport.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/taglib/TagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TagSupport.java 12 Jun 2002 16:48:29 -0000 1.1
+++ TagSupport.java 31 Jul 2002 13:13:33 -0000 1.2
@@ -53,7 +53,7 @@
import java.util.Map;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -69,7 +69,7 @@
*
* @author: <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a>
*/
-public abstract class TagSupport extends AbstractLoggable implements Tag,
Recyclable {
+public abstract class TagSupport extends AbstractLogEnabled implements Tag,
Recyclable {
protected String var;
protected Tag parent;
protected SourceResolver resolver;
@@ -199,4 +199,4 @@
this.objectModel = objectModel;
this.parameters = parameters;
}
-}
\ No newline at end of file
+}
1.15 +1 -1 xml-cocoon2/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- web.xml 11 Jun 2002 18:09:13 -0000 1.14
+++ web.xml 31 Jul 2002 13:13:33 -0000 1.15
@@ -180,7 +180,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
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
