mcconnell 2003/01/08 13:24:27
Modified: merlin/src/java/org/apache/avalon/merlin/kernel
DefaultKernel.java
merlin/src/test/config block.xml
Log:
Updated to remove an error in the descriptor.
Revision Changes Path
1.22 +4 -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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DefaultKernel.java 8 Jan 2003 20:57:48 -0000 1.21
+++ DefaultKernel.java 8 Jan 2003 21:24:27 -0000 1.22
@@ -275,7 +275,7 @@
File kernelFile = new File( m_home, "kernel.xml" );
try
{
- m_config = getConfiguration( kernelFile );
+ m_kernelConfig = getConfiguration( kernelFile );
}
catch( Throwable e )
{
@@ -311,7 +311,7 @@
if( LOGGING == null )
{
LOGGING = bootstrapLoggingManager( Container.PATH_SEPERATOR
);
- Configuration categoriesConfig = m_config.getChild(
"categories" );
+ Configuration categoriesConfig = m_kernelConfig.getChild(
"categories" );
LoggingDirective categories =
CREATOR.createLoggingDirective( Container.PATH_SEPERATOR,
categoriesConfig );
LOGGING.addCategories( Container.PATH_SEPERATOR, categories
);
@@ -327,7 +327,7 @@
throw new CascadingException( error, e );
}
- String domain = m_config.getChild( "system" ).getAttribute( "host",
"localhost" );
+ String domain = m_kernelConfig.getChild( "system" ).getAttribute(
"host", "localhost" );
m_registry = new DefaultRegistry( domain );
//
@@ -926,8 +926,7 @@
}
LibraryDescriptor extensions =
- CREATOR.createLibraryDescriptor(
- config.getChild( "library" ) );
+ CREATOR.createLibraryDescriptor( config.getChild( "library" ) );
ClasspathDescriptor classpath =
CREATOR.createClasspathDescriptor( config.getChild( "classpath" )
);
1.12 +4 -5 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- block.xml 8 Jan 2003 20:57:48 -0000 1.11
+++ block.xml 8 Jan 2003 21:24:27 -0000 1.12
@@ -18,19 +18,18 @@
to a root container who's name is implied by the name of the block.
-->
<implementation src="external.xml">
-
<!-- use external file or embedded defintion -->
+ <!-- a container can contain a classpath declaration -->
+ <!-- a container can contain nested appliance declarations -->
+ <!-- a container can contain nested containers -->
+ <!-- if the container used the "src" attribute the following content is
ignored -->
<!--
<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>
-->
-
</implementation>
</block>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
