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/meta-spi/src/java/org/apache/avalon/meta/model Profile.java
Date Mon, 28 Apr 2003 21:19:44 GMT
mcconnell    2003/04/28 14:19:44

  Modified:    merlin   maven.xml project.properties
               merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
                        DefaultApplianceFactory.java
               merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl
                        DefaultDeploymentService.java
               merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization
                        ExtendedInitializationService.java
               merlin/merlin-cli maven.xml
               merlin/merlin-smp maven.xml project.xml
               merlin/merlin-smp/xdocs/meta/model/block/container
                        containers.xml includes.xml index.xml
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/components
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/components/categories
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/components/context
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/components/context/entry
                        index.xml navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/components/parameters
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/engine
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container/engine/classpath
                        navigation.xml
               merlin/meta-spi/src/java/org/apache/avalon/meta/model
                        Profile.java
  Removed:     merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/configuration
                        ConfigurationService.java
                        DefaultConfigurationService.java package.html
               merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/disposal
                        DefaultDisposalService.java DisposalService.java
                        ExtendedDisposalService.java package.html
               merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/logging
                        DefaultLoggingService.java LoggingService.java
                        package.html
  Log:
  Consolidation of classes under the lifecycle package.
  
  Revision  Changes    Path
  1.11      +23 -0     avalon-sandbox/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- maven.xml	27 Apr 2003 09:28:48 -0000	1.10
  +++ maven.xml	28 Apr 2003 21:19:42 -0000	1.11
  @@ -5,6 +5,7 @@
     <property file="project.properties"/>
     <property name="merlin.build.inst" value="inst"/>
     <property name="merlin.build.inst.dir" value="${maven.build.dir}/${merlin.build.inst}"/>
  +  <property name="maven.jar.manifest.extensions.add" value="true"/>
   
     <property name="maven.checkstyle.format" value="avalon"/>
     <!--<property name="maven.jar.manifest" value="${basedir}/src/etc/project.mf"/>-->
  @@ -132,8 +133,30 @@
         goals="xjavadoc,site"
         banner="Building site."
         ignoreFailures="false"/>
  +  </goal>
  +
  +  <!-- convinience docs generation within runing javadoc -->
  +  <goal name="merlin-site-xdocs"
  +    description="Build the Merlin site.">
  +    <maven:reactor
  +      basedir="${basedir}"
  +      includes="merlin-smp/project.xml"
  +      goals="site"
  +      banner="Building site."
  +      ignoreFailures="false"/>
  +  </goal>
   
  +  <!-- convinience javadoc generation within runing xdocs -->
  +  <goal name="merlin-site-javadoc"
  +    description="Build the Merlin site.">
  +    <maven:reactor
  +      basedir="${basedir}"
  +      includes="merlin-smp/project.xml"
  +      goals="xjavadoc"
  +      banner="Building site."
  +      ignoreFailures="false"/>
     </goal>
  +
   
     <!--
     The site goal is called by the merlin-install goal and handles the generation
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/project.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.properties	27 Apr 2003 09:26:16 -0000	1.1
  +++ project.properties	28 Apr 2003 21:19:42 -0000	1.2
  @@ -8,6 +8,7 @@
   maven.xdoc.jsl = file:/${basedir}/../merlin-smp/src/etc/site.jsl
   maven.javadoc.stylesheet =${basedir}/../merlin-smp/src/etc/stylesheet.css
   
  +
   #
   # Declaration of the remote links to assign on javadoc generation.
   # Link declarations can be overriden in the user's build.properties
  
  
  
  1.2       +14 -5     avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceFactory.java
  
  Index: DefaultApplianceFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultApplianceFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultApplianceFactory.java	26 Apr 2003 12:37:43 -0000	1.1
  +++ DefaultApplianceFactory.java	28 Apr 2003 21:19:42 -0000	1.2
  @@ -422,7 +422,8 @@
               lifestyle.contextualize( context );
               lifestyle.initialize();
               return lifestyle;
  -        } catch( Throwable e )
  +        } 
  +        catch( Throwable e )
           {
               final String error =
                       "Unexpected error during bootstrap lifecycle service creation.";
  @@ -433,19 +434,27 @@
       private DeploymentService createDeploymentService( LoggingManager logging )
               throws ApplianceException
       {
  +        if( logging == null )
  +        {
  +            throw new NullPointerException( "logging" );
  +        }
  +
  +System.out.println( "CREATING A NEW DEPOLYMENT SERVICE USING: " + logging + ", under key: " + LoggingManager.KEY );
  +
           try
           {
               DefaultDeploymentService deployment = new DefaultDeploymentService();
  -            deployment.enableLogging( getLogger() );
  +            deployment.enableLogging( getLogger().getChildLogger( "deployment" ) );
               DefaultLocator locator = new DefaultLocator();
               locator.put( LoggingManager.KEY, logging );
               deployment.contextualize( locator );
               deployment.initialize();
               return deployment;
  -        } catch( Throwable e )
  +        } 
  +        catch( Throwable e )
           {
               final String error =
  -                    "Internal error while attempting to create bootstrap deployment service.";
  +              "Internal error while attempting to create bootstrap deployment service.";
               throw new ApplianceException( error, e );
           }
       }
  
  
  
  1.2       +239 -126  avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultDeploymentService.java
  
  Index: DefaultDeploymentService.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/DefaultDeploymentService.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultDeploymentService.java	26 Apr 2003 12:37:46 -0000	1.1
  +++ DefaultDeploymentService.java	28 Apr 2003 21:19:43 -0000	1.2
  @@ -53,25 +53,31 @@
   import org.apache.avalon.assembly.appliance.Appliance;
   import org.apache.avalon.assembly.lifecycle.DeploymentException;
   import org.apache.avalon.assembly.lifecycle.DeploymentService;
  -import org.apache.avalon.assembly.lifecycle.configuration.ConfigurationService;
  -import org.apache.avalon.assembly.lifecycle.configuration.DefaultConfigurationService;
   import org.apache.avalon.assembly.lifecycle.context.ContextualizationService;
   import org.apache.avalon.assembly.lifecycle.context.DefaultCompositionService;
  -import org.apache.avalon.assembly.lifecycle.disposal.DefaultDisposalService;
  -import org.apache.avalon.assembly.lifecycle.disposal.DisposalService;
  -import org.apache.avalon.assembly.lifecycle.disposal.ExtendedDisposalService;
   import org.apache.avalon.assembly.lifecycle.initialization.DefaultInitializationService;
   import org.apache.avalon.assembly.lifecycle.initialization.ExtendedInitializationService;
   import org.apache.avalon.assembly.lifecycle.initialization.InitializationService;
  -import org.apache.avalon.assembly.lifecycle.logging.DefaultLoggingService;
  -import org.apache.avalon.assembly.lifecycle.logging.LoggingService;
   import org.apache.avalon.assembly.locator.Contextualizable;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
   import org.apache.avalon.assembly.logging.LoggingManager;
  +import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.logger.LogEnabled;
  +import org.apache.avalon.framework.logger.Logger;
  +import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.DefaultConfiguration;
  +import org.apache.avalon.framework.parameters.Parameterizable;
  +import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.lifecycle.Creator;
  +import org.apache.avalon.meta.info.StageDescriptor;
  +import org.apache.avalon.meta.info.LoggerDescriptor;
  +import org.apache.avalon.meta.model.LoggingDirective;
  +import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
    * A deployment service is responsible for the deployment of a component
  @@ -87,14 +93,11 @@
       //==============================================================
   
       private Locator m_context;
  -    private LoggingService m_logging;
  -    private ConfigurationService m_configuration;
  +    private LoggingManager m_logging;
       private ContextualizationService m_contextualization;
       private InitializationService m_initialization;
  -    private DisposalService m_disposal;
   
       private boolean m_initialized = false;
  -    private boolean m_extensionEnabled = true;
   
       //==============================================================
       // Contextualizable
  @@ -112,6 +115,7 @@
           {
               throw new NullPointerException( "context" );
           }
  +        m_logging = (LoggingManager) context.get( LoggingManager.KEY );
           m_context = context;
       }
   
  @@ -126,32 +130,16 @@
               throw new IllegalStateException( "context" );
           }
   
  -        if( m_context.hasEntry( LoggingService.KEY ) )
  -        {
  -            m_logging = (LoggingService) m_context.get( LoggingService.KEY );
  -        } else
  -        {
  -            m_logging = makeLoggingService();
  -        }
  -
           if( m_context.hasEntry( ContextualizationService.KEY ) )
           {
               m_contextualization = 
                (ContextualizationService) m_context.get( ContextualizationService.KEY );
  -        } else
  +        } 
  +        else
           {
               m_contextualization = makeContextualizationService();
           }
   
  -        if( m_context.hasEntry( ConfigurationService.KEY ) )
  -        {
  -            m_configuration = 
  -              (ConfigurationService) m_context.get( ConfigurationService.KEY );
  -        } else
  -        {
  -            m_configuration = makeConfigurationService();
  -        }
  -
           if( m_context.hasEntry( InitializationService.KEY ) )
           {
               m_initialization = 
  @@ -161,15 +149,6 @@
               m_initialization = makeInitializationService();
           }
   
  -        if( m_context.hasEntry( DisposalService.KEY ) )
  -        {
  -            m_disposal = 
  -              (DisposalService) m_context.get( DisposalService.KEY );
  -        } else
  -        {
  -            m_disposal = makeDisposalService();
  -        }
  -
           m_initialized = true;
   
       }
  @@ -179,12 +158,12 @@
       //==============================================================
   
       /**
  -     * Deploy an appliance based on a supplied classloader, logging channel and
  -     * containment context.
  -     * @param classloader the classloader to use
  +     * Deploy a new instance of a component relative to the supplied
  +     * appliance deployment criteria.
  +     *
        * @param appliance the appliance to deploy
  -     * @param context the containment context
  -     * @return the deployed component
  +     * @param classloader the classloader to use
  +     * @return the new instance of the deployed component
        */
       public Object deploy( Appliance appliance, ClassLoader classloader )
               throws DeploymentException
  @@ -202,31 +181,46 @@
               throw new NullPointerException( "classloader" );
           }
   
  -        //
  -        // commence deployment
  -        //
  -
  -        Object instance;
           try
           {
  -            String classname = appliance.getType().getInfo().getClassname();
  -            Class clazz = classloader.loadClass( classname );
  -            instance = clazz.newInstance();
  -        } catch( Throwable e )
  -        {
  -            final String error =
  -              "Component implementation establishment error in appliance: "
  -              + appliance;
  -            throw new DeploymentException( error, e );
  -        }
   
  -        // invoke lifecycle processing on the instance
  +            //
  +            // commence deployment
  +            //
  +
  +            Object instance;
  +            try
  +            {
  +                final String classname = appliance.getType().getInfo().getClassname();
  +                Class clazz = classloader.loadClass( classname );
  +                instance = clazz.newInstance();
  +            } 
  +            catch( Throwable e )
  +            {
  +                final String error =
  +                  "Component implementation instantiation error in appliance: "
  +                  + appliance;
  +                throw new DeploymentException( error, e );
  +            }
  +
  +            // invoke lifecycle processing on the instance
  +
  +            if( instance instanceof LogEnabled )
  +            {
  +                handleLogging( appliance, ((LogEnabled)instance) );
  +            }
   
  -        try
  -        {
  -            m_logging.enableLogging( appliance, instance );
               m_contextualization.contextualize( classloader, appliance, instance );
  -            m_configuration.configure( appliance, instance );
  +
  +            if( instance instanceof Configurable )
  +            {
  +                handleConfiguration( appliance, ((Configurable)instance) );
  +            }
  +            if( instance instanceof Parameterizable )
  +            {
  +                handleParameterization( appliance, ((Parameterizable)instance) );
  +            }
  +
               m_initialization.initialize( appliance, instance );
               return instance;
           } 
  @@ -269,115 +263,234 @@
           try
           {
               m_initialization.deinitialize( appliance, instance );
  -        } catch( Throwable e )
  +        } 
  +        catch( Throwable e )
           {
               final String warning =
                 "Ignoring shutdown error raised by component: " + appliance;
               getLogger().warn( warning, e );
           }
   
  -        m_disposal.dispose( appliance, instance );
  +        if( instance != null )
  +        {
  +            handleDisposal( appliance, instance );
  +        }
  +        //m_disposal.dispose( appliance, instance );
       }
   
       //----------------------------------------------------------------------------
  -    // internal services
  +    // lifecycle handlers
       //----------------------------------------------------------------------------
   
  -    private LoggingService makeLoggingService() throws DeploymentException
  +   /**
  +    * Create and assign a logging channel to the supplied object
  +    * based on the logging directives declare by the supplied appliance.
  +    * 
  +    * @param object the object to assign a logging channel
  +    * @param appliance the source of the logging information
  +    */
  +    private void handleLogging( Appliance appliance, LogEnabled object ) throws Exception
       {
  -        try
  +        String path = appliance.getPath();
  +    
  +        LoggingDirective logging = appliance.getLoggingDirective();
  +        m_logging.addCategories( path, logging );
  +        Logger logger = m_logging.getLoggerForCategory( path );
  +        ((LogEnabled)object).enableLogging( logger );
  +    }
  +
  +   /**
  +    * Configure a configuratble object based ot he configuration information
  +    * exposed by the supplied appliance.
  +    * 
  +    * @param object the object to configure
  +    * @param appliance the source of the configuration information
  +    */
  +    private void handleConfiguration( Appliance appliance, Configurable object ) 
  +      throws Exception
  +    {
  +        Configuration config = appliance.getConfiguration();
  +        if( config == null )
           {
  -            DefaultLoggingService service = new DefaultLoggingService();
  -            service.enableLogging( getLogger().getChildLogger( "logging" ) );
  -            LoggingManager logging =
  -             (LoggingManager) m_context.get( LoggingManager.KEY );
  -
  -            DefaultLocator locator = new DefaultLocator();
  -            locator.put( LoggingManager.KEY, logging );
  -            service.contextualize( locator );
  -            service.initialize();
  -            return service;
  -        } catch( Throwable e )
  +            config = new DefaultConfiguration( 
  +              "configuration", this.getClass().getName() );
  +        }
  +
  +        if( getLogger().isDebugEnabled() )
           {
  -            final String error =
  -                    "Internal error while attempting to build the bootstrap logging service.";
  -            throw new DeploymentException( error, e );
  +            final String message =
  +              "configure: " + appliance + "\n"
  +                + ConfigurationUtil.list( config );
  +            getLogger().debug( message );
           }
  +        object.configure( config );
       }
   
  -    private ConfigurationService makeConfigurationService() throws DeploymentException
  +   /**
  +    * Parameterize a parameteriazable object based ot he parameters information
  +    * exposed by the supplied appliance.
  +    * 
  +    * @param object the object to parameterize
  +    * @param appliance the source of the parameterization information
  +    */
  +    private void handleParameterization( Appliance appliance, Parameterizable object ) 
  +      throws Exception
       {
  -        try
  +        Parameters params = appliance.getParameters();
  +        if( params == null )
           {
  -            DefaultConfigurationService service = new DefaultConfigurationService();
  -            service.enableLogging( getLogger().getChildLogger( "config" ) );
  -            return service;
  -        } catch( Throwable e )
  +            params = Parameters.EMPTY_PARAMETERS;
  +        }
  +        if( getLogger().isDebugEnabled() )
           {
  -            final String error =
  -                    "Internal error while attempting to build the bootstrap configuration service.";
  -            throw new DeploymentException( error, e );
  +            final String message = "parameterize: " + appliance.toString();
  +            getLogger().debug( message );
           }
  +        object.parameterize( params );
       }
   
  -    private ContextualizationService makeContextualizationService() throws DeploymentException
  +    /**
  +     * Dispose of the supplied object.  The implementation uses the 
  +     * supplied appliance to get any destroy stage lifecycle extension 
  +     * handlers prior to disposing of the object.
  +     *
  +     * @param appliance the appliance
  +     * @param object the object to dispose
  +     */
  +    public void handleDisposal( Appliance appliance, Object object )
       {
  -        try
  +        StageDescriptor[] stages = appliance.getType().getStages();
  +        if( stages.length > 0 )
           {
  -            DefaultCompositionService service = new DefaultCompositionService();
  -            service.enableLogging( getLogger().getChildLogger( "context" ) );
  -            return service;
  -        } catch( Throwable e )
  +            if( getLogger().isDebugEnabled() )
  +            {
  +                final String message =
  +                  "destroy stage extension handling for appliance:"
  +                  + appliance;
  +                getLogger().debug( message );
  +            }
  +
  +            for( int i = 0; i < stages.length; i++ )
  +            {
  +                StageDescriptor stage = stages[i];
  +                processDestroyStage( appliance, stage, object );
  +            }
  +        }
  +
  +        //
  +        // and finally, dispose of the component
  +        //
  +
  +        if( object instanceof Disposable )
           {
  -            final String error =
  -                    "Internal error while attempting to build the bootstrap contextualization service.";
  -            throw new DeploymentException( error, e );
  +            if( getLogger().isDebugEnabled() )
  +            {
  +                final String message = "disposal " + appliance;
  +                getLogger().debug( message );
  +            }
  +
  +            ((Disposable) object).dispose();
           }
       }
   
  -    private InitializationService makeInitializationService() throws DeploymentException
  +   /**
  +    * Processing of a stage handler for the destroy phase in the component
  +    * lifecyle.
  +    *
  +    * @param appliance the appliance
  +    * @param stage the lifecycle extension stage
  +    * @param the object to which the stage extension is to be applied
  +    */
  +    private void processDestroyStage( 
  +      Appliance appliance, StageDescriptor stage, Object object )
       {
           try
           {
  -            if( m_extensionEnabled )
  +            Appliance provider = appliance.getExtensionProvider( stage );
  +            if( provider == null )
  +            {
  +                final String error =
  +                  "Missing extension provider in appliance: '" + appliance
  +                  + "' for the stage: " + stage;
  +                throw new DeploymentException( error );
  +            }
  +
  +            try
  +            {
  +                Creator handler = (Creator) provider.resolve( this );
  +                handler.destroy( 
  +                  object, new DefaultLocator( appliance.getContextMap() ) );
  +                provider.release( handler, this );
  +            }
  +            catch( Throwable e )
  +            {
  +                final String error =
  +                  "Extension handler execution error in appliance: '"
  +                  + appliance
  +                  + "' under stage: '" + stage
  +                  + "' for target: '" + object + "'";
  +                throw new DeploymentException( error, e );
  +            }
  +        }
  +        catch( Throwable e )
  +        {
  +            if( getLogger().isWarnEnabled() )
               {
  -                ExtendedInitializationService service = new ExtendedInitializationService();
  -                service.enableLogging( getLogger().getChildLogger( "init" ) );
  -                return service;
  -            } else
  -            {
  -                DefaultInitializationService service = new DefaultInitializationService();
  -                service.enableLogging( getLogger().getChildLogger( "init" ) );
  -                return service;
  +                final String warning =
  +                  "Ignoring extension related error during destroy stage.";
  +                getLogger().warn( warning, e );
               }
  +        }
  +    }
  +
  +    //----------------------------------------------------------------------------
  +    // internal services
  +    //----------------------------------------------------------------------------
  +
  +    private ContextualizationService makeContextualizationService() throws DeploymentException
  +    {
  +        try
  +        {
  +            DefaultCompositionService service = new DefaultCompositionService();
  +            service.enableLogging( getLogger().getChildLogger( "context" ) );
  +            return service;
           } catch( Throwable e )
           {
               final String error =
  -                    "Internal error while attempting to build the bootstrap initialization service.";
  +                    "Internal error while attempting to build the bootstrap contextualization service.";
               throw new DeploymentException( error, e );
           }
       }
   
  -    private DisposalService makeDisposalService() throws DeploymentException
  +    private InitializationService makeInitializationService() throws DeploymentException
       {
           try
           {
  -            if( m_extensionEnabled )
  -            {
  -                ExtendedDisposalService service = new ExtendedDisposalService();
  -                service.enableLogging( getLogger().getChildLogger( "disposal" ) );
  -                return service;
  -            } else
  -            {
  -                DefaultDisposalService service = new DefaultDisposalService();
  -                service.enableLogging( getLogger().getChildLogger( "disposal" ) );
  -                return service;
  -            }
  -        } catch( Throwable e )
  +            ExtendedInitializationService service = new ExtendedInitializationService();
  +            service.enableLogging( getLogger().getChildLogger( "init" ) );
  +            return service;
  +        } 
  +        catch( Throwable e )
           {
               final String error =
  -                    "Internal error while attempting to build the bootstrap disposal service.";
  +              "Internal error while attempting to create an initialization service.";
               throw new DeploymentException( error, e );
           }
       }
  +
  +    //private DisposalService makeDisposalService() throws DeploymentException
  +    //{
  +    //    try
  +    //    {
  +    //        ExtendedDisposalService service = new ExtendedDisposalService();
  +    //        service.enableLogging( getLogger().getChildLogger( "disposal" ) );
  +    //        return service;
  +    //    } 
  +    //    catch( Throwable e )
  +    //    {
  +    //        final String error =
  +    //          "Internal error while attempting to build the bootstrap disposal service.";
  +    //        throw new DeploymentException( error, e );
  +    //    }
  +    //}
   }
  
  
  
  1.3       +1 -2      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/ExtendedInitializationService.java
  
  Index: ExtendedInitializationService.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/initialization/ExtendedInitializationService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtendedInitializationService.java	11 Apr 2003 19:52:13 -0000	1.2
  +++ ExtendedInitializationService.java	28 Apr 2003 21:19:43 -0000	1.3
  @@ -122,7 +122,6 @@
                   Creator handler = null;
                   try
                   {
  -                    //handler = (Creator) provider.access( stage );
                       handler = (Creator) provider.resolve( this );
                   } catch( Throwable e )
                   {
  
  
  
  1.4       +1 -0      avalon-sandbox/merlin/merlin-cli/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	20 Apr 2003 12:15:13 -0000	1.3
  +++ maven.xml	28 Apr 2003 21:19:43 -0000	1.4
  @@ -1,6 +1,7 @@
   <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
   
     <property name="maven.jar.manifest" value="${basedir}/src/etc/project.mf"/>
  +  <property name="maven.jar.manifest.extensions.add" value="false"/>
   
     <!--
     Get the i18n and Commons CLI jars and unpack them into the Maven 
  
  
  
  1.4       +15 -2     avalon-sandbox/merlin/merlin-smp/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	2 Apr 2003 15:58:38 -0000	1.3
  +++ maven.xml	28 Apr 2003 21:19:43 -0000	1.4
  @@ -10,6 +10,16 @@
     </preGoal>
   
     <!--
  +  <preGoal name="maven-tasklist-plugin:report">
  +    <echo>setting extended source path: ${basedir}</echo>
  +    <path id="merlin.path">
  +      <pathelement location="${basedir}/../meta-spi/src/java/"/>
  +    </path>
  +    <maven:addPath id="maven.compile.src.set" refid="merlin.path"/>
  +  </preGoal>
  +  -->
  +
  +  <!--
     In order to build consolidated project javadoc and related 
     information we need to build up a simulated source path containing
     the source directories of the different packages that make up the 
  @@ -17,15 +27,18 @@
     -->
   
     <path id="merlin.path">
  -    <pathelement location="${basedir}/../meta/src/java/"/>
       <pathelement location="${basedir}/../meta-spi/src/java/"/>
  -    <pathelement location="${basedir}/../assembly/src/java/"/>
  +    <pathelement location="${basedir}/../meta/src/java/"/>
       <pathelement location="${basedir}/../assembly-spi/src/java/"/>
  +    <pathelement location="${basedir}/../assembly/src/java/"/>
       <pathelement location="${basedir}/../merlin-core/src/java/"/>
       <pathelement location="${basedir}/../merlin-spi/src/java/"/>
       <pathelement location="${basedir}/../merlin-cli/src/java/"/>
     </path>
   
     <maven:addPath id="maven.compile.src.set" refid="merlin.path"/>
  +  <!--
  +  -->
  +
   
   </project>
  
  
  
  1.10      +1 -2      avalon-sandbox/merlin/merlin-smp/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	27 Apr 2003 09:28:51 -0000	1.9
  +++ project.xml	28 Apr 2003 21:19:43 -0000	1.10
  @@ -113,11 +113,10 @@
     </packageGroups>
   
     <reports>
  -    <!--<report>maven-javadoc-plugin</report>-->
  -    <!--<report>maven-jdepend-plugin</report>-->
       <report>maven-changelog-plugin</report>
       <report>maven-file-activity-plugin</report>
       <report>maven-developer-activity-plugin</report>
  +    <!--<report>maven-tasklist-plugin</report>-->
     </reports>
   
   </project>
  
  
  
  1.3       +26 -7     avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/containers.xml
  
  Index: containers.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/containers.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- containers.xml	25 Apr 2003 17:02:48 -0000	1.2
  +++ containers.xml	28 Apr 2003 21:19:43 -0000	1.3
  @@ -65,13 +65,32 @@
             </tr>
           </table>
   
  -        <p>
  -        In addition to the above, a container is logically a component as 
  -        as such any of the classic component related directives may be included
  -        at this level. The default component does not require and suppliementary
  -        information, however, if a custom container type is declared, you want 
  -        to include additional directives concerning context, configuration, etc.
  -        </p>
  +      </subsection>
  +      <subsection name="Nested Elements (from component)">
  +
  +        <table>
  +          <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
  +
  +          <tr>
  +            <td><a href="components/categories/index.html">categories</a></td><td>0..1</td>
  +            <td>Defintion of the priority and targets parameterization to apply
  +                to logging channels declared by the component.</td>
  +          </tr>
  +          <tr>
  +            <td><a href="components/context/index.html">context</a></td><td>0..1</td>
  +            <td>Defintion of the context class and entries.</td>
  +          </tr>
  +          <tr>
  +            <td><a href="components/parameters/index.html">parameters</a></td><td>0..1</td>
  +            <td>Defintion of the parameters to be supplied during Parameterization of the 
  +                component.</td>
  +          </tr>
  +          <tr>
  +            <td><a href="components/configuration.html">configuration</a></td><td>0..1</td>
  +            <td>The configuration fragment to be applied to the target component during a 
  +                configuration lifecycle stage.</td>
  +          </tr>
  +        </table>
         </subsection>
   
         <subsection name="Description">
  
  
  
  1.2       +80 -4     avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/includes.xml
  
  Index: includes.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/includes.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- includes.xml	2 Apr 2003 15:52:11 -0000	1.1
  +++ includes.xml	28 Apr 2003 21:19:43 -0000	1.2
  @@ -3,20 +3,96 @@
   <document>
   
     <header>
  -    <title>Include Directives</title>
  +    <title>Include Directive</title>
       <authors>
         <person name="Stephen McConnell" email="mcconnell@apache.org"/>
       </authors>
     </header>
   
     <body>
  -
       <section name="Include Directive">
  -      <p>In preparation.</p>
  -    </section>
   
  +      <subsection name="Attributes">
  +
  +        <table>
  +          <tr><th>Attribute</th><th>Required</th><th>Description</th></tr>
  +          <tr>
  +            <td>id</td><td>normally</td>
  +            <td>
  +            A resource artifact identifier in form [group]:[artifact-name]. The value
  +            identifes a jar file containing a block defintition that is resolved 
  +            relative to a repository established by the Merlin Kernel.
  +            </td>
  +          </tr>
  +          <tr>
  +            <td>version</td><td>no</td>
  +            <td>
  +            Used in conjuction with the id attribute to qualify the artifact version.
  +            </td>
  +          </tr>
  +          <tr>
  +            <td>config</td><td>no</td>
  +            <td>
  +            Relative url referencing a configuration target defintion.
  +            </td>
  +          </tr>
  +          <tr>
  +            <td>path</td><td>no</td>
  +            <td>
  +            May be used to reference a jar file relative to the base directory
  +            of the containing block. Is useful as alternative form to the "id"
  +            model during development. If the "path" attribute is declared, the 
  +            id and version attribute will be ignored.
  +            </td>
  +          </tr>
  +        </table>
  +
  +        <p>
  +        NOTE: It is an error the include directive does not container one of 
  +        two possible include forms ("path" or "id").
  +        </p>
  +      </subsection>
  +
  +      <subsection name="Description">
  +<p>An include directive instructs Merlin to load and deploy the block defined within the referenced jar file as a subcontainer within the enclosing container.  The include directive is equivalent to the nesting of a full block definition within another block.  Block includes enable composition of pre-packaged component based solutions as the included block appears to other components as a regual component (exposing services and dependecies, etc.).</p>
  +      </subsection>
  +
  +      <subsection name="Sample XML">
  +<p>
  +The following example block.xml demonstrates the inclusion of three blocks within another enclosing block.  In this example, the common shared API (containing service interfaces classes is declared in the containing block classloader).
  +</p>
  +
  +<source><![CDATA[
  +<block>
  +
  +   <info>
  +     <name>tutorial</name>
  +   </info>
  +
  +   <implementation>
  +
  +     <engine>
  +       <classpath>
  +         <repository>
  +           <resource id="tutorial:composition-api" version="1.0"/>
  +         </repository>
  +       </classpath>
  +     </engine>
  +
  +     <include id="tutorial:composition-publisher" version="1.0"/>
  +     <include id="tutorial:composition-application" version="1.0"/>
  +     <include id="tutorial:composition-location" version="1.0"/>
  +
  +   </implementation>
  +
  +</block>
  +]]></source>
  +
  +     </subsection>
  +    </section>
     </body>
   
   </document>
  +
   
   
  
  
  
  1.4       +25 -7     avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/index.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index.xml	25 Apr 2003 17:02:48 -0000	1.3
  +++ index.xml	28 Apr 2003 21:19:43 -0000	1.4
  @@ -65,14 +65,32 @@
             </tr>
           </table>
   
  -        <p>
  -        In addition to the above, a container is logically a component as 
  -        as such any of the classic component related directives may be included
  -        at this level. The default component does not require and suppliementary
  -        information, however, if a custom container type is declared, you want 
  -        to include additional directives concerning context, configuration, etc.
  -        </p>
  +      </subsection>
  +      <subsection name="Nested Elements (from component)">
   
  +        <table>
  +          <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
  +
  +          <tr>
  +            <td><a href="components/categories/index.html">categories</a></td><td>0..1</td>
  +            <td>Defintion of the priority and targets parameterization to apply
  +                to logging channels declared by the component.</td>
  +          </tr>
  +          <tr>
  +            <td><a href="components/context/index.html">context</a></td><td>0..1</td>
  +            <td>Defintion of the context class and entries.</td>
  +          </tr>
  +          <tr>
  +            <td><a href="components/parameters/index.html">parameters</a></td><td>0..1</td>
  +            <td>Defintion of the parameters to be supplied during Parameterization of the 
  +                component.</td>
  +          </tr>
  +          <tr>
  +            <td><a href="components/configuration.html">configuration</a></td><td>0..1</td>
  +            <td>The configuration fragment to be applied to the target component during a 
  +                configuration lifecycle stage.</td>
  +          </tr>
  +        </table>
         </subsection>
   
         <subsection name="Description">
  
  
  
  1.8       +3 -9      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	27 Apr 2003 09:28:52 -0000	1.7
  +++ navigation.xml	28 Apr 2003 21:19:43 -0000	1.8
  @@ -26,15 +26,9 @@
               <item name="Dependencies" href="/meta/model/block/import/index.html"/>
               <item name="Implementation" href="/meta/model/block/container/index.html">
                 <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -              <item name="Components" href="/meta/model/block/container/components/index.html"/>
  -              <item name="Containers" href="/meta/model/block/container/containers.html">
  -                <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -                <item name="Components" 
  -                  href="/meta/model/block/container/components/index.html"/>
  -                <item name="Containers" href="/meta/model/block/container/containers.html"/>
  -                <item name="Includes" href="/meta/model/block/container/includes.html"/>
  -              </item>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Component" href="/meta/model/block/container/components/index.html"/>
  +              <item name="Container" href="/meta/model/block/container/containers.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  +++ navigation.xml	28 Apr 2003 21:19:43 -0000	1.3
  @@ -26,7 +26,7 @@
               <item name="Dependencies" href="/meta/model/block/import/index.html"/>
               <item name="Implementation" href="/meta/model/block/container/index.html">
                 <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -              <item name="Components"
  +              <item name="Component"
                   href="/meta/model/block/container/components/index.html">
                   <item name="Categories" 
                     href="/meta/model/block/container/components/categories/index.html"/>
  @@ -37,9 +37,9 @@
                   <item name="Parameters" 
                     href="/meta/model/block/container/components/parameters/index.html"/>
                 </item>
  -              <item name="Containers" 
  +              <item name="Container" 
                   href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/categories/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/categories/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  +++ navigation.xml	28 Apr 2003 21:19:43 -0000	1.3
  @@ -26,7 +26,7 @@
               <item name="Dependencies" href="/meta/model/block/import/index.html"/>
               <item name="Implementation" href="/meta/model/block/container/index.html">
                 <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -              <item name="Components" 
  +              <item name="Component" 
                   href="/meta/model/block/container/components/index.html">
                   <item name="Categories" href="/meta/model/block/container/components/categories/index.html">
                     <item name="Category" href="/meta/model/block/container/components/categories/category.html"/>
  @@ -35,9 +35,9 @@
                   <item name="Configuration" href="/meta/model/block/container/components/configuration.html"/>
                   <item name="Parameters" href="/meta/model/block/container/components/parameters/index.html"/>
                 </item>
  -              <item name="Containers" 
  +              <item name="Container" 
                   href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/context/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  +++ navigation.xml	28 Apr 2003 21:19:43 -0000	1.3
  @@ -26,7 +26,7 @@
               <item name="Dependencies" href="/meta/model/block/import/index.html"/>
               <item name="Implementation" href="/meta/model/block/container/index.html">
                 <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -              <item name="Components" 
  +              <item name="Component" 
                   href="/meta/model/block/container/components/index.html">
                   <item name="Categories" href="/meta/model/block/container/components/categories/index.html"/>
                   <item name="Categories" href="/meta/model/block/container/components/categories/index.html"/>
  @@ -37,9 +37,9 @@
                   <item name="Configuration" href="/meta/model/block/container/components/configuration.html"/>
                   <item name="Parameters" href="/meta/model/block/container/components/parameters/index.html"/>
                 </item>
  -              <item name="Containers" 
  +              <item name="Container" 
                   href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.2       +3 -8      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/context/entry/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/context/entry/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	25 Apr 2003 17:04:57 -0000	1.1
  +++ index.xml	28 Apr 2003 21:19:43 -0000	1.2
  @@ -32,19 +32,14 @@
   
         </subsection>
         <subsection name="Nested Elements">
  -
  -        <p>
  -        If the value of the element is not empty, the value will be 
  -        used as a default constructor argument.  Otherwise, Merlin will attempt to 
  -        locate parameter elements in order to build a new instance.
  -        </p>
  -
           <table>
             <tr><th>Element</th><th>Cardinality</th><th>Description</th></tr>
             <tr>
               <td><a href="parameter.html">parameter</a></td><td>n</td>
               <td>
  -                A constructor argument.
  +            A constructor argument.If the value of the element is not empty, the value will be 
  +            used as a default constructor argument.  Otherwise, Merlin will attempt to 
  +            locate nested parameter elements in order to build a new instance.
               </td>
             </tr>
           </table>
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/context/entry/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/context/entry/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  +++ navigation.xml	28 Apr 2003 21:19:43 -0000	1.3
  @@ -26,7 +26,7 @@
               <item name="Dependencies" href="/meta/model/block/import/index.html"/>
               <item name="Implementation" href="/meta/model/block/container/index.html">
                 <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -              <item name="Components" 
  +              <item name="Component" 
                   href="/meta/model/block/container/components/index.html">
                   <item name="Categories" href="/meta/model/block/container/components/categories/index.html"/>
                   <item name="Categories" href="/meta/model/block/container/components/categories/index.html"/>
  @@ -40,9 +40,9 @@
                   <item name="Configuration" href="/meta/model/block/container/components/configuration.html"/>
                   <item name="Parameters" href="/meta/model/block/container/components/parameters/index.html"/>
                 </item>
  -              <item name="Containers" 
  +              <item name="Container" 
                   href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.3       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/parameters/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components/parameters/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  +++ navigation.xml	28 Apr 2003 21:19:44 -0000	1.3
  @@ -26,7 +26,7 @@
               <item name="Dependencies" href="/meta/model/block/import/index.html"/>
               <item name="Implementation" href="/meta/model/block/container/index.html">
                 <item name="Engine" href="/meta/model/block/container/engine/index.html"/>
  -              <item name="Components"
  +              <item name="Component"
                   href="/meta/model/block/container/components/index.html">
                   <item name="Categories" 
                     href="/meta/model/block/container/components/categories/index.html"/>
  @@ -40,9 +40,9 @@
                       href="/meta/model/block/container/components/parameters/parameter.html"/>
                   </item>
                 </item>
  -              <item name="Containers" 
  +              <item name="Container" 
                   href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.8       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	27 Apr 2003 09:28:53 -0000	1.7
  +++ navigation.xml	28 Apr 2003 21:19:44 -0000	1.8
  @@ -29,9 +29,9 @@
                   <item name="Classpath" href="/meta/model/block/container/engine/classpath/index.html"/>
                   <item name="Library" href="/meta/model/block/container/engine/extensions.html"/>
                 </item>
  -              <item name="Components" href="/meta/model/block/container/components/index.html"/>
  -              <item name="Containers" href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Component" href="/meta/model/block/container/components/index.html"/>
  +              <item name="Container" href="/meta/model/block/container/containers.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.8       +3 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/classpath/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/engine/classpath/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	27 Apr 2003 09:28:53 -0000	1.7
  +++ navigation.xml	28 Apr 2003 21:19:44 -0000	1.8
  @@ -32,9 +32,9 @@
                   </item>
                   <item name="Library" href="/meta/model/block/container/engine/extensions.html"/>
                 </item>
  -              <item name="Components" href="/meta/model/block/container/components/index.html"/>
  -              <item name="Containers" href="/meta/model/block/container/containers.html"/>
  -              <item name="Includes" href="/meta/model/block/container/includes.html"/>
  +              <item name="Component" href="/meta/model/block/container/components/index.html"/>
  +              <item name="Container" href="/meta/model/block/container/containers.html"/>
  +              <item name="Include" href="/meta/model/block/container/includes.html"/>
               </item>
             </item>
           </item>
  
  
  
  1.5       +3 -2      avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java
  
  Index: Profile.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Profile.java	24 Apr 2003 12:44:29 -0000	1.4
  +++ Profile.java	28 Apr 2003 21:19:44 -0000	1.5
  @@ -292,7 +292,8 @@
       }
   
       /**
  -     * Return the base Configuration for the profile.
  +     * Return the base Configuration for the profile.  The implementation
  +     * garantees that the supplied configuration is not null.
        *
        * @return the base Configuration for profile.
        */
  
  
  

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


Mime
View raw message