cvs commit: avalon-sandbox/merlin/src/xdocs assembly.xml

[mcconnell]

mcconnell    2002/12/02 23:02:58

  Modified:    merlin/src/xdocs assembly.xml
  Log:
  Updating to relect urn: style notation.
  
  Revision  Changes    Path
  1.2       +4 -4      avalon-sandbox/merlin/src/xdocs/assembly.xml
  
  Index: assembly.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/src/xdocs/assembly.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- assembly.xml      1 Dec 2002 06:43:22 -0000       1.1
  +++ assembly.xml      3 Dec 2002 07:02:58 -0000       1.2
  @@ -97,8 +97,8 @@
   
       <attributes>
   
  -       &lt;attribute key="<font 
color="darkred">avalon:display-name-i18n</font>" value="<font 
color="darkred">display-name</font>"/&gt;
  -       &lt;attribute key="<font color="darkred">avalon:lifestyle</font>" 
value="<font color="darkred">THREAD_SAFE</font>"/&gt;
  +       &lt;attribute key="<font 
color="darkred">urn:avalon:display-name-i18n</font>" value="<font 
color="darkred">display-name</font>"/&gt;
  +       &lt;attribute key="<font color="darkred">urn:avalon:lifestyle</font>" 
value="<font color="darkred">THREAD_SAFE</font>"/&gt;
   
       &lt;/attributes&gt;
   
  @@ -330,7 +330,7 @@
   <p>In the majority of cases, a single candidate will be located to act as a 
supplier.  In those occasions where multiple candidates exist, Merlin will 
invoke a candidate selection process.  This involves instantiation of a service 
selector from one of the following sources:</p>
   <p>
   <ul>
  - <li>a classname declared as a value of the dependency attribute 
"avalon:service.selector"</li>
  + <li>a classname declared as a value of the dependency attribute 
"urn:avalon:service.selector"</li>
    <li>a class named &lt;dependent-service-classname&gt;Selector within the 
classpath</li>
    <li>the default Merlin service selector implementation</li>
   </ul>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>