avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model Profile.java package.html
Date Sun, 04 Aug 2002 14:58:30 GMT
jefft       2002/08/04 07:58:30

  Modified:    assembly/demo/src/java/org/apache/excalibur/playground
                        BasicComponent.xprofile
               assembly/src/java/org/apache/excalibur/merlin
                        Controller.java DefaultController.java
               assembly/src/java/org/apache/excalibur/merlin/assembly
                        package.html
               assembly/src/java/org/apache/excalibur/merlin/kernel
                        package.html
               assembly/src/java/org/apache/excalibur/merlin/model
                        Profile.java package.html
  Log:
  Sorry.. Typos in such otherwise excellent docs upset me ;)
  
  Revision  Changes    Path
  1.6       +1 -1      jakarta-avalon-excalibur/assembly/demo/src/java/org/apache/excalibur/playground/BasicComponent.xprofile
  
  Index: BasicComponent.xprofile
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/demo/src/java/org/apache/excalibur/playground/BasicComponent.xprofile,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BasicComponent.xprofile	2 Aug 2002 06:29:20 -0000	1.5
  +++ BasicComponent.xprofile	4 Aug 2002 14:58:30 -0000	1.6
  @@ -5,7 +5,7 @@
      <!-- 
      A packaged profile is equivalent to a component declaration inside a container, 
      except that it is provided by a component type.  A PACKAGED profiles take priority
  -   over an IMPLICIT profile. An EXPLICIT profile declared inside a container defintion

  +   over an IMPLICIT profile. An EXPLICIT profile declared inside a container definition

      will take priority over PACKAGED profiles.
      -->
    
  
  
  
  1.2       +4 -4      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Controller.java
  
  Index: Controller.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/Controller.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Controller.java	12 Jul 2002 16:00:48 -0000	1.1
  +++ Controller.java	4 Aug 2002 14:58:30 -0000	1.2
  @@ -9,19 +9,19 @@
   package org.apache.excalibur.merlin;
   
   /**
  - * A service that provides support managable startup and shutdown.
  + * A service that provides support manageable startup and shutdown.
    * @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
    * @version $Revision$ $Date$
    */
   public interface Controller
   {
      /**
  -    * Request the startup of the managable unit.
  +    * Request the startup of the manageable unit.
       */
       void startup() throws Exception;
   
      /**
  -    * Request the shutdown of the managable unit.
  +    * Request the shutdown of the manageable unit.
       */
       void shutdown();
   
  
  
  
  1.13      +7 -7      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.java
  
  Index: DefaultController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultController.java	4 Aug 2002 06:43:19 -0000	1.12
  +++ DefaultController.java	4 Aug 2002 14:58:30 -0000	1.13
  @@ -40,7 +40,7 @@
   
   
   /**
  - * <p>The <code>DefaultControler</code> provides support for the establishment
  + * <p>The <code>DefaultController</code> provides support for the establishment
    * of the criteria for the creation of a new <code>Kernel</code> using a 
    * supplied file referencing a kernel configuration source.</p>
    * 
  @@ -49,7 +49,7 @@
    *
    * <p><b>Code example:</b></p>
    * <p>The following code example demonstrates the creation of an embedded controller
  - * using a file based deployment descriptor.  The example shows the creation of rhe
  + * using a file based deployment descriptor.  The example shows the creation of the
    * required application context following by lifecycle processing of the kernel service.
    * </p>
    * <pre>
  @@ -151,10 +151,10 @@
       * <ul>
       *  <li>validation of the application home directory
       *  <li>validation that the configuration path is resolvable relative to the home
directory
  -    *  <li>marchalls the XML kernel description into a kernel meta-data model
  +    *  <li>marshalls the XML kernel description into a kernel meta-data model
       *  <li>establishes a kernel instance
       *  <li>establishes and applies the application context to the kernel
  -    *  <li>initilializes the kernel
  +    *  <li>initializes the kernel
       * </ul>
       *
       * @exception Exception if a validation or establishment error occurs
  @@ -259,7 +259,7 @@
       //=======================================================================
   
      /**
  -    * Request the startup of the managable unit.
  +    * Request the startup of the manageable unit.
       */
       public void startup() throws Exception
       {
  @@ -279,7 +279,7 @@
       }
   
      /**
  -    * Request the shutdown of the managable unit.
  +    * Request the shutdown of the manageable unit.
       */
       public void shutdown()
       {
  
  
  
  1.2       +1 -1      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	29 Jul 2002 06:14:29 -0000	1.1
  +++ package.html	4 Aug 2002 14:58:30 -0000	1.2
  @@ -1,7 +1,7 @@
   
   <body>
   <p>
  -The <code>assembly</code> package contains the main type, profile, and assembly
manegment.
  +The <code>assembly</code> package contains the main type, profile, and assembly
management.
   </p>
   
   </body>
  
  
  
  1.9       +5 -5      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- package.html	12 Jul 2002 19:09:27 -0000	1.8
  +++ package.html	4 Aug 2002 14:58:30 -0000	1.9
  @@ -1,23 +1,23 @@
   
   <body>
   <p>
  -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.
  +The kernel package defines a top level Kernel that serves as a host to a root Container
that provides support for container hierarchy creation. The default kernel implementation
handles the setup of the logging infrastructure, extension manager, and the root container.
   
   </p>
  -<h3>Funtional Summary</h3>
  +<h3>Functional Summary</h3>
   <ul>
  -<li>Geneneric container architecture.
  +<li>Generic container architecture.
   <li>Hierachical container composition.
   </ul>
   <h3>Key Features</h3>
   <p>A primary objective of this container is to provide simple composition of applications
and the management of service provision from parent to child containers with minimal administration
overhead.</p>
   <ul>
   <li>Component-based architecture.
  -<li>Deployment as a stand-alone application or as an embedeed component.
  +<li>Deployment as a stand-alone application or as an embedded component.
   <li>Fully configurable classpaths at the kernel and container levels.
   <li>Support for cascading startup and shutdown.
   <li>Protected classloader hierachy.
  -<li>Graceful interupt management.
  +<li>Graceful interrupt management.
   <li>Integral logging.
   </ul>
   
  
  
  
  1.17      +8 -8      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Profile.java	4 Aug 2002 11:49:36 -0000	1.16
  +++ Profile.java	4 Aug 2002 14:58:30 -0000	1.17
  @@ -25,19 +25,19 @@
   import org.xml.sax.InputSource;
   
   /**
  - * Defintion of the criteria for an explicit component profile.  A profile, when 
  - * included withi the scope of a container declaration will be instantiated in 
  - * the model as an EXPLICT component profile resulting in the intiation of 
  - * dependecy resolution relative to the component as the target deployment
  - * objective.  Multiple supplimentary profiles may be packaged in a .xprofiles
  + * Definition of the criteria for an explicit component profile.  A profile, when 
  + * included within the scope of a container declaration will be instantiated in 
  + * the model as an EXPLICIT component profile resulting in the initiation of 
  + * dependency resolution relative to the component as the target deployment
  + * objective.  Multiple supplementary profiles may be packaged in a .xprofiles
    * resources and will be assigned to the container automatically.  In the absence
    * of explicit or packaged profile directives, an implicit profile will be created
    * for any component types declared under a jar manifest.
    *
    * <p><b>XML</b></p>
    * <p>A component element declares the profile to be applied during the instantiation
  - * of a component type.  In includes a name and class declaration, logging directives
  - * (resolved relative to the components's container), context creation criteria, 
  + * of a component type.  It includes a name and class declaration, logging directives
  + * (resolved relative to the component's container), context creation criteria, 
    * together with configuration or parameters information.</p>
    *
    * <pre>
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- package.html	29 Jul 2002 06:14:32 -0000	1.3
  +++ package.html	4 Aug 2002 14:58:30 -0000	1.4
  @@ -1,7 +1,7 @@
   
   <body>
   <p>
  -The <code>model</code> package contains the formal profile meta data model.
These classes define the criteria used to populate a Profile, including context management,
confuration management, logging category management and extension and lifecycle phase management.
  +The <code>model</code> package contains the formal profile meta data model.
These classes define the criteria used to populate a Profile, including context management,
configuration management, logging category management and extension and lifecycle phase management.
   </p>
   
   <h3>Object Model (UML)</h3>
  
  
  

--
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