vgritsenko    2002/07/21 15:56:11

  Modified:    src/documentation/xdocs Tag: cocoon_2_0_3_branch
                        dictionary.xml
               src/documentation/xdocs/developing Tag: cocoon_2_0_3_branch
                        avalon.xml datasources.xml extending.xml
                        httprequest.xml
               src/documentation/xdocs/tutorial Tag: cocoon_2_0_3_branch
                        tutorial-rmi-generator.xml
  Log:
  Composer -> Composable
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      xml-cocoon2/src/documentation/xdocs/dictionary.xml
  
  Index: dictionary.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/dictionary.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- dictionary.xml    3 Jan 2002 12:31:01 -0000       1.1
  +++ dictionary.xml    21 Jul 2002 22:56:10 -0000      1.1.2.1
  @@ -17,7 +17,7 @@
         Controls access to sitemap objects. It's in charge of reloading the sitemaps 
as necessary, and mapping sitemap filenames with sitemap objects. It operates on 
Environments by processing them with a sitemap.
       </class>
       <interface name="Sitemap">
  -      An aggregate of avalon's Composer, Configurable, and Modifiable interfaces, 
as well as the cocoon Processor interface.
  +      An aggregate of avalon's Composable, Configurable, Contextualizable, and 
Modifiable interfaces, as well as the cocoon Processor interface.
       </interface>
       <class name="AbstractSitemap">
         Parent of the stylesheet-generated sitemap objects. It provides access to all 
of the cocoon components by role name. It keeps track of when the stylesheet was 
created. It loads components by name and configures them. It provides a utility 
substitute method for string manipulation.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +3 -3      xml-cocoon2/src/documentation/xdocs/developing/avalon.xml
  
  Index: avalon.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/avalon.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- avalon.xml        3 Jan 2002 12:31:02 -0000       1.1
  +++ avalon.xml        21 Jul 2002 22:56:10 -0000      1.1.2.1
  @@ -62,18 +62,18 @@
                </s2>
                <s2 title="Composable">
                  <p><code>org.apache.avalon.framework.component.Composable</code></p>
  -               <p>A <code>Composer</code> is a class that need to connect to 
software
  +               <p>A <code>Composable</code> is a class that need to connect to 
software
                         components using a "role" abstraction, thus not depending on 
particular
                         implementations but on behavioral interfaces. </p>
                </s2>
                <s2 title="Component">
                  <p><code>org.apache.avalon.framework.component.Component</code></p>
                  <p>This interface identifies classes that can be used as
  -                      <code>Components</code> by a <code>Composer</code>. </p>
  +                      <code>Components</code> by a <code>Composable</code>. </p>
                  <p>A <code>Component</code> is the basic building block of Avalon. 
When
                         a class implements this interface, it allows itself to be 
managed by a
                         <code>ComponentManager</code> and used by an outside element 
called a
  -                      <code>Composer</code>. The <code>Composer</code> must know 
what type of
  +                      <code>Composable</code>. The <code>Composable</code> must 
know what type of
                         <code>Component</code> it is accessing, so it will re-cast the
                         <code>Component</code> into the type it needs. </p>
                  <p><code>Component</code>s in Cocoon are e.g. those defined in
  
  
  
  1.1.2.1   +1 -1      xml-cocoon2/src/documentation/xdocs/developing/datasources.xml
  
  Index: datasources.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/datasources.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- datasources.xml   3 Jan 2002 12:31:02 -0000       1.1
  +++ datasources.xml   21 Jul 2002 22:56:10 -0000      1.1.2.1
  @@ -132,7 +132,7 @@
         <p>
          No matter how you defined your DataSourceComponent, you access
          it the same way.  Because The DataSourceComponent is a Component,
  -       your class needs to implement the Avalon Composer interface.  The
  +       your class needs to implement the Avalon Composable interface.  The
          Avalon Framework will give your class a ComponentManager.  At that
          point, it is up to you how and when you pull the DataSourceComponent
          out of the ComponentManager.
  
  
  
  1.1.2.1   +1 -1      xml-cocoon2/src/documentation/xdocs/developing/extending.xml
  
  Index: extending.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/extending.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- extending.xml     3 Jan 2002 12:31:02 -0000       1.1
  +++ extending.xml     21 Jul 2002 22:56:10 -0000      1.1.2.1
  @@ -79,7 +79,7 @@
                                <li>
                                        <code>ComposerGenerator</code> - Can be used 
as base class if you
                         want your <code>Generator</code> to be an <link 
href="avalon.html">Avalon
  -             Composer</link>.</li>
  +             Composable</link>.</li>
                                <li>
                                        <code>ServletGenerator</code> - If you want to 
