avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/kernel DefaultKernel.java
Date Wed, 08 Jan 2003 23:03:29 GMT
mcconnell    2003/01/08 15:03:29

  Modified:    merlin/src/java/org/apache/avalon/merlin/kernel
                        DefaultKernel.java
  Log:
  Updated the kernel to read classpath and extension directories from the <engine> element
inside <implementation>
  
  Revision  Changes    Path
  1.23      +14 -7     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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- DefaultKernel.java	8 Jan 2003 21:24:27 -0000	1.22
  +++ DefaultKernel.java	8 Jan 2003 23:03:29 -0000	1.23
  @@ -345,8 +345,7 @@
   
           try
           {
  -            Configuration engineConfig = m_kernelConfig.getChild( "engine" );
  -            m_engine = bootstrapEngine( LOGGING, engineConfig );
  +            m_engine = bootstrapEngine( LOGGING, m_kernelConfig.getChild( "engine" ) );
           }
           catch( Throwable e )
           {
  @@ -633,11 +632,14 @@
   
           //
           // get the blocks packaged configuration and use that to establish 
  -        // the engine to supplied to the block
  +        // the engine to be supplied to the block
           //
   
           Configuration base = getBlockConfiguration( jar );
  -        Configuration engineConfig = base.getChild( "engine" );
  +        Configuration containment = 
  +          getImplementationConfiguration( base.getChild( "implementation" ) );
  +
  +        Configuration engineConfig = containment.getChild( "engine" );
           EngineClassLoader engine = createChildEngine( m_engine, m_home, engineConfig, url,
logger );
   
           //
  @@ -646,8 +648,6 @@
           //
   
           String partition = name + Container.PATH_SEPERATOR;
  -        Configuration containment = 
  -          getImplementationConfiguration( base.getChild( "implementation" ) );
           ContainerDescriptor descriptor = createContainerDescriptor( name, engine, containment
);
           Registry registry = m_registry.createChild( name );
           List list = createChildContainers( engine, registry, partition, containment, config,
logger );
  @@ -935,6 +935,13 @@
           {
               EngineClassLoader engine = new EngineClassLoader( m_bootstrap );
               engine.enableLogging( getLogger().getChildLogger( "engine" ) );
  +
  +            //
  +            // configuration of the engine should be removed with a preference for 
  +            // creating the resources that the engine needs and supplying the 
  +            // resources
  +            //
  +
               engine.configure( config );
               Context system = getSystemContext();
               DefaultContext context = new DefaultContext( system );
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message