You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/02/29 23:34:54 UTC
cvs commit: avalon/merlin/platform/src/config debug.xml kernel.xml
niclas 2004/02/29 14:34:54
Modified: merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultCriteria.java DefaultFactory.java
merlin/platform/src/config debug.xml kernel.xml
Log:
Changing the log system loading, placing more responsibility on the repository. Hence, <logging> in kernel.xml is no longer supported.
Revision Changes Path
1.25 +2 -2 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
Index: DefaultCriteria.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultCriteria.java 24 Feb 2004 22:48:24 -0000 1.24
+++ DefaultCriteria.java 29 Feb 2004 22:34:54 -0000 1.25
@@ -163,7 +163,7 @@
MERLIN_KERNEL, String.class, null ),
new Parameter(
MERLIN_LOGGING_CONFIG,
- File.class, null ),
+ URL.class, null ),
new Parameter(
MERLIN_LOGGING_IMPLEMENTATION,
String.class, null ),
1.34 +6 -45 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DefaultFactory.java 29 Feb 2004 22:25:26 -0000 1.33
+++ DefaultFactory.java 29 Feb 2004 22:34:54 -0000 1.34
@@ -212,7 +212,7 @@
//
LoggingManager logging =
- createLoggingManager( criteria, config );
+ createLoggingManager( criteria );
m_logger =
logging.getLoggerForCategory( "kernel" );
@@ -618,25 +618,20 @@
* @param config the kernel configuration
* @return the logging manager
*/
- private LoggingManager createLoggingManager(
- KernelCriteria criteria, Configuration config )
+ private LoggingManager createLoggingManager( KernelCriteria criteria )
throws Exception
{
File dir = criteria.getWorkingDirectory();
- Configuration conf = getLoggingConfiguration( criteria, config );
Artifact artifact = criteria.getLoggingImplementation();
Builder builder = m_context.newBuilder( m_classloader, artifact );
Factory factory = builder.getFactory();
-
+
LoggingCriteria params = getLoggingCriteria( factory );
- if( conf.getAttribute( "debug", "false" ).equals( "true" ) )
- {
- params.setBootstrapLogger(
- new ConsoleLogger( ConsoleLogger.LEVEL_DEBUG ) );
- }
+ URL conf = params.getLoggingConfiguration();
+
params.setDebugEnabled( criteria.isDebugEnabled() );
params.setBaseDirectory( dir );
- params.setConfiguration( conf );
+ params.setLoggingConfiguration( conf );
return (LoggingManager) factory.create( params );
}
@@ -655,40 +650,6 @@
+ map.getClass().getName()
+ "].";
throw new IllegalArgumentException( error );
- }
- }
-
- private Configuration getLoggingConfiguration(
- KernelCriteria criteria, Configuration config )
- throws Exception
- {
- if( null != config.getChild( "logging", false ) )
- {
- return config.getChild( "logging" );
- }
- else
- {
- File file = criteria.getLoggingConfiguration();
- if( null != file )
- {
- try
- {
- DefaultConfigurationBuilder builder =
- new DefaultConfigurationBuilder();
- return builder.buildFromFile( file );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build logging configuration from: "
- + file;
- throw new KernelException( error, e );
- }
- }
- else
- {
- return config.getChild( "logging" );
- }
}
}
1.9 +0 -10 avalon/merlin/platform/src/config/debug.xml
Index: debug.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/config/debug.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- debug.xml 26 Jan 2004 18:06:22 -0000 1.8
+++ debug.xml 29 Feb 2004 22:34:54 -0000 1.9
@@ -1,16 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<kernel>
-
- <logging>
- <categories priority="info">
- <categories name="kernel">
- <category name="logger" priority="warn"/>
- </categories>
- </categories>
- <logger name="kernel.logger"/>
- </logging>
-
<repository>
<hosts>
<host path="http://dpml.net/"/>
1.9 +0 -11 avalon/merlin/platform/src/config/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/config/kernel.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kernel.xml 26 Jan 2004 18:06:22 -0000 1.8
+++ kernel.xml 29 Feb 2004 22:34:54 -0000 1.9
@@ -1,22 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<kernel>
-
- <logging>
- <categories priority="info">
- <categories name="kernel">
- <category name="logger" priority="warn"/>
- </categories>
- </categories>
- <logger name="kernel.logger"/>
- </logging>
-
<repository>
<hosts>
<host path="http://dpml.net/"/>
<host path="http://ibiblio.org/maven/"/>
</hosts>
</repository>
-
</kernel>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org