mcconnell 2003/01/08 12:57:49
Modified: merlin kernel.xml
merlin/src/java/org/apache/avalon/merlin/kernel
DefaultKernel.java
merlin/src/test/config block.xml
Log:
Updated comments in the kernel.xml and sample block.xml files.
Revision Changes Path
1.11 +17 -1 avalon-sandbox/merlin/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kernel.xml 6 Jan 2003 02:02:01 -0000 1.10
+++ kernel.xml 8 Jan 2003 20:57:48 -0000 1.11
@@ -15,7 +15,23 @@
</logging>
<categories>
- <category name="/sys" priority="INFO"/>
+ <category name="/sys" priority="DEBUG"/>
</categories>
+
+ <!--
+ Definition of the root engine classloader.
+ -->
+ <!--
+ <engine>
+ <library dir=".">
+ <include name="some-additional-extension-dir"/>
+ </library>
+ <classpath>
+ <fileset dir="some-directory">
+ <include name="something.jar"/>
+ </fileset>
+ </classpath>
+ </engine>
+ -->
</kernel>
1.21 +5 -5
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel/DefaultKernel.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultKernel.java 7 Jan 2003 06:26:37 -0000 1.20
+++ DefaultKernel.java 8 Jan 2003 20:57:48 -0000 1.21
@@ -173,7 +173,7 @@
/**
* The kernel configuration.
*/
- private Configuration m_config;
+ private Configuration m_kernelConfig;
/**
* The block configuration.
@@ -345,7 +345,7 @@
try
{
- Configuration engineConfig = m_config.getChild( "engine" );
+ Configuration engineConfig = m_kernelConfig.getChild( "engine" );
m_engine = bootstrapEngine( LOGGING, engineConfig );
}
catch( Throwable e )
@@ -865,7 +865,7 @@
private LoggingManager bootstrapLoggingManager( String root ) throws Exception
{
- if( m_config == null )
+ if( m_kernelConfig == null )
{
throw new IllegalStateException( "configuration" );
}
@@ -884,7 +884,7 @@
LoggingDescriptor descriptor =
CREATOR.createLoggingDescriptor(
- m_config.getChild( "logging" ), root );
+ m_kernelConfig.getChild( "logging" ), root );
DefaultContext context = new DefaultContext();
context.put( "urn:assembly:home", m_home );
1.11 +3 -0 avalon-sandbox/merlin/src/test/config/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/test/config/block.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- block.xml 7 Jan 2003 06:26:37 -0000 1.10
+++ block.xml 8 Jan 2003 20:57:48 -0000 1.11
@@ -22,9 +22,12 @@
<!-- use external file or embedded defintion -->
<!--
<container name="test">
+ <!-- a classpath declaration can appear here -->
+ <!-- declaration of components in this container -->
<appliance name="standard"
class="org.apache.avalon.playground.StandardComponent" activation="startup">
<context class="org.apache.avalon.playground.StandardContextImp"/>
</appliance>
+ <!-- a container can contain nested containers -->
</container>
-->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
