avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/builder/doc-files TypeBuilder.gif
Date Fri, 12 Jul 2002 19:09:28 GMT
mcconnell    2002/07/12 12:09:28

  Modified:    assembly/src/java/org/apache/excalibur/merlin Main.java
               assembly/src/java/org/apache/excalibur/merlin/container
                        DefaultContainer.java DefaultContainer.xinfo
                        DependencyGraph.java LifecycleHelper.java
                        ProfileRegistry.java ResourceProvider.java
                        Resources.properties package.html
               assembly/src/java/org/apache/excalibur/merlin/kernel
                        DefaultKernel.java DefaultKernel.xinfo
                        DefaultLoggerManager.java Resources.properties
                        package.html
               assembly/src/java/org/apache/excalibur/merlin/model
                        AbstractContainer.java ContainerDescriptor.java
                        KernelDescriptor.java Profile.java package.html
               assembly/src/java/org/apache/excalibur/merlin/model/builder
                        ContainerCreator.java KernelCreator.java
                        XMLContainerCreator.java XMLKernelCreator.java
                        XMLProfileCreator.java
               assembly/src/java/org/apache/excalibur/merlin/model/verifier
                        AssemblyVerifier.java MetaDataVerifier.java
                        package.html
               assembly/src/java/org/apache/excalibur/meta/info/builder
                        TypeBuilder.java
  Added:       assembly/src/java/org/apache/excalibur/merlin/container
                        Container.java
               assembly/src/java/org/apache/excalibur/merlin/registry/doc-files
                        DefaultContainer.gif DependencyGraph.gif
               assembly/src/java/org/apache/excalibur/merlin/model/doc-files
                        uml.gif
               assembly/src/java/org/apache/excalibur/meta/info/builder/doc-files
                        TypeBuilder.gif
  Log:
  javadoc
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Main.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Main.java	12 Jul 2002 12:04:54 -0000	1.2
  +++ Main.java	12 Jul 2002 19:09:26 -0000	1.3
  @@ -56,7 +56,7 @@
   import org.apache.avalon.excalibur.extension.Extension;
   import org.apache.avalon.excalibur.extension.OptionalPackage;
   import org.apache.avalon.excalibur.extension.DefaultPackageRepository;
  -import org.apache.excalibur.meta.info.DefaultType;
  +import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.meta.info.ServiceDescriptor;
   import org.apache.excalibur.meta.info.DependencyDescriptor;
  
  
  
  1.4       +10 -26    jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultContainer.java	12 Jul 2002 15:11:57 -0000	1.3
  +++ DefaultContainer.java	12 Jul 2002 19:09:26 -0000	1.4
  @@ -59,23 +59,21 @@
   import org.apache.avalon.excalibur.extension.DefaultPackageRepository;
   import org.apache.avalon.excalibur.logger.LoggerManager;
   import org.apache.excalibur.meta.info.Type;
  -import org.apache.excalibur.meta.info.DefaultType;
  +import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.meta.info.ServiceDescriptor;
   import org.apache.excalibur.meta.info.DependencyDescriptor;
   import org.apache.excalibur.meta.info.ServiceDesignator;
   import org.apache.excalibur.meta.verifier.VerifyException;
   import org.apache.excalibur.merlin.model.Profile;
  -import org.apache.excalibur.merlin.model.ComponentDescriptor;
  +import org.apache.excalibur.merlin.model.ComponentProfile;
   import org.apache.excalibur.merlin.model.ContainerDescriptor;
   import org.apache.excalibur.merlin.model.CategoryDescriptor;
   import org.apache.excalibur.merlin.model.verifier.AssemblyVerifier;
   import org.apache.excalibur.merlin.model.verifier.MetaDataVerifier;
   import org.apache.excalibur.merlin.kernel.ContainerClassLoader;
   import org.apache.excalibur.merlin.kernel.DefaultLoggerManager;
  -import org.apache.excalibur.merlin.Container;
   import org.apache.excalibur.merlin.Verifiable;
  -import org.apache.excalibur.merlin.Manageable;
  -import org.apache.excalibur.merlin.ResourceProvider;
  +import org.apache.excalibur.merlin.Controller;
   import org.apache.log.Hierarchy;
   import org.apache.log.Priority;
   import org.apache.log.output.io.StreamTarget;
  @@ -120,16 +118,6 @@
      /**
       * Context key used to locate the logger manager.
       */
  -    public static final String CATEGORY_PATH_KEY = "path";
  -
  -   /**
  -    * Context key used to locate the resource provider.
  -    */
  -    public static final String PROVIDER_KEY = "provider";
  -
  -   /**
  -    * Context key used to locate the logger manager.
  -    */
       public static final String CONTAINER_DESCRIPTOR_KEY = "descriptor";
   
       private static final Resources REZ =
  @@ -155,7 +143,7 @@
   
       private DependencyGraph m_map;
   
  -    private DefaultProvider m_provider;
  +    private ResourceProvider m_provider;
   
       private DefaultLoggerManager m_logging;
   
  @@ -218,7 +206,7 @@
       {
           getLogger().debug("initilization");
           m_helper.enableLogging( getLogger().getChildLogger("lifecycle") );
  -        m_provider = new DefaultProvider( m_classloader, m_logging, this );
  +        m_provider = new ResourceProvider( m_classloader, m_logging, this );
   
           // 
           // initiate profile creation
  @@ -233,7 +221,7 @@
           //
   
           getLogger().debug("explicit profile registration");
  -        ComponentDescriptor[] children = m_descriptor.getComponentDescriptors();
  +        ComponentProfile[] children = m_descriptor.getComponentProfiles();
           for( int i=0; i<children.length; i++ )
           {
               m_profiles.register( children[i] );
  @@ -362,7 +350,7 @@
       }
   
       //======================================================================
  -    // Manageable
  +    // Controller
       //======================================================================
   
       public void startup() throws Exception
  @@ -380,7 +368,7 @@
           Iterator iterator = m_containers.iterator();
           while( iterator.hasNext() )
           {
  -            ((Manageable)iterator.next()).startup();
  +            ((Controller)iterator.next()).startup();
           }
       }
   
  @@ -397,7 +385,7 @@
           Iterator iterator = m_containers.iterator();
           while( iterator.hasNext() )
           {
  -            ((Manageable)iterator.next()).shutdown();
  +            ((Controller)iterator.next()).shutdown();
           }
           stop();
       }
  @@ -430,10 +418,6 @@
           }
           return local;
       }
  -
  -    //=======================================================================
  -    // ResourceLocator
  -    //=======================================================================
   
      /**
       * Get a service instance for the supplied profile.
  
  
  
  1.3       +1 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.xinfo
  
  Index: DefaultContainer.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultContainer.xinfo	12 Jul 2002 12:04:54 -0000	1.2
  +++ DefaultContainer.xinfo	12 Jul 2002 19:09:26 -0000	1.3
  @@ -20,7 +20,6 @@
     <context>
       <entry key="classloader" type="org.apache.excalibur.merlin.kernel.ContainerClassLoader" optional="false"/>
       <entry key="logging" type="org.apache.excalibur.merlin.kernel.DefaultLoggerManager" optional="false"/>
  -    <entry key="provider" type="org.apache.excalibur.merlin.kernel.DefaultProvider" optional="false"/>
       <entry key="descriptor" type="org.apache.excalibur.merlin.model.ContainerDescriptor" optional="false"/>
       <entry key="map" type="org.apache.excalibur.merlin.kernel.DependencyGraph" optional="false"/>
       <entry key="container" type="org.apache.excalibur.merlin.Container" optional="true"/>
  @@ -28,7 +27,7 @@
   
     <services>
       <service>
  -      <service-ref type="org.apache.excalibur.merlin.Container" version="1.0"/>
  +      <service-ref type="org.apache.excalibur.merlin.container.Container" version="1.0"/>
       </service>
     </services>
   
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DependencyGraph.java
  
  Index: DependencyGraph.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DependencyGraph.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DependencyGraph.java	12 Jul 2002 16:05:06 -0000	1.1
  +++ DependencyGraph.java	12 Jul 2002 19:09:26 -0000	1.2
  @@ -16,7 +16,7 @@
    * <p>Utility class to help aquire a ordered graph of
    * consumers and providers for specific components.</p>
    * <p><b>UML</b></p>
  - * <p><image src="doc-files/Map.gif" border="0"/></p>
  + * <p><image src="doc-files/DependencyGraph.gif" border="0"/></p>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  
  
  
  1.3       +0 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/LifecycleHelper.java
  
  Index: LifecycleHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/LifecycleHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LifecycleHelper.java	12 Jul 2002 15:11:57 -0000	1.2
  +++ LifecycleHelper.java	12 Jul 2002 19:09:26 -0000	1.3
  @@ -28,7 +28,6 @@
   import org.apache.avalon.framework.service.Serviceable;
   
   import org.apache.excalibur.merlin.model.Profile;
  -import org.apache.excalibur.merlin.ResourceProvider;
   
   /**
    * This is a class to help an Application manage the lifecycle of a component.
  
  
  
  1.4       +4 -6      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ProfileRegistry.java
  
  Index: ProfileRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ProfileRegistry.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProfileRegistry.java	12 Jul 2002 15:11:57 -0000	1.3
  +++ ProfileRegistry.java	12 Jul 2002 19:09:26 -0000	1.4
  @@ -32,10 +32,8 @@
   import org.apache.excalibur.merlin.model.builder.TypeManager;
   import org.apache.excalibur.merlin.model.Profile;
   import org.apache.excalibur.merlin.model.ContainerDescriptor;
  -import org.apache.excalibur.merlin.model.ComponentDescriptor;
  +import org.apache.excalibur.merlin.model.ComponentProfile;
   import org.apache.excalibur.merlin.model.builder.ProfileBuilder;
  -import org.apache.excalibur.merlin.Selector;
  -import org.apache.excalibur.merlin.Container;
   
   /**
    * Internal table that holds available component type keyed relative
  @@ -116,7 +114,7 @@
       public Profile[] getProviders( ServiceDesignator designator )
       {
           ArrayList list = new ArrayList();
  -        ComponentDescriptor[] local = m_descriptor.getComponentDescriptors();
  +        ComponentProfile[] local = m_descriptor.getComponentProfiles();
           for( int i=0; i<local.length; i++ )
           {
               Profile profile = local[i];
  @@ -157,7 +155,7 @@
       */
       public void assembleProfiles() throws Exception
       {
  -        Profile[] profiles = m_descriptor.getComponentDescriptors();
  +        Profile[] profiles = m_descriptor.getComponentProfiles();
           for( int i=0; i<profiles.length; i++ )
           {
               Profile profile = profiles[i];
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ResourceProvider.java
  
  Index: ResourceProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/ResourceProvider.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceProvider.java	12 Jul 2002 16:05:06 -0000	1.1
  +++ ResourceProvider.java	12 Jul 2002 19:09:26 -0000	1.2
  @@ -65,7 +65,7 @@
   import org.apache.avalon.excalibur.extension.DefaultPackageRepository;
   import org.apache.excalibur.meta.verifier.VerifyException;
   import org.apache.excalibur.meta.info.Type;
  -import org.apache.excalibur.meta.info.DefaultType;
  +import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.meta.info.ServiceDescriptor;
   import org.apache.excalibur.meta.info.DependencyDescriptor;
   import org.apache.excalibur.meta.info.ServiceDesignator;
  
  
  
  1.3       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Resources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Resources.properties	12 Jul 2002 12:04:54 -0000	1.2
  +++ Resources.properties	12 Jul 2002 19:09:26 -0000	1.3
  @@ -3,7 +3,7 @@
   xinfo-parse-error=Error occured while parsing xinfo resource "{0}".
   xinfo-nocreate=Failed to create Type from resource "{0}" (Reason: {1}).
   xinfo-props-error=Unable to construct attributes using key "{0}" (Reason: {1}).
  -cinfo-nocreate=Failed to create DefaultType from resource "{0}" (Reason: {1}).
  +cinfo-nocreate=Failed to create Type from resource "{0}" (Reason: {1}).
   cinfo-properties-error=Failed to create Type attributes from resource "{0}" (Reason: {1}).
   sinfo-noname=Missing name attribute in service declaration from resource "{0}".
   sinfo-version=Bad service version in resource "(Reason: {0})".
  
  
  
  1.3       +2 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/package.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- package.html	12 Jul 2002 12:04:54 -0000	1.2
  +++ package.html	12 Jul 2002 19:09:26 -0000	1.3
  @@ -18,11 +18,9 @@
   </ul>
   
   <h3>Object Model</h3>
  -<p>The primary service is a type {@link org.apache.excalibur.merlin.container.Registry}.  The registry acts as a component {@link org.apache.excalibur.meta.info.Type} repository and {@link org.apache.excalibur.merlin.model.Profile} manager.  Each component type represents a concrete component implementation class.  For each component type, the container associates at least one instantiation {@link org.apache.excalibur.merlin.model.Profile}.  A profile is either a default profile generated by the registry based on meta-information derived from the type, or, an explicit profile declared by the component assembler via the registry configuration.  Multiple profiles for a particular component type can coexist in the same registry.
  -
  +<p>The primary service is a type {@link org.apache.excalibur.merlin.container.Container}.  The container acts as a component {@link org.apache.excalibur.meta.info.Type} repository and {@link org.apache.excalibur.merlin.model.Profile} manager.  Each component type represents a concrete component implementation class.  For each component type, the container associates at least one instantiation {@link org.apache.excalibur.merlin.model.Profile}.  A profile is either a default profile generated by the registry based on meta-information derived from the type, or, an explicit profile declared by the component assembler via the registry configuration.  Multiple profiles for a particular component type can coexist in the same registry.
   
   <h3>Package Structure (UML)</h3>
  -<p><img src=doc-files/RegistryUML.gif border=0></p>
  -
  +<p><img src=doc-files/DefaultContainer.gif border=0></p>
   </body>
   
  
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/Container.java
  
  Index: Container.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  
  package org.apache.excalibur.merlin.container;
  
  import org.apache.excalibur.merlin.model.Profile;
  import org.apache.excalibur.meta.info.ServiceDesignator;
  import org.apache.excalibur.merlin.Verifiable;
  import org.apache.excalibur.merlin.Controller;
  
  /**
   * A service that provides support for the management of a set of component types
   * and factories.
   * <p><b>UML</b></p>
   * <p><image src="doc-files/Container.gif" border="0"/></p>
   * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
   * @version $Revision: 1.1 $ $Date: 2002/07/12 19:09:26 $
   */
  public interface Container extends Controller, Verifiable
  {
     /**
      * Return the set of potential profiles of installed component matching a dependency.
      * @param dependency a consumer component dependecy declaration
      * @return the set of potential supplier profile
      */
      Profile[] getProviders( ServiceDesignator service );
  
     /**
      * Test if the container is managing a supplied profile.
      * @param profile the profile
      * @return TRUE if the profile is managed by the container.
      */
      public boolean contains( Profile profile );
  
     /**
      * Get a service instance.
      * @param profile the service provider constraint information
      */
      public Object lookup( Profile profile );
  
     /**
      * Notification by a client that it no longer requies an object.
      * @param provider the key to the provider instance
      */
      public void release( Object object );
  
  
  
  
  }
  
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/doc-files/DefaultContainer.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/registry/doc-files/DependencyGraph.gif
  
  	<<Binary file>>
  
  
  1.12      +2 -3      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultKernel.java	12 Jul 2002 15:11:57 -0000	1.11
  +++ DefaultKernel.java	12 Jul 2002 19:09:27 -0000	1.12
  @@ -58,7 +58,7 @@
   import org.apache.avalon.excalibur.extension.OptionalPackage;
   import org.apache.avalon.excalibur.extension.DefaultPackageRepository;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.excalibur.meta.info.DefaultType;
  +import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.meta.info.ServiceDescriptor;
   import org.apache.excalibur.meta.info.DependencyDescriptor;
  @@ -70,7 +70,6 @@
   import org.apache.excalibur.merlin.model.CategoryDescriptor;
   import org.apache.excalibur.merlin.model.builder.TypeManager;
   import org.apache.excalibur.merlin.container.DefaultContainer;
  -import org.apache.excalibur.merlin.Kernel;
   
   /**
    * Default kernel implementation.
  
  
  
  1.5       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.xinfo
  
  Index: DefaultKernel.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.xinfo,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultKernel.xinfo	12 Jul 2002 12:04:54 -0000	1.4
  +++ DefaultKernel.xinfo	12 Jul 2002 19:09:27 -0000	1.5
  @@ -25,7 +25,7 @@
   
     <services>
       <service>
  -      <service-ref type="org.apache.excalibur.merlin.Kernel" version="1.0"/>
  +      <service-ref type="org.apache.excalibur.merlin.kernel.Kernel" version="1.0"/>
       </service>
     </services>
   
  
  
  
  1.3       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultLoggerManager.java
  
  Index: DefaultLoggerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultLoggerManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultLoggerManager.java	12 Jul 2002 12:04:54 -0000	1.2
  +++ DefaultLoggerManager.java	12 Jul 2002 19:09:27 -0000	1.3
  @@ -35,7 +35,7 @@
   import org.apache.excalibur.merlin.model.FileTargetProvider;
   
   /**
  - * A <code>LoggerManager</code> that supports a verifiable logging hierarchy creation directive.
  + * A <code>LoggerManager</code> that supports management of a logging hierarchy.
    *
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @author <a href="mailto:colus@isoft.co.kr">Eung-ju Park</a>
  
  
  
  1.7       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/Resources.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Resources.properties	9 Jul 2002 10:59:35 -0000	1.6
  +++ Resources.properties	12 Jul 2002 19:09:27 -0000	1.7
  @@ -3,7 +3,7 @@
   xinfo-parse-error=Error occured while parsing xinfo resource "{0}".
   xinfo-nocreate=Failed to create Type from resource "{0}" (Reason: {1}).
   xinfo-props-error=Unable to construct attributes using key "{0}" (Reason: {1}).
  -cinfo-nocreate=Failed to create DefaultType from resource "{0}" (Reason: {1}).
  +cinfo-nocreate=Failed to create Type from resource "{0}" (Reason: {1}).
   cinfo-properties-error=Failed to create Type attributes from resource "{0}" (Reason: {1}).
   sinfo-noname=Missing name attribute in service declaration from resource "{0}".
   sinfo-version=Bad service version in resource "(Reason: {0})".
  
  
  
  1.8       +1 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/package.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- package.html	12 Jul 2002 12:04:54 -0000	1.7
  +++ package.html	12 Jul 2002 19:09:27 -0000	1.8
  @@ -1,7 +1,7 @@
   
   <body>
   <p>
  -The kernel package defines a top level {@link org.apache.excalibur.merlin.Kernel} that serves as a host to a root {@link org.apache.excalibur.merlin.Container} that provides support for container hierachy creation. The default kernel implementation handles the setup of the logging infrastructure, extension manager, and the root container.
  +The kernel package defines a top level Kernel that serves as a host to a root Container that provides support for container hierachy creation. The default kernel implementation handles the setup of the logging infrastructure, extension manager, and the root container.
   
   </p>
   <h3>Funtional Summary</h3>
  @@ -21,8 +21,5 @@
   <li>Integral logging.
   </ul>
   
  -<h3>Object Model (UML)</h3>
  -<p>An {@link org.apache.excalibur.merlin.Container} is primarily a component type manager. Actual type management is handled by an supertype {@link org.apache.excalibur.merlin.container.Registry}.  In addition to component type support, the container provides a framework from the creation of container hierachies.  Services established in a parent container are available as potential candidate suppliers to component providers in sibling containers.</p>
  -<p><img src=doc-files/UML.gif border=0></p>
   </body>
   
  
  
  
  1.2       +37 -5     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/AbstractContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractContainer.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ AbstractContainer.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -13,21 +13,53 @@
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$ $Date$
    */
  -public interface AbstractContainer
  +public class AbstractContainer
   {
  +    /**
  +     * The kernel name
  +     */
  +    private final String m_name;
  +
  +    /**
  +     * The logging categories.
  +     */
  +    private CategoryDescriptor m_categories;
  +
  +    /**
  +     * Create a KernelDescriptor instance.
  +     *
  +     */
  +    public AbstractContainer( final String name,
  +                           final CategoryDescriptor categories )
  +    {
  +        if( name == null ) 
  +          throw new NullPointerException("name");
  +        if( categories == null ) 
  +          throw new NullPointerException("loggers");
  +
  +        m_name = name;
  +        m_categories = categories;
  +    }
   
       /**
        * Return the container name.
        *
        * @return the name of the container
        */
  -    String getName();
  +    String getName()
  +    {
  +        return m_name;
  +    }
   
       /**
  -     * Return the logging descriptor.
  +     * Return the logging catagory descriptor.
        *
        * @return the {@link CategoryDescriptor} for the component loggers.
        */
  -    CategoryDescriptor getCategoryDescriptor();
  +    CategoryDescriptor getCategoryDescriptor()
  +    {
  +        return m_categories;
  +    }
  +
   
   }
  
  
  
  1.2       +9 -11     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/ContainerDescriptor.java
  
  Index: ContainerDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/ContainerDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerDescriptor.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ ContainerDescriptor.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -15,7 +15,7 @@
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$ $Date$
    */
  -public class ContainerDescriptor implements AbstractContainer
  +public class ContainerDescriptor extends AbstractContainer
   {
       /**
        * The parent.
  @@ -41,7 +41,7 @@
        * The component described within the scope of the container.
        */
       //private final ArrayList m_components = new ArrayList();
  -    private final ComponentDescriptor[] m_components;
  +    private final ComponentProfile[] m_components;
   
       /**
        * The component described within the scope of the container.
  @@ -55,13 +55,11 @@
       public ContainerDescriptor( final String name,
                              final CategoryDescriptor loggers,
                              final ClasspathDescriptor classpath,
  -                           final ComponentDescriptor[] components,
  +                           final ComponentProfile[] components,
                              final ContainerDescriptor[] containers )
       {
  -        if( name == null ) 
  -          throw new NullPointerException("name");
  -        if( loggers == null ) 
  -          throw new NullPointerException("loggers");
  +        super( name, loggers );
  +
           if( classpath == null ) 
             throw new NullPointerException("classpath");
   
  @@ -116,7 +114,7 @@
        *
        * @parent the container to add
        */
  -    //public void addComponent( ComponentDescriptor component )
  +    //public void addComponent( ComponentProfile component )
       //{
       //    m_components.add( component );
       //    component.getCategoryDescriptor().setParent( getCategoryDescriptor() );
  @@ -127,9 +125,9 @@
        *
        * @return the target descriptors
        */
  -    public ComponentDescriptor[] getComponentDescriptors()
  +    public ComponentProfile[] getComponentProfiles()
       {
  -        //return (ComponentDescriptor[]) m_components.toArray( new ComponentDescriptor[0] );
  +        //return (ComponentProfile[]) m_components.toArray( new ComponentProfile[0] );
           return m_components;
       }
   
  
  
  
  1.2       +4 -49     jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/KernelDescriptor.java
  
  Index: KernelDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/KernelDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KernelDescriptor.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ KernelDescriptor.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -13,12 +13,8 @@
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$ $Date$
    */
  -public class KernelDescriptor implements AbstractContainer
  +public class KernelDescriptor extends AbstractContainer
   {
  -    /**
  -     * The kernel name
  -     */
  -    private final String m_name;
   
       /**
        * The logging defintion.
  @@ -50,6 +46,8 @@
                              final ContainerDescriptor container )
       {
   
  +        super( name, logging.getCategoryDescriptor() );
  +
           if( name == null ) 
             throw new NullPointerException("name");
           if( logging == null ) 
  @@ -57,23 +55,12 @@
           if( extensions == null ) 
             throw new NullPointerException("extensions");
   
  -        m_name = name;
           m_logging = logging;
           m_extensions = extensions;
           m_container = container;
       }
   
       /**
  -     * Return the container name.
  -     *
  -     * @return the name of the container
  -     */
  -    public String getName()
  -    {
  -        return m_name;
  -    }
  -
  -    /**
        * Return the logging descriptor.
        *
        * @return the {@link LoggingDescriptor} for the component loggers.
  @@ -84,16 +71,6 @@
       }
   
       /**
  -     * Return the root logging descriptor. 
  -     *
  -     * @return the {@link CategoryDescriptor} for the component loggers.
  -     */
  -    public CategoryDescriptor getCategoryDescriptor()
  -    {
  -        return getLoggingDescriptor().getCategoryDescriptor();
  -    }
  -
  -    /**
        * Return the classpath descriptor.
        *
        * @return the {@link ClasspathDescriptor} for the container.
  @@ -112,27 +89,5 @@
       {
           return m_classpath;
       }
  -
  -    /**
  -     * Sets the root container for the kernel.
  -     *
  -     * @param root the root {@link ContainerDescriptor} of the container hierachy.
  -     */
  -    //public void setContainerDescriptor( ContainerDescriptor container )
  -    //{
  -    //    if( container == null ) 
  -    //      throw new NullPointerException("container");
  -    //    m_container = container;
  -    //    container.setParent( this );
  -    //}
       
  -    /**
  -     * Return the root container.
  -     *
  -     * @return the root {@link ContainerDescriptor}.
  -     */
  -    public ContainerDescriptor getContainerDescriptor()
  -    {
  -        return m_container;
  -    }
   }
  
  
  
  1.2       +219 -35   jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java
  
  Index: Profile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/Profile.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Profile.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ Profile.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -7,103 +7,287 @@
    */
   package org.apache.excalibur.merlin.model;
   
  +import java.io.Serializable;
  +import java.util.Hashtable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.context.Context;
   import org.apache.excalibur.meta.info.Type;
  +import org.apache.excalibur.merlin.model.Association;
  +import org.apache.excalibur.configuration.ConfigurationUtil;
   
   /**
  - * Each component declared in the application is represented by
  - * a Profile. Note that this does not necessarily imply
  - * that there is only one instance of actual component. The
  - * ComponentProfile could represent a pool of components, a single
  - * component or a component prototype that is reused to create
  - * new components as needed.
  + * Abstract defintion of a compoent profile. 
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$ $Date$
    */
  -public interface Profile
  +public class Profile 
   {
   
  -     static final int IMPLICIT = 0;
  -     static final int PACKAGED = 1;
  -     static final int EXPLICIT = 2;
  +    /**
  +     * Constant indicating that the profile was implicitly created.
  +     */
  +     public static final int IMPLICIT = 0;
  +
  +    /**
  +     * Constant indicating that the profile was created based on a profile packaged with the type.
  +     */
  +     public static final int PACKAGED = 1;
  +
  +    /**
  +     * Constant indicating that the profile was explicitly declared under an assembly directive.
  +     */
  +     public static final int EXPLICIT = 2;
  +
  +    /**
  +     * The name of the component metadata instance. This is an
  +     * abstract name used during assembly.
  +     */
  +    private final String m_name;
  +
  +    /**
  +     * The dependencies keyed by role name.
  +     */
  +    private final Hashtable m_dependencies = new Hashtable();
  +
  +    /**
  +     * The info object for component type.
  +     */
  +    private final Type m_type;
  +
  +    /**
  +     * The parameters for component (if any).
  +     */
  +    private final Parameters m_parameters;
  +
  +    /**
  +     * The configuration for component (if any).
  +     */
  +    private final Configuration m_configuration;
  +
  +    /**
  +     * The configuration for component (if any).
  +     */
  +    private final Context m_context;
  +
  +    /**
  +     * The logging descriptor.
  +     */
  +    private final CategoryDescriptor m_loggers;
  +
  +    /**
  +     * The creation mode.
  +     */
  +    private final int m_mode;
  +
  +
  +    /**
  +     * Create a Profile instance.
  +     *
  +     * @param name the abstract name of component meta data instance
  +     * @param dependencies the meta data for any dependencies
  +     * @param type the component type
  +     */
  +    public Profile( final String name,
  +                           final Parameters parameters,
  +                           final Configuration configuration,
  +                           final Context context,
  +                           final CategoryDescriptor loggers,
  +                           final Type type,
  +                           final int mode )
  +    {
  +        if( null == name )
  +        {
  +            m_name = "" + System.identityHashCode( this );
  +        }
  +        else
  +        {
  +            m_name = name;
  +        }
  +
  +        if( null == type )
  +        {
  +            throw new NullPointerException( "type" );
  +        }
  +
  +        m_parameters = parameters;
  +        m_configuration = configuration;
  +        m_type = type;
  +        m_context = context;
  +        m_loggers = loggers;
  +        m_mode = mode;
  +    }
   
       /**
        * Return the name of component metadata instance.
        *
        * @return the name of the component.
        */
  -    String getName();
  +    public String getName()
  +    {
  +        return m_name;
  +    }
   
       /**
        * Return the info for component.
        *
        * @return the info for component type.
        */
  -    Type getType();
  +    public Type getType()
  +    {
  +        return m_type;
  +    }
   
       /**
  -     * Return the Parameters for component (if any).
  +     * Return the assigned service providers.
        *
  -     * @return the Parameters for Component (if any).
  +     * @return the set of service provider assignments.
        */
  -    Parameters getParameters();
  +    public Association[] getAssociations()
  +    {
  +        return (Association[])m_dependencies.values().toArray( new Association[0] );
  +    }
   
       /**
  -     * Return the Configuration for component(if any).
  +     * Return the Context for component (if any).
        *
  -     * @return the Configuration for component
  +     * @return the Context  for component (if any).
        */
  -    Configuration getConfiguration();
  +    public Context getContext()
  +    {
  +        return m_context;
  +    }
   
       /**
  -     * Return the Context for component (if any).
  +     * Return the Parameters for Component (if any).
        *
  -     * @return the Context for component
  +     * @return the Parameters for Component (if any).
        */
  -    Context getContext();
  +    public Parameters getParameters()
  +    {
  +        return m_parameters;
  +    }
   
       /**
  -     * Return the logging descriptor.
  +     * Return the Configuration for Component (if any).
        *
  -     * @return the {@link CategoryDescriptor} for the component loggers.
  +     * @return the Configuration for Component (if any).
        */
  -    public CategoryDescriptor getCategoryDescriptor();
  +    public Configuration getConfiguration()
  +    {
  +        return m_configuration;
  +    }
   
       /**
  -     * Return the assigned service providers.
  +     * Return the logging descriptor.
        *
  -     * @return the dependency metadata for component.
  +     * @return the {@link CategoryDescriptor} for the component loggers.
        */
  -    Association[] getAssociations();
  +    public CategoryDescriptor getCategoryDescriptor()
  +    {
  +        return m_loggers;
  +    }
   
       /**
  -     * Return the Association for specified role.
  +     * Return the dependency metadata for component type with specified role.
        *
  -     * @return the Association for specified role.
  +     * @return the dependency metadata for component with specified role.
        */
  -    Association getAssociation( final String role );
  +    public Association getAssociation( final String role )
  +    {
  +        return (Association) m_dependencies.get( role );
  +    }
   
       /**
        * Returns the creation mode for this profile.
        * @return a value of EXPLICIT, PACKAGED or IMPLICIT
        */
  -     int getMode();
  +    public int getMode()
  +    {
  +        return m_mode;
  +    }
   
      /**
  -    * Add a provider for a service dependency role.
  +    * Add a provider for a service dependecy role.
       * @param provider the compenont provider profile
       * @param role the dependent role
       */
  -    void addProvider( Profile provider, String role );
  +    public Association addProvider( Profile provider, String role )
  +    {
  +        Association association = new Association( role, provider );
  +        m_dependencies.put( role, association );
  +        return association;
  +    }
  +
  +    public String toString()
  +    {
  +        return "Profile name: " + getName() 
  +          + ", type: " + getType().getInfo().getName() 
  +          + ", mode: " + modeToString( getMode() );
  +    }
  +
  +    private String modeToString( int mode )
  +    {
  +        if( mode == IMPLICIT )
  +        {
  +            return "IMPLICIT";
  +        }
  +        else if( mode == PACKAGED )
  +        {
  +            return "PACKAGED";
  +        }
  +        else if( mode == EXPLICIT )
  +        {
  +            return "EXPLICIT";
  +        }
  +        else
  +        {
  +            return "?";
  +        }
  +    }
   
      /**
       * Provide a textual report on the profile.
       * @return the formatted profile report
       */
  -    String list();
  +    public String list()
  +    {
  +        StringBuffer buffer = new StringBuffer();
  +        buffer.append( "PROFILE REPORT\n" );
  +        buffer.append( "\n  name: " + getName() );
  +        buffer.append( "\n  base: " + getType().getInfo().getName() );
  +        buffer.append( "\n  key: " + getType().getInfo().getImplementationKey() );
  +        buffer.append( "\n  context: " + getContext( ) );
  +        buffer.append( "\n  configuration:" );
  +        if( getConfiguration() != null )
  +        {
  +            buffer.append( ConfigurationUtil.list( getConfiguration() ) );
  +        }
  +        else
  +        {
  +            buffer.append( " null" );
  +        }
  +        buffer.append( "\n  parameters: " + getParameters() );
  +        buffer.append( "\n  dependecies" );
  +
  +        Association[] dependencies = getAssociations();
  +        if( dependencies.length == 0 )
  +        {
  +            buffer.append( " (none)\n\n" );
  +            return buffer.toString();
  +        }
  +
  +        for( int i=0; i<dependencies.length; i++ )
  +        {
  +            buffer.append( "\n  dependency " + i );
  +            buffer.append( "\n    role: " + dependencies[i].getRole() );
  +            buffer.append( "\n    provider: " + dependencies[i].getProvider() );
  +        }
  +
  +        buffer.append( "\n\n" );
  +        return buffer.toString();
  +    }
   
   }
  
  
  
  1.2       +4 -0      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	12 Jul 2002 12:04:55 -0000	1.1
  +++ package.html	12 Jul 2002 19:09:27 -0000	1.2
  @@ -3,4 +3,8 @@
   <p>
   The <code>model</code> package contains the formal meta data model for the Merlin kernel, container and profile abstractions.  These classes define the criteria for creation of new containers, component and factory profiles, classloaders, extensions, and the kernel itself.
   </p>
  +
  +<h3>Object Model (UML)</h3>
  +<p><img src=doc-files/uml.gif border=0></p>
  +
   </body>
  
  
  
  1.2       +4 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerCreator.java
  
  Index: ContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/ContainerCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainerCreator.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ ContainerCreator.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -12,7 +12,7 @@
   import org.apache.excalibur.merlin.model.builder.TypeManager;
   
   /**
  - * Simple interface used to create {@link ContainerDescriptor}
  + * Simple interface used to create {@link org.apache.excalibur.merlin.model.ContainerDescriptor}
    * from a Configuration sorce.
    *
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  @@ -21,10 +21,10 @@
   public interface ContainerCreator
   {
       /**
  -     * Create a {@link Profile} from configuration
  +     * Create a {@link org.apache.excalibur.merlin.model.Profile} from configuration
        *
        * @param config the confiugration source
  -     * @return the newly created {@link ContainerDescriptor}
  +     * @return the newly created {@link org.apache.excalibur.merlin.model.ContainerDescriptor}
        * @throws Exception
        */
       ContainerDescriptor createContainerDescriptor( Configuration config, TypeManager manager )
  
  
  
  1.2       +3 -3      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/KernelCreator.java
  
  Index: KernelCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/KernelCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- KernelCreator.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ KernelCreator.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -12,7 +12,7 @@
   import org.apache.excalibur.merlin.model.builder.TypeManager;
   
   /**
  - * Simple interface used to create {@link ContainerDescriptor}
  + * Simple interface used to create {@link org.apache.excalibur.merlin.model.ContainerDescriptor}
    * from a Configuration sorce.
    *
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
  @@ -24,7 +24,7 @@
        * Create a {@link KernelDescriptor} from configuration
        *
        * @param config the confiugration source
  -     * @return the newly created {@link ContainerDescriptor}
  +     * @return the newly created {@link org.apache.excalibur.merlin.model.ContainerDescriptor}
        * @throws Exception
        */
       KernelDescriptor createKernelDescriptor( Configuration config, TypeManager manager )
  
  
  
  1.2       +6 -6      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerCreator.java
  
  Index: XMLContainerCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLContainerCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLContainerCreator.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ XMLContainerCreator.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -22,13 +22,13 @@
   import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.configuration.ContextFactory;
   import org.apache.excalibur.merlin.model.Profile;
  -import org.apache.excalibur.merlin.model.DefaultProfile;
  +import org.apache.excalibur.merlin.model.Profile;
   import org.apache.excalibur.merlin.model.CategoryDescriptor;
   import org.apache.excalibur.merlin.model.IncludeDescriptor ;
   import org.apache.excalibur.merlin.model.FilesetDescriptor;
   import org.apache.excalibur.merlin.model.ClasspathDescriptor;
   import org.apache.excalibur.merlin.model.ContainerDescriptor;
  -import org.apache.excalibur.merlin.model.ComponentDescriptor;
  +import org.apache.excalibur.merlin.model.ComponentProfile;
   import org.apache.excalibur.merlin.model.builder.TypeManager;
   
   /**
  @@ -73,7 +73,7 @@
           ClasspathDescriptor classpath = createClasspathDescriptor( config.getChild("classpath") );
   
           manager.addClasspath( classpath );
  -        ComponentDescriptor[] components = createComponentDescriptors( 
  +        ComponentProfile[] components = createComponentProfiles( 
             manager, config.getChildren("component") );
   
           ContainerDescriptor[] containers = createContainerDescriptors( 
  @@ -82,7 +82,7 @@
           return new ContainerDescriptor( name, loggers, classpath, components, containers );
       }
   
  -    public ComponentDescriptor[] createComponentDescriptors( TypeManager manager, Configuration[] configs )
  +    public ComponentProfile[] createComponentProfiles( TypeManager manager, Configuration[] configs )
         throws Exception
       {
           ArrayList list = new ArrayList();
  @@ -92,7 +92,7 @@
               Type type = manager.lookup( config.getAttribute("class") );
               list.add( super.createProfile( type, config ) );
           }
  -        return (ComponentDescriptor[]) list.toArray( new ComponentDescriptor[0] );
  +        return (ComponentProfile[]) list.toArray( new ComponentProfile[0] );
       }
   
       public ClasspathDescriptor createClasspathDescriptor( Configuration config )
  
  
  
  1.2       +3 -3      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLKernelCreator.java
  
  Index: XMLKernelCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLKernelCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLKernelCreator.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ XMLKernelCreator.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -18,13 +18,13 @@
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.excalibur.meta.info.Type;
   import org.apache.excalibur.merlin.model.Profile;
  -import org.apache.excalibur.merlin.model.DefaultProfile;
  +import org.apache.excalibur.merlin.model.Profile;
   import org.apache.excalibur.merlin.model.CategoryDescriptor;
   import org.apache.excalibur.merlin.model.IncludeDescriptor ;
   import org.apache.excalibur.merlin.model.FilesetDescriptor;
   import org.apache.excalibur.merlin.model.ClasspathDescriptor;
   import org.apache.excalibur.merlin.model.ContainerDescriptor;
  -import org.apache.excalibur.merlin.model.ComponentDescriptor;
  +import org.apache.excalibur.merlin.model.ComponentProfile;
   import org.apache.excalibur.merlin.model.DirsetDescriptor;
   import org.apache.excalibur.merlin.model.ExtensionsDescriptor;
   import org.apache.excalibur.merlin.model.KernelDescriptor;
  
  
  
  1.2       +5 -5      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLProfileCreator.java
  
  Index: XMLProfileCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/builder/XMLProfileCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLProfileCreator.java	12 Jul 2002 12:04:55 -0000	1.1
  +++ XMLProfileCreator.java	12 Jul 2002 19:09:27 -0000	1.2
  @@ -23,9 +23,9 @@
   import org.apache.excalibur.meta.info.builder.XMLTypeCreator;
   import org.apache.excalibur.meta.ConfigurationBuilder;
   import org.apache.excalibur.merlin.model.Profile;
  -import org.apache.excalibur.merlin.model.DefaultProfile;
  +import org.apache.excalibur.merlin.model.Profile;
   import org.apache.excalibur.merlin.model.CategoryDescriptor;
  -import org.apache.excalibur.merlin.model.ComponentDescriptor;
  +import org.apache.excalibur.merlin.model.ComponentProfile;
   import org.apache.excalibur.configuration.ContextFactory;
   import org.xml.sax.InputSource;
   
  @@ -84,7 +84,7 @@
                 type.getInfo().getName(), null, null );
   
               return new Profile[]{ 
  -               new ComponentDescriptor( null, null, null, null, loggers, type, Profile.IMPLICIT  ) };
  +               new ComponentProfile( null, null, null, null, loggers, type, Profile.IMPLICIT  ) };
           }
           for( int i=0; i<profiles.length; i++ )
           {
  @@ -112,7 +112,7 @@
           CategoryDescriptor loggers = createCategoryDescriptor( loggersConfig, name );
           Context context = ContextFactory.createContextFromConfiguration( 
             null, profile.getChild("context") );
  -        return new ComponentDescriptor( name, params, config, context, loggers, type, mode  );
  +        return new ComponentProfile( name, params, config, context, loggers, type, mode  );
       }
   
       public CategoryDescriptor createCategoryDescriptor( Configuration config, String fallback ) 
  
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/doc-files/uml.gif
  
  	<<Binary file>>
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/AssemblyVerifier.java
  
  Index: AssemblyVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/AssemblyVerifier.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AssemblyVerifier.java	12 Jul 2002 12:04:56 -0000	1.1
  +++ AssemblyVerifier.java	12 Jul 2002 19:09:28 -0000	1.2
  @@ -41,7 +41,7 @@
    *   <li>Verify that the Class objects for Component implement the
    *       service interfaces.</li>
    *   <li>Verify that the Class is a valid Avalon Component as per the
  - *       rules in {@link ComponentVerifier} object.</li>
  + *       rules in {@link org.apache.excalibur.meta.verifier.ComponentVerifier} object.</li>
    * </ul>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/MetaDataVerifier.java
  
  Index: MetaDataVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/MetaDataVerifier.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MetaDataVerifier.java	12 Jul 2002 12:04:56 -0000	1.1
  +++ MetaDataVerifier.java	12 Jul 2002 19:09:28 -0000	1.2
  @@ -131,7 +131,7 @@
           throws VerifyException
       {
           final Type info = component.getType();
  -        final ContextDescriptor context = info.getContextDescriptor();
  +        final ContextDescriptor context = info.getContext();
           final int count = context.getEntrys().length;
   
           if( !Contextualizable.class.isAssignableFrom( clazz ) )
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model/verifier/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	12 Jul 2002 12:04:56 -0000	1.1
  +++ package.html	12 Jul 2002 19:09:28 -0000	1.2
  @@ -6,8 +6,8 @@
   <h3>Overview</h3>
   <p>This package includes a set of classes supporting the verification of the
   integrity of a component class and the verification of the integrity of a
  -relationships and inter-dependecies based on supplied meta-data. The
  -{@link org.apache.excalibur.merlin.model.verifier.ComponentVerifier} provides
  +relationships and inter-dependecies based on supplied meta data. The
  +{@link org.apache.excalibur.meta.verifier.ComponentVerifier} provides
   support for the validation of a component class.  It includes validation
   functions that check for structural and best-practice integrity related to
   the class, lifecycle patterns and service. The
  
  
  
  1.2       +4 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/builder/TypeBuilder.java
  
  Index: TypeBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/builder/TypeBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TypeBuilder.java	12 Jul 2002 15:11:58 -0000	1.1
  +++ TypeBuilder.java	12 Jul 2002 19:09:28 -0000	1.2
  @@ -20,6 +20,9 @@
    * objects from Configuration objects. The format for Configuration object
    * is specified in the <a href="package-summary.html#external">package summary</a>.
    *
  + * <p><b>UML</b></p>
  + * <p><image src="doc-files/TypeBuilder.gif" border="0"/></p>
  + *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$ $Date$
  
  
  
  1.1                  jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/meta/info/builder/doc-files/TypeBuilder.gif
  
  	<<Binary file>>
  
  

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


Mime
View raw message