generate servlets.
                  This is the base class for the 
<code>ServerPagesGenerator</code>.</li>
  
  
  
  1.2.2.4   +3 -3      xml-cocoon2/src/documentation/xdocs/developing/httprequest.xml
  
  Index: httprequest.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/developing/httprequest.xml,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- httprequest.xml   30 Jun 2002 23:26:55 -0000      1.2.2.3
  +++ httprequest.xml   21 Jul 2002 22:56:10 -0000      1.2.2.4
  @@ -261,7 +261,7 @@
                         <ol> 
                                <li>The <code>Handler</code> creates a 
<code>File</code> object
                                  with the asked URL.</li> 
  -                             <li>The <code>Manager</code> sets the 
<code>Composer</code> and the
  +                             <li>The <code>Manager</code> sets the 
<code>Composable</code> and the
                                  <code>Configuration</code> of the 
<code>Handler</code>. (These are
                                  <link href="avalon.html">Avalon</link> things).</li> 
                         <li>If necessary, the <code>Manager</code> asks the
  @@ -271,7 +271,7 @@
                                <ol> 
                                  <li>The <code>Handler</code> gets the
                                         <code>"program-generator"</code> 
<code>Component</code> from its
  -                                      <code>Composer</code>.</li> 
  +                                      <code>Composable</code>.</li> 
                                  <li>The <code>load()</code> method of this
                                         <code>ProgramGeneratorImpl</code> is called. 
</li> 
                                  <li>The <code>ProgramGeneratorImpl</code> gets the
  @@ -307,7 +307,7 @@
                <s2 title="Cocoon"> 
                  <p><code>org.apache.cocoon.Cocoon</code></p> 
                  <p>While this sounds to be the most important part of the Cocoon
  -                      application, it is not. It is merely a Composer, meaning that 
it does some
  +                      application, it is not. It is merely a Composable, meaning 
that it does some
                         administrative work and gets other classes to work.</p> 
                </s2> 
                <s2 title="ConfigurationBuilder"> 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +3 -3      
xml-cocoon2/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml
  
  Index: tutorial-rmi-generator.xml
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- tutorial-rmi-generator.xml        18 Jul 2002 14:16:41 -0000      1.1.2.4
  +++ tutorial-rmi-generator.xml        21 Jul 2002 22:56:10 -0000      1.1.2.5
  @@ -297,14 +297,14 @@
                                </s4>
                                
                                <s4 title="ComposerGenerator">
  -                                     <p><strong>Can be used as base class if you 
want your Generator to be an Avalon Composer</strong><br/>
  +                                     <p><strong>Can be used as base class if you 
want your Generator to be an Avalon Composable</strong><br/>
                                        </p>
                                        
                                        <p>This <strong>abstract class</strong> 
extends <strong>org.apache.cocoon.generation.AbstractGenerator</strong> and extends 
the interfaces <strong>org.apache.avalon.framework.component.Composable</strong> and 
<strong>org.apache.avalon.framework.activity.Disposable</strong>.</p><p>In addition to 
all the methods introduced in the <strong>AbstractGenerator</strong> class, these two 
interfaces introduce som new methods:</p>
   <ul>
        <li>From <strong>org.apache.avalon.framework.component.Composable</strong>:
                <ul>
  -                     <li><code>public void compose(ComponentManager 
componentManager)</code>: Pass the ComponentManager to the composer. The Composable 
implementation should use the specified ComponentManager to acquire the components it 
needs for execution.                                 
  +                     <li><code>public void compose(ComponentManager 
componentManager)</code>: Pass the ComponentManager to the Composable. The Composable 
implementation should use the specified ComponentManager to acquire the components it 
needs for execution.                               
                        </li>
                </ul>
        </li>
  @@ -319,7 +319,7 @@
        
        <li>From <strong>ComposerGenerator</strong> itself:
                <ul>
  -                     <li><code>public void compose(ComponentManager 
componentManager)</code>: Pass the ComponentManager to the composer. The Composable 
implementation should use the specified ComponentManager to acquire the components it 
needs for execution. (implemented)
  +                     <li><code>public void compose(ComponentManager 
componentManager)</code>: Pass the ComponentManager to the Composable. The Composable 
implementation should use the specified ComponentManager to acquire the components it 
needs for execution. (implemented)
                        </li>
                        
                        <li><code>public void dispose()</code>: The dispose operation 
is called at the end of a components lifecycle. Components use this method to release 
and destroy any resources that the Component owns. (implemented - implementation sets 
the ComponentManager to null)
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to