You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2002/09/13 17:08:07 UTC

cvs commit: jakarta-avalon-excalibur/assembly/src/xdocs assembly.xml extensions.xml

mcconnell    2002/09/13 08:08:07

  Modified:    assembly/src/java/org/apache/excalibur/merlin
                        DefaultController.xinfo
               assembly/src/java/org/apache/excalibur/merlin/activation
                        DefaultRemoteResourceFactory.xinfo Directory.xinfo
               assembly/src/java/org/apache/excalibur/merlin/container
                        DefaultContainer.xinfo StructuralExtension.xinfo
               assembly/src/java/org/apache/excalibur/merlin/kernel
                        DefaultKernel.xinfo
               assembly/src/java/org/apache/excalibur/playground/activation
                        TestServant.xinfo
               assembly/src/xdocs assembly.xml extensions.xml
  Log:
  Updated supporting documentation to show <type><info>...
  
  Revision  Changes    Path
  1.4       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.xinfo
  
  Index: DefaultController.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/DefaultController.xinfo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultController.xinfo	2 Aug 2002 06:36:09 -0000	1.3
  +++ DefaultController.xinfo	13 Sep 2002 15:08:07 -0000	1.4
  @@ -12,10 +12,10 @@
   
   <component-info>
   
  -  <component>
  +  <info>
       <name>container</name>
       <version>1.0</version>
  -  </component>
  +  </info>
   
     <context>
       <entry key="avalon:home" type="java.io.File" optional="true"/>
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/DefaultRemoteResourceFactory.xinfo
  
  Index: DefaultRemoteResourceFactory.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/DefaultRemoteResourceFactory.xinfo,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultRemoteResourceFactory.xinfo	8 Sep 2002 16:59:36 -0000	1.4
  +++ DefaultRemoteResourceFactory.xinfo	13 Sep 2002 15:08:07 -0000	1.5
  @@ -12,9 +12,9 @@
   
   <type>
   
  -  <component>
  +  <info>
       <name>remote-factory</name>
  -  </component>
  +  </info>
   
     <services>
       <service>
  
  
  
  1.3       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/Directory.xinfo
  
  Index: Directory.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/activation/Directory.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Directory.xinfo	11 Sep 2002 06:57:24 -0000	1.2
  +++ Directory.xinfo	13 Sep 2002 15:08:07 -0000	1.3
  @@ -12,9 +12,9 @@
   
   <type>
   
  -  <component>
  +  <info>
       <name>activator</name>
  -  </component>
  +  </info>
   
     <context>
       <entry key="avalon:name" />
  
  
  
  1.15      +2 -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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultContainer.xinfo	13 Sep 2002 14:57:33 -0000	1.14
  +++ DefaultContainer.xinfo	13 Sep 2002 15:08:07 -0000	1.15
  @@ -15,10 +15,10 @@
   
   <type>
   
  -  <component>
  +  <info>
       <name>container</name>
       <version>1.0</version>
  -  </component>
  +  </info>
   
     <context>
       <entry key="merlin:container.descriptor"
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/StructuralExtension.xinfo
  
  Index: StructuralExtension.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/StructuralExtension.xinfo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StructuralExtension.xinfo	14 Aug 2002 03:03:35 -0000	1.3
  +++ StructuralExtension.xinfo	13 Sep 2002 15:08:07 -0000	1.4
  @@ -6,12 +6,12 @@
   
   <type>
   
  -  <component>
  +  <info>
       <name>structural</name>
       <attributes>
         <attribute key="avalon:lifestyle" value="singleton"/>
       </attributes>
  -  </component>
  +  </info>
   
     <extensions>
   
  
  
  
  1.12      +2 -2      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultKernel.xinfo	13 Sep 2002 14:57:33 -0000	1.11
  +++ DefaultKernel.xinfo	13 Sep 2002 15:08:07 -0000	1.12
  @@ -15,10 +15,10 @@
   
   <type>
   
  -  <component>
  +  <info>
       <name>kernel</name>
       <version>1.0</version>
  -  </component>
  +  </info>
   
     <context>
       <entry key="avalon:home" type="java.io.File" optional="false"/>
  
  
  
  1.7       +2 -2      jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/TestServant.xinfo
  
  Index: TestServant.xinfo
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/TestServant.xinfo,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestServant.xinfo	13 Sep 2002 14:57:33 -0000	1.6
  +++ TestServant.xinfo	13 Sep 2002 15:08:07 -0000	1.7
  @@ -5,7 +5,7 @@
   
   <type>
   
  -  <component>
  +  <info>
   
       <name>servant</name>
   
  @@ -48,7 +48,7 @@
   
       </attributes>
   
  -  </component>
  +  </info>
   
     <services>
       <service>
  
  
  
  1.9       +3 -3      jakarta-avalon-excalibur/assembly/src/xdocs/assembly.xml
  
  Index: assembly.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/xdocs/assembly.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- assembly.xml	21 Aug 2002 17:14:06 -0000	1.8
  +++ assembly.xml	13 Sep 2002 15:08:07 -0000	1.9
  @@ -82,7 +82,7 @@
     Defintion of a single component descriptor.
     --&gt;</i></font>
   
  -  &lt;component&gt;
  +  &lt;info&gt;
   
       <font color="gray"><i>&lt;!-- the name of the component (character restriction appply) --&gt;</i></font>
   
  @@ -102,7 +102,7 @@
   
       &lt;/attributes&gt;
   
  -  &lt;/component&gt;
  +  &lt;/info&gt;
   
     <font color="gray"><i>&lt;!--
     The set of logging categories the component uses. 
  
  
  
  1.7       +3 -3      jakarta-avalon-excalibur/assembly/src/xdocs/extensions.xml
  
  Index: extensions.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/xdocs/extensions.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- extensions.xml	21 Aug 2002 17:14:06 -0000	1.6
  +++ extensions.xml	13 Sep 2002 15:08:07 -0000	1.7
  @@ -17,10 +17,10 @@
   <source>
     &lt;type&gt;
   
  -    &lt;component&gt;
  +    &lt;info&gt;
         &lt;name&gt;<font color="darkred">my-component</font>&lt;/name&gt;
         &lt;version&gt;<font color="darkred">1.2.1</font>&lt;/version&gt;
  -    &lt;/component&gt;
  +    &lt;/info&gt;
   
       &lt;stages&gt;
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>