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/merlin-spi/src/java/org/apache/avalon/merlin/kernel Kernel.java
Date Sun, 27 Apr 2003 09:28:55 GMT
mcconnell    2003/04/27 02:28:55

  Modified:    merlin   maven.xml
               merlin/assembly project.xml
               merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
                        BlockURLConnection.java DefaultAppliance.java
               merlin/assembly/src/java/org/apache/avalon/assembly/engine/profile/impl
                        package.html
               merlin/assembly/src/java/org/apache/avalon/assembly/engine/service/impl
                        package.html
               merlin/assembly/src/java/org/apache/avalon/assembly/engine/type/impl
                        package.html
               merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl
                        package.html
               merlin/assembly/src/java/org/apache/avalon/assembly/logging/impl
                        FileTargetProvider.java package.html
               merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance
                        Appliance.java ApplianceContext.java
               merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging
                        package.html
               merlin/merlin-cli project.xml
               merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        StandardBlock.java StandardBlockLoader.java
               merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernel.java
               merlin/merlin-smp project.xml
               merlin/merlin-smp/xdocs navigation.xml
               merlin/merlin-smp/xdocs/about navigation.xml
               merlin/merlin-smp/xdocs/extensions/jndi navigation.xml
               merlin/merlin-smp/xdocs/extensions/servlet navigation.xml
               merlin/merlin-smp/xdocs/merlin navigation.xml
               merlin/merlin-smp/xdocs/merlin/appliance navigation.xml
               merlin/merlin-smp/xdocs/merlin/block navigation.xml
               merlin/merlin-smp/xdocs/merlin/kernel index.xml
                        navigation.xml
               merlin/merlin-smp/xdocs/meta navigation.xml
               merlin/merlin-smp/xdocs/meta/info navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/context
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/dependencies
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/extensions
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/loggers
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/services
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/info/type/stages navigation.xml
               merlin/merlin-smp/xdocs/meta/model navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/container
                        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
                        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/merlin-smp/xdocs/meta/model/block/export
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/block/import
                        navigation.xml
               merlin/merlin-smp/xdocs/meta/model/kernel navigation.xml
               merlin/merlin-smp/xdocs/starting navigation.xml
               merlin/merlin-smp/xdocs/starting/advanced navigation.xml
               merlin/merlin-smp/xdocs/starting/examples navigation.xml
               merlin/merlin-smp/xdocs/starting/examples/afs navigation.xml
               merlin/merlin-smp/xdocs/starting/examples/afs/simple
                        navigation.xml
               merlin/merlin-smp/xdocs/starting/hello navigation.xml
               merlin/merlin-smp/xdocs/starting/hello/config navigation.xml
               merlin/merlin-smp/xdocs/starting/hello/context
                        navigation.xml
               merlin/merlin-smp/xdocs/tools navigation.xml
               merlin/merlin-smp/xdocs/tools/tags index.xml navigation.xml
               merlin/merlin-spi project.xml
               merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel
                        Kernel.java
  Log:
  General housekeeping.
  
  Revision  Changes    Path
  1.10      +39 -2     avalon-sandbox/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- maven.xml	20 Apr 2003 12:56:54 -0000	1.9
  +++ maven.xml	27 Apr 2003 09:28:48 -0000	1.10
  @@ -1,5 +1,8 @@
   <project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
   
  +  <property file="${basedir}/../build.properties"/>
  +  <property file="${basedir}/../project.properties"/>
  +  <property file="project.properties"/>
     <property name="merlin.build.inst" value="inst"/>
     <property name="merlin.build.inst.dir" value="${maven.build.dir}/${merlin.build.inst}"/>
   
  @@ -123,11 +126,10 @@
     -->
     <goal name="merlin-site"
       description="Build the Merlin site.">
  -
       <maven:reactor
         basedir="${basedir}"
         includes="merlin-smp/project.xml"
  -      goals="site"
  +      goals="xjavadoc,site"
         banner="Building site."
         ignoreFailures="false"/>
   
  @@ -195,6 +197,41 @@
           <include name="**/*"/>
         </fileset>
       </copy>
  +  </goal>
  +
  +  <goal name="xjavadoc">
  +    <mkdir dir="${basedir}/target/docs/api" />
  +    <property name="copyright"
  +      value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved." />
  +    <property name="title" value="${pom.name} ${pom.currentVersion} API"/>
  +    <javadoc destdir="${basedir}/target/docs/api" 
  +	doctitle="&lt;h1&gt;Merlin Service Management API&lt;/h1&gt;" 
  +      noindex="false" author="true" use="true"
  +	windowtitle="${title}" 
  +      bottom="${copyright}"
  +      additionalparam="-breakiterator -J-Xmx128m -tag todo:a:ToDo: "
  +      packagenames="*,org.*">
  +        <j:forEach var="packageGroup" items="${pom.packageGroups}">
  +      	  <group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
  +        </j:forEach>
  +        <sourcepath path="${basedir}/../meta-spi/src/java"/>
  +        <sourcepath path="${basedir}/../meta/src/java"/>
  +        <sourcepath path="${basedir}/../assembly-spi/src/java"/>
  +        <sourcepath path="${basedir}/../assembly/src/java"/>
  +        <sourcepath path="${basedir}/../merlin-spi/src/java"/>
  +        <sourcepath path="${basedir}/../merlin-core/src/java"/>
  +        <classpath>
  +          <path refid="maven.dependency.classpath"/>
  +	  </classpath>
  +	  <link href="${sun.j2se.link}" />
  +	  <link href="${avalon.framework.link}" />
  +	  <link href="${avalon.logkit.link}" />
  +	  <link href="${avalon.lifecycle.link}" />
  +	  <link href="${excalibur.configuration.link}" />
  +	  <link href="${excalibur.pool.link}" />
  +	  <link href="${excalibur.thread.link}" />
  +	  <link href="${excalibur.event.link}" />
  +    </javadoc>
     </goal>
   
   
  
  
  
  1.4       +1 -0      avalon-sandbox/merlin/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	20 Apr 2003 12:11:38 -0000	1.3
  +++ project.xml	27 Apr 2003 09:28:48 -0000	1.4
  @@ -7,6 +7,7 @@
     <groupId>avalon</groupId>
     <id>avalon-assembly</id>
     <name>Avalon Assembly Framework</name>
  +  <package>org.apache.avalon.assembly</package>
   
     <inceptionYear>2002</inceptionYear>
     <shortDescription>
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/BlockURLConnection.java
  
  Index: BlockURLConnection.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/BlockURLConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BlockURLConnection.java	26 Apr 2003 12:37:43 -0000	1.1
  +++ BlockURLConnection.java	27 Apr 2003 09:28:48 -0000	1.2
  @@ -67,7 +67,7 @@
    * URL connection handler for the service protocol. New instances of
    * the <code>ServiceURLConnection</code> are created by a service
    * URL <code>Handler</code> class.
  - * @see Handler
  + * @see BlockURLHandler
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    */
   public class BlockURLConnection extends URLConnection
  
  
  
  1.2       +3 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/DefaultAppliance.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultAppliance.java	26 Apr 2003 12:37:43 -0000	1.1
  +++ DefaultAppliance.java	27 Apr 2003 09:28:48 -0000	1.2
  @@ -63,6 +63,7 @@
   import org.apache.avalon.assembly.appliance.UnknownServiceException;
   import org.apache.avalon.assembly.appliance.ApplianceException;
   import org.apache.avalon.assembly.appliance.ApplianceRuntimeException;
  +import org.apache.avalon.assembly.engine.Engine;
   import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
   import org.apache.avalon.assembly.engine.RepositoryManager;
   import org.apache.avalon.assembly.lifestyle.LifestyleHandler;
  @@ -83,6 +84,7 @@
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.Type;
  +import org.apache.avalon.meta.model.Profile;
   import org.apache.avalon.meta.model.ContextDirective;
   import org.apache.avalon.meta.model.LoggingDirective;
   
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/profile/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/profile/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	26 Apr 2003 12:37:44 -0000	1.1
  +++ package.html	27 Apr 2003 09:28:49 -0000	1.2
  @@ -1,6 +1,6 @@
   <body>
   <p>The <code>profile</code> package contains classes and interfaces for the
  -{@link org.apache.avalon.assembly.engine.profile.DefaultProfileRepository} and
  +{@link org.apache.avalon.assembly.engine.profile.impl.DefaultProfileRepository} and
   related default implementations supporting the management of a repository
   of profiles.</p>
   </body>
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/service/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/service/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	26 Apr 2003 12:37:44 -0000	1.1
  +++ package.html	27 Apr 2003 09:28:49 -0000	1.2
  @@ -1,6 +1,6 @@
   <body>
   <p>The <code>service</code> package contains classes and interfaces for the
  -{@link org.apache.avalon.assembly.engine.service.ClassloaderServiceManager}
  +{@link org.apache.avalon.assembly.engine.service.impl.DefaultServiceRepository}
   and related default implementations supporting the management of a
   repository of service defintions.</p>
   </body>
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/type/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/type/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	26 Apr 2003 12:37:45 -0000	1.1
  +++ package.html	27 Apr 2003 09:28:49 -0000	1.2
  @@ -1,6 +1,6 @@
   <body>
   <p>The <code>type</code> package contains classes and interfaces for the
  -{@link org.apache.avalon.assembly.engine.type.DefaultTypeRepository} and
  +{@link org.apache.avalon.assembly.engine.type.impl.DefaultTypeRepository} and
   related default implementations supporting the management of a repository
   of component types.</p>
   </body>
  
  
  
  1.2       +2 -5      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifecycle/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	26 Apr 2003 12:37:46 -0000	1.1
  +++ package.html	27 Apr 2003 09:28:49 -0000	1.2
  @@ -1,11 +1,8 @@
   <body>
   <p>The <code>lifecycle</code> package includes interfaces and classes
  -supporting the lifecycle processing of a component. See
  -<a href="http://avalon.apache.org/framework/reference-the-lifecycle.html">The Lifecycle Spec</a>
  -for more info on the various lifecycle stages. The lifecycle package
  -currently does not support suspending or resuming components.</p>
  +supporting the lifecycle processing of a component.</p>
   
   <p>A service is defined for each stage of the lifecycle, and these
   are then combined into a single deployment service which provides
   general support for component setup and disposal.</p>
  -</body>
  \ No newline at end of file
  +</body>
  
  
  
  1.2       +2 -2      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/impl/FileTargetProvider.java
  
  Index: FileTargetProvider.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/impl/FileTargetProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileTargetProvider.java	26 Apr 2003 12:37:47 -0000	1.1
  +++ FileTargetProvider.java	27 Apr 2003 09:28:49 -0000	1.2
  @@ -66,7 +66,7 @@
    *    <font color="gray">&lt;/target&gt;</font>
    * </pre>
    *
  - * @see TargetDescriptor
  + * @see TargetProvider
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
    */
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/impl/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/logging/impl/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	26 Apr 2003 12:37:47 -0000	1.1
  +++ package.html	27 Apr 2003 09:28:49 -0000	1.2
  @@ -1,6 +1,6 @@
   <body>
   <p>The <code>logging</code> package contains the
  -{@link org.apache.avalon.assembly.logging.DefaultLoggingManager} which
  +{@link org.apache.avalon.assembly.logging.impl.DefaultLoggingManager} which
   is an initial bootstrap logging mananager that uses mata information
   about logging targets and catagories.  This class is subject to
   refactoring to bring in into a component model to enable easy
  
  
  
  1.8       +1 -2      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java
  
  Index: Appliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Appliance.java	24 Apr 2003 12:29:56 -0000	1.7
  +++ Appliance.java	27 Apr 2003 09:28:49 -0000	1.8
  @@ -82,7 +82,6 @@
    * An appliance is responsible for component lifestyle and lifecycle
    * management during the deployment and decommission cycles.
    *
  - * @see DefaultAppliance
    *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
  
  
  
  1.4       +1 -6      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java
  
  Index: ApplianceContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApplianceContext.java	20 Apr 2003 12:13:54 -0000	1.3
  +++ ApplianceContext.java	27 Apr 2003 09:28:49 -0000	1.4
  @@ -85,7 +85,6 @@
        * a policy of startup on startup of the enclosing container.  A value of
        * FALSE defers activation until demand.  The default value is FALSE.
        *
  -     * @see DefaultApplianceContext#setActivationPolicy( boolean )
        * @see #getActivationPolicy()
        */
       public static final String ACTIVATION_KEY = "urn:assembly:appliance.activation";
  @@ -96,7 +95,6 @@
        * will normally be supplied by a containerment system and typically refers to
        * the containment path.
        *
  -     * @see DefaultApplianceContext#setPartitionName( String )
        * @see #getPartitionName()
        */
       public static final String PARTITION_KEY = "urn:assembly:appliance.partition";
  @@ -106,7 +104,6 @@
        * context information that will be supplied to te context handling framework along
        * with the system context information.
        *
  -     * @see DefaultApplianceContext#setDeploymentContext( Map )
        * @see #getDeploymentContext()
        */
       public static final String DEPLOYMENT_KEY = "urn:assembly:appliance.deployment";
  @@ -117,7 +114,6 @@
        * will be the type name.  If the type and profile names are different, the default
        * name will be "<type-name>#<profile-name>.
        *
  -     * @see DefaultApplianceContext#setName( String )
        * @see #getName()
        */
       public static final String NAME_KEY = "urn:assembly:appliance.name";
  @@ -126,7 +122,6 @@
        * Logging directives to be assigned to the appliance.  The default value
        * corresponds to any logging directives declared under the appliance profile.
        *
  -     * @see DefaultApplianceContext#setLoggingDirective( LoggingDirective )
        * @see #getLoggingDirective()
        */
       public static final String LOGGING_KEY = "urn:assembly:appliance.logging.directive";
  
  
  
  1.4       +3 -5      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/package.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- package.html	25 Apr 2003 08:40:12 -0000	1.3
  +++ package.html	27 Apr 2003 09:28:50 -0000	1.4
  @@ -1,9 +1,7 @@
   <body>
   <p>The <code>logging</code> package contains the
  -{@link org.apache.avalon.assembly.logging.DefaultLoggingManager} which
  -is an initial bootstrap logging mananager that uses mata information
  -about logging targets and catagories.  This class is subject to
  -refactoring to bring in into a component model to enable easy
  -specialization and/or replacement.
  +{@link org.apache.avalon.assembly.logging.LoggingManager} which
  +is an interface to the initial bootstrap logging mananager that uses mata information
  +about logging targets and catagories.
   </p>
   </body>
  
  
  
  1.5       +1 -1      avalon-sandbox/merlin/merlin-cli/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	13 Apr 2003 02:45:25 -0000	1.4
  +++ project.xml	27 Apr 2003 09:28:50 -0000	1.5
  @@ -6,7 +6,7 @@
     <groupId>merlin</groupId>
     <id>merlin-cli</id>
     <name>Merlin CLI</name>
  -  <package></package>
  +  <package>*</package>
   
     <currentVersion>1.0</currentVersion>
     <inceptionYear>2003</inceptionYear>
  
  
  
  1.4       +0 -1      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.java
  
  Index: StandardBlock.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlock.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StandardBlock.java	26 Apr 2003 12:37:48 -0000	1.3
  +++ StandardBlock.java	27 Apr 2003 09:28:50 -0000	1.4
  @@ -76,7 +76,6 @@
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.merlin.block.Block;
   import org.apache.avalon.merlin.block.BlockException;
  -import org.apache.avalon.merlin.block.Library;
   import org.apache.avalon.merlin.container.Container;
   import org.apache.avalon.merlin.container.ContainmentProfile;
   import org.apache.avalon.merlin.container.VirtualService;
  
  
  
  1.4       +2 -4      avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java
  
  Index: StandardBlockLoader.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/StandardBlockLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StandardBlockLoader.java	26 Apr 2003 12:37:48 -0000	1.3
  +++ StandardBlockLoader.java	27 Apr 2003 09:28:50 -0000	1.4
  @@ -87,9 +87,7 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.merlin.block.Block;
   import org.apache.avalon.merlin.block.BlockException;
  -import org.apache.avalon.merlin.block.BlockLoader;
   import org.apache.avalon.merlin.block.BlockRuntimeException;
  -import org.apache.avalon.merlin.block.Library;
   import org.apache.avalon.merlin.container.Container;
   import org.apache.avalon.merlin.container.Target;
   import org.apache.avalon.merlin.container.Targets;
  @@ -132,7 +130,7 @@
    * @see StandardBlock
    */
   
  -public class StandardBlockLoader extends AbstractLogEnabled implements Contextualizable, Initializable, Disposable, BlockLoader
  +public class StandardBlockLoader extends AbstractLogEnabled implements Contextualizable, Initializable, Disposable
   {
       //==============================================================
       // static
  
  
  
  1.13      +1 -11     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultKernel.java	26 Apr 2003 12:37:48 -0000	1.12
  +++ DefaultKernel.java	27 Apr 2003 09:28:51 -0000	1.13
  @@ -55,11 +55,6 @@
   import java.util.ArrayList;
   
   import org.apache.avalon.assembly.appliance.DependencyGraph;
  -import org.apache.avalon.assembly.engine.impl.EngineClassLoader;
  -import org.apache.avalon.assembly.engine.model.Classpath;
  -import org.apache.avalon.assembly.engine.model.ClasspathDescriptor;
  -import org.apache.avalon.assembly.engine.model.LibraryDescriptor;
  -import org.apache.avalon.assembly.engine.model.impl.DefaultClasspath;
   import org.apache.avalon.assembly.locator.Contextualizable;
   import org.apache.avalon.assembly.locator.Locator;
   import org.apache.avalon.assembly.locator.impl.DefaultLocator;
  @@ -185,11 +180,6 @@
        * The common classloader.
        */
       private ClassLoader m_common;
  -
  -    /**
  -     * The assembly engine.
  -     */
  -    private EngineClassLoader m_engine;
   
       /**
        * The system context.
  
  
  
  1.9       +12 -4     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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	26 Apr 2003 12:46:21 -0000	1.8
  +++ project.xml	27 Apr 2003 09:28:51 -0000	1.9
  @@ -91,12 +91,20 @@
     
     <packageGroups>
       <packageGroup>
  -      <title>Merlin Service Management</title>
  -      <packages>org.apache.avalon.merlin,org.apache.avalon.merlin.*</packages>
  +      <title>Merlin SPI</title>
  +      <packages>org.apache.avalon.merlin.block,org.apache.avalon.merlin.container,org.apache.avalon.merlin.kernel</packages>
  +    </packageGroup>
  +    <packageGroup>
  +      <title>Merlin Service Management Platform</title>
  +      <packages>org.apache.avalon.merlin.block.impl,org.apache.avalon.merlin.container.impl,org.apache.avalon.merlin.kernel.impl,org.apache.avalon.merlin.container.builder</packages>
  +    </packageGroup>
  +    <packageGroup>
  +      <title>Assembly SPI</title>
  +      <packages>org.apache.avalon.assembly.appliance,org.apache.avalon.assembly.engine,org.apache.avalon.assembly.engine.model,org.apache.avalon.assembly.engine.profile,org.apache.avalon.assembly.engine.service,org.apache.avalon.assembly.engine.type,org.apache.avalon.assembly.lifecycle,org.apache.avalon.assembly.lifestyle,org.apache.avalon.assembly.locator,org.apache.avalon.assembly.logging,org.apache.avalon.assembly.repository,org.apache.avalon.assembly.util</packages>
       </packageGroup>
       <packageGroup>
         <title>Assembly Framework</title>
  -      <packages>org.apache.avalon.assembly,org.apache.avalon.assembly.*</packages>
  +      <packages>org.apache.avalon.assembly.*</packages>
       </packageGroup>
       <packageGroup>
         <title>Meta Model</title>
  @@ -105,7 +113,7 @@
     </packageGroups>
   
     <reports>
  -    <report>maven-javadoc-plugin</report>
  +    <!--<report>maven-javadoc-plugin</report>-->
       <!--<report>maven-jdepend-plugin</report>-->
       <report>maven-changelog-plugin</report>
       <report>maven-file-activity-plugin</report>
  
  
  
  1.10      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	17 Apr 2003 22:01:47 -0000	1.9
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.10
  @@ -19,6 +19,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.6       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/about/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/about/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.5
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.6
  @@ -23,6 +23,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/extensions/jndi/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/extensions/jndi/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.7
  @@ -18,6 +18,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.3       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/extensions/servlet/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/extensions/servlet/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.2
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.3
  @@ -19,6 +19,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.5       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/merlin/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/navigation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.4
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.5
  @@ -22,6 +22,7 @@
         </item>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.4       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/appliance/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.3
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.4
  @@ -26,6 +26,7 @@
         </item>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.6       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	25 Apr 2003 17:02:46 -0000	1.5
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.6
  @@ -23,6 +23,7 @@
         </item>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-smp/xdocs/merlin/kernel/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/kernel/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	8 Apr 2003 11:19:52 -0000	1.2
  +++ index.xml	27 Apr 2003 09:28:51 -0000	1.3
  @@ -14,7 +14,7 @@
       <section name="Merlin Kernel">
   
       <p>
  -Merlin separates the concepts of <strong>Kernel</strong> and <strong>Container</strong>. A kernel manages <em>resources</em> (Objects) whereas a container manages <em>services</em>. Merlin provides a default kernel that manages a container hierarchy: <a href="../../apidocs/org/apache/avalon/merlin/kernel/impl/DefaultKernel.html">DefaultKernel</a>. It handles overall management, including startup, shutdown, extension management, and other system-wide tasks.
  +Merlin separates the concepts of <strong>Kernel</strong> and <strong>Container</strong>. A kernel manages <em>resources</em> (Objects) whereas a container manages <em>services</em>. Merlin provides a default kernel that manages a container hierarchy: <a href="../../api/org/apache/avalon/merlin/kernel/impl/DefaultKernel.html">DefaultKernel</a>. It handles overall management, including startup, shutdown, extension management, and other system-wide tasks.
       </p>
   
       <p>
  
  
  
  1.6       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/merlin/kernel/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/kernel/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	25 Apr 2003 11:57:57 -0000	1.5
  +++ navigation.xml	27 Apr 2003 09:28:51 -0000	1.6
  @@ -26,6 +26,7 @@
         </item>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.7
  @@ -22,6 +22,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	17 Apr 2003 22:01:48 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.7
  @@ -25,6 +25,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	25 Apr 2003 11:57:58 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.7
  @@ -33,6 +33,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/context/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 11:57:58 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -35,6 +35,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/dependencies/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/dependencies/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 11:57:58 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -35,6 +35,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/extensions/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/extensions/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 11:57:59 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -35,6 +35,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/loggers/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/loggers/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 11:57:59 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -35,6 +35,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/services/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/services/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 11:57:59 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -35,6 +35,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/stages/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/info/type/stages/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 11:57:59 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -35,6 +35,7 @@
           <item name="Meta Data" href="/meta/model/index.html"/>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.8       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	25 Apr 2003 17:02:47 -0000	1.7
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.8
  @@ -26,6 +26,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	25 Apr 2003 17:02:48 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.7
  @@ -30,6 +30,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	25 Apr 2003 17:02:48 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.7
  @@ -40,6 +40,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:04:56 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:52 -0000	1.2
  @@ -45,6 +45,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:04:56 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  @@ -43,6 +43,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:04:56 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  @@ -45,6 +45,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:04:57 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  @@ -48,6 +48,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:04:57 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  @@ -48,6 +48,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	25 Apr 2003 17:02:48 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.7
  @@ -37,6 +37,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.7       +1 -0      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	25 Apr 2003 17:02:49 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.7
  @@ -40,6 +40,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/export/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/export/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:02:49 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  @@ -32,6 +32,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/import/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/import/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	25 Apr 2003 17:02:49 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.2
  @@ -32,6 +32,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.8       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/kernel/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/kernel/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	25 Apr 2003 17:02:50 -0000	1.7
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.8
  @@ -28,6 +28,7 @@
           </item>
         </item>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.8       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	17 Apr 2003 22:01:49 -0000	1.7
  +++ navigation.xml	27 Apr 2003 09:28:53 -0000	1.8
  @@ -23,6 +23,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.12      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/navigation.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- navigation.xml	24 Apr 2003 14:34:14 -0000	1.11
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.12
  @@ -28,6 +28,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.6       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	17 Apr 2003 22:01:50 -0000	1.5
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.6
  @@ -25,6 +25,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.6       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/navigation.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- navigation.xml	17 Apr 2003 22:01:50 -0000	1.5
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.6
  @@ -27,6 +27,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.8       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/navigation.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- navigation.xml	17 Apr 2003 22:01:50 -0000	1.7
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.8
  @@ -32,6 +32,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.12      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/navigation.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- navigation.xml	18 Apr 2003 21:01:37 -0000	1.11
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.12
  @@ -31,6 +31,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config/navigation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- navigation.xml	18 Apr 2003 21:01:37 -0000	1.1
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.2
  @@ -33,6 +33,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.10      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	18 Apr 2003 21:01:37 -0000	1.9
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.10
  @@ -35,6 +35,7 @@
         <item name="Merlin System" href="/merlin/index.html"/>
         <item name="Meta Model" href="/meta/index.html"/>
         <item name="Tools" href="/tools/index.html"/>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.10      +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/tools/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/tools/navigation.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navigation.xml	17 Apr 2003 22:01:50 -0000	1.9
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.10
  @@ -23,6 +23,7 @@
           <item name="Meta-Info Generator Task" href="/tools/ant.html"/>
           <item name="Merlin Plugin for Maven" href="/tools/maven.html"/>
         </item>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.2       +5 -5      avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	5 Apr 2003 09:04:16 -0000	1.1
  +++ index.xml	27 Apr 2003 09:28:54 -0000	1.2
  @@ -35,13 +35,13 @@
     <tr><td><a href="extension.html">@avalon.meta.extension</a></td>
       <td>class</td><td>Lifecycle stage handling capability declaration.</td></tr>
     <tr><td><a href="logger.html">@avalon.meta.logger</a></td>
  -    <td>enableLogging</td><td>Logging channel name declaration.</td></tr>
  +    <td>enableLogging()</td><td>Logging channel name declaration.</td></tr>
     <tr><td><a href="context.html">@avalon.meta.context</a></td>
  -    <td>contextualize</td><td>Declaration of a specialized context class.</td></tr>
  +    <td>contextualize()</td><td>Declaration of a specialized context class.</td></tr>
     <tr><td><a href="entry.html">@avalon.meta.entry</a></td>
  -    <td>contextualize</td><td>Context entry declaration.</td></tr>
  +    <td>contextualize()</td><td>Context entry declaration.</td></tr>
     <tr><td><a href="dependency.html">@avalon.meta.dependency</a></td>
  -    <td>service</td><td>Service type dependency declaration.</td></tr>
  +    <td>service()</td><td>Service type dependency declaration.</td></tr>
   </table>
         </subsection>
       </section>
  
  
  
  1.7       +1 -0      avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags/navigation.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- navigation.xml	17 Apr 2003 22:01:50 -0000	1.6
  +++ navigation.xml	27 Apr 2003 09:28:54 -0000	1.7
  @@ -36,6 +36,7 @@
           <item name="Meta-Info Generator Task" href="/tools/ant.html"/>
           <item name="Merlin Plugin for Maven" href="/tools/maven.html"/>
         </item>
  +      <item name="JavaDoc" href="/api/index.html"/>
       </menu>
   
       <menu name="Extensions">
  
  
  
  1.5       +0 -47     avalon-sandbox/merlin/merlin-spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	13 Apr 2003 02:41:39 -0000	1.4
  +++ project.xml	27 Apr 2003 09:28:55 -0000	1.5
  @@ -71,52 +71,5 @@
       </dependency>
   
     </dependencies>
  -  
  -  <build>
  -
  -    <sourceDirectory>src/java</sourceDirectory>
  -    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  -
  -    <!-- Unit test classes -->
  -    <unitTest>
  -      <includes>
  -        <include></include>
  -      </includes>
  -      <excludes>
  -      </excludes>
  -      <resources>
  -        <resource>
  -          <directory>${pom.build.unitTestSourceDirectory}</directory>
  -          <includes> 
  -            <include>**/*.properties</include>
  -            <include>**/*.xinfo</include>
  -            <include>**/*.xconfig</include>
  -            <include>**/*.xprofile</include>
  -            <include>**/*.xml</include>
  -            <include>**/*.xservice</include>
  -            </includes>
  -        </resource>
  -      </resources>
  -    </unitTest>
  -
  -    <testResources> 
  -      <testResource> 
  -        <directory>${basedir}/src/test</directory> 
  -        <includes> 
  -          <include>**/*.properties</include>
  -          <include>**/*.xinfo</include>
  -          <include>**/*.xconfig</include>
  -          <include>**/*.xml</include>
  -          <include>**/*.xservice</include>
  -        </includes>
  -      </testResource>
  -    </testResources>
  -
  -    <!-- Integration unit test classes -->
  -    <integrationUnitTestPatterns></integrationUnitTestPatterns>
  -
  -    <jars></jars>
  -
  -  </build>
   
   </project>
  
  
  
  1.4       +2 -2      avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/src/java/org/apache/avalon/merlin/kernel/Kernel.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Kernel.java	16 Apr 2003 14:22:45 -0000	1.3
  +++ Kernel.java	27 Apr 2003 09:28:55 -0000	1.4
  @@ -56,7 +56,7 @@
    * A service that provides support for the establishment and management of a set
    * of component container.
    * <p><b>UML</b></p>
  - * <p><image src="doc-files/Kernel.gif" border="0"/></p>
  + * <p><image src="doc-files/kernel.gif" border="0"/></p>
    *
    * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
    * @version $Revision$ $Date$
  
  
  

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


Mime
View raw message