Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 90243 invoked from network); 4 Aug 2002 15:00:41 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 4 Aug 2002 15:00:41 -0000 Received: (qmail 26888 invoked by uid 97); 4 Aug 2002 15:00:59 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 26825 invoked by uid 97); 4 Aug 2002 15:00:58 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 26814 invoked by uid 97); 4 Aug 2002 15:00:57 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 4 Aug 2002 14:58:30 -0000 Message-ID: <20020804145830.22465.qmail@icarus.apache.org> From: jefft@apache.org To: jakarta-avalon-excalibur-cvs@apache.org Subject: cvs commit: jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/model Profile.java package.html X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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 @@ 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 Stephen McConnell * @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 @@ /** - *

The DefaultControler provides support for the establishment + *

The DefaultController provides support for the establishment * of the criteria for the creation of a new Kernel using a * supplied file referencing a kernel configuration source.

* @@ -49,7 +49,7 @@ * *

Code example:

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

  @@ -151,10 +151,10 @@
       * 
       *  validation of the application home directory
       *  
validation that the configuration path is resolvable relative to the home directory
  -    *  
marchalls the XML kernel description into a kernel meta-data model
  +    *  
marshalls the XML kernel description into a kernel meta-data model
       *  
establishes a kernel instance
       *  
establishes and applies the application context to the kernel
  -    *  
initilializes the kernel
  +    *  
initializes the kernel
       * 
       *
       * @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 @@
   
   
   
  -The assembly package contains the main type, profile, and assembly manegment.
  +The assembly package contains the main type, profile, and assembly management.
   
   
   
  
  
  
  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 @@
   
   
   
  -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.
   
   
  -Funtional Summary
  +Functional Summary
   
  -Geneneric container architecture.
  +
Generic container architecture.
   
Hierachical container composition.
   
   Key Features
   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.
   
   Component-based architecture.
  -
Deployment as a stand-alone application or as an embedeed component.
  +
Deployment as a stand-alone application or as an embedded component.
   
Fully configurable classpaths at the kernel and container levels.
   
Support for cascading startup and shutdown.
   
Protected classloader hierachy.
  -
Graceful interupt management.
  +
Graceful interrupt management.
   
Integral logging.
   
   
  
  
  
  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.
    *
    * XML
    * 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.
    *
    *   
  
  
  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 @@
   
   
   
  -The model 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 model 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.
   
   
   Object Model (UML)
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: