Return-Path: 
 <cvs-return-16048-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 6256 invoked by uid 500); 17 Apr 2003 03:44:13 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 6238 invoked by uid 500); 17 Apr 2003 03:44:12 -0000
Received: (qmail 6234 invoked from network); 17 Apr 2003 03:44:12 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 17 Apr 2003 03:44:12 -0000
Received: (qmail 72021 invoked by uid 1438); 17 Apr 2003 03:44:11 -0000
Date: 17 Apr 2003 03:44:11 -0000
Message-ID: <20030417034411.72020.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: avalon-sandbox-cvs@apache.org
Subject: cvs commit:
 avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context casting.xml
 entries.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2003/04/16 20:44:11

  Modified:    merlin/merlin-smp/src/examples/afs/simple/conf block.xml
               merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank
                        BankTestCase.java
               merlin/merlin-smp/xdocs/merlin/block index.xml
               merlin/merlin-smp/xdocs/meta/model/block index.xml
               merlin/merlin-smp/xdocs/meta/model/block/container
                        components.xml
               merlin/merlin-smp/xdocs/starting/examples/afs/simple
                        implementation.xml
               merlin/merlin-smp/xdocs/starting/hello config.xml
                        creation.xml
               merlin/merlin-smp/xdocs/starting/hello/context casting.xml
                        entries.xml
  Log:
  Update tutorial documention to reflect the new block spec.
  
  Revision  Changes    Path
  1.7       +0 -3      avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/conf/block.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- block.xml	15 Apr 2003 14:33:42 -0000	1.6
  +++ block.xml	17 Apr 2003 03:44:11 -0000	1.7
  @@ -5,12 +5,9 @@
       <name>simple</name>
     </info>
   
  -
     <implementation>
   
       <container name="banking">
  -
  -      <container name="xxx"/>
   
         <component name="bank" class="org.apache.bank.impl.BankProvider">
           <configuration>
  
  
  
  1.8       +1 -1      avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank/BankTestCase.java
  
  Index: BankTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank/BankTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BankTestCase.java	16 Apr 2003 14:28:46 -0000	1.7
  +++ BankTestCase.java	17 Apr 2003 03:44:11 -0000	1.8
  @@ -32,7 +32,7 @@
   
       private void printBlock( String lead, Block block )
       {
  -        System.out.println( lead + "block: " + block );
  +        System.out.println( lead + "block: " + block + ", " + System.identityHashCode( block ) );
           System.out.println( lead + "context: " + block.getContextProvider() );
           Appliance[] appliances = block.getAppliances();
           System.out.println( lead + "appliances: " + appliances.length );
  
  
  
  1.5       +10 -4     avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/merlin/block/index.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.xml	8 Apr 2003 11:19:51 -0000	1.4
  +++ index.xml	17 Apr 2003 03:44:11 -0000	1.5
  @@ -39,10 +39,16 @@
   
         <p><em>Minimilist block definition:</em></p>
   <source><![CDATA[
  -<block name="tutorial">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>tutorial</name>
  +   </info>
  +
  +  <implementation>
        <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
  -  </container>
  +  </implementation>
  +
   </block>
   ]]></source>
   
  
  
  
  1.2       +8 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	2 Apr 2003 15:52:10 -0000	1.1
  +++ index.xml	17 Apr 2003 03:44:11 -0000	1.2
  @@ -15,9 +15,13 @@
         <subsection name="Specification">
   
   <source><![CDATA[
  -<block name="demo">
  +<block>
   
  -  <container>
  +   <info>
  +     <name>tutorial</name>
  +   </info>
  +
  +  <implementation>
   
        <engine>
          <classpath>
  @@ -35,7 +39,8 @@
          </configuration>
        </component>
   
  -  </container>
  +  </implementation>
  +
   </block>
   ]]></source>
         </subsection>
  
  
  
  1.2       +9 -3      avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components.xml
  
  Index: components.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/meta/model/block/container/components.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- components.xml	2 Apr 2003 15:52:11 -0000	1.1
  +++ components.xml	17 Apr 2003 03:44:11 -0000	1.2
  @@ -46,14 +46,20 @@
           <p><strong>Sample XML</strong></p>
   
   <source><![CDATA[
  -<block name="tutorial">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>tutorial</name>
  +   </info>
  +
  +  <implementation>
        <component name="hello" class="tutorial.HelloComponent" activation="startup">
          <!-- optional categories element -->
          <!-- optional configuration or parameters element -->
          <!-- optional context element -->
        </component>
  -  </container>
  +  </implementation>
  +
   </block>
   ]]></source>
   
  
  
  
  1.3       +8 -3      avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/implementation.xml
  
  Index: implementation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/examples/afs/simple/implementation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- implementation.xml	8 Apr 2003 10:51:28 -0000	1.2
  +++ implementation.xml	17 Apr 2003 03:44:11 -0000	1.3
  @@ -22,10 +22,15 @@
             ready to handle account creation and removal requests.
           </p>
   <source><![CDATA[
  -<block name="banking">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>banking</name>
  +   </info>
  +
  +  <implementation>
        <component name="bank" class="org.apache.bank.impl.BankProvider" activation="startup"/>
  -  </container>
  +  </implementation>
   </block>
   ]]></source>
         </subsection>
  
  
  
  1.4       +9 -3      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config.xml
  
  Index: config.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/config.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- config.xml	3 Apr 2003 16:08:10 -0000	1.3
  +++ config.xml	17 Apr 2003 03:44:11 -0000	1.4
  @@ -133,14 +133,20 @@
           by including a configuration within the block.xml directive.
           </p>
   <source><![CDATA[
  -<block name="tutorial">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>banking</name>
  +   </info>
  +
  +  <implementation>
        <component name="hello" class="tutorial.HelloComponent" activation="startup">
          <configuration>
            <source>explicit configuration within block</source>
          </configuration>
        </component>
  -  </container>
  +  </implementation>
  +
   </block>
   ]]></source>
           <p>
  
  
  
  1.3       +9 -3      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/creation.xml
  
  Index: creation.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/creation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- creation.xml	4 Apr 2003 15:49:44 -0000	1.2
  +++ creation.xml	17 Apr 2003 03:44:11 -0000	1.3
  @@ -72,10 +72,16 @@
           A block is the definition of a composite component. It represents an application made up of a set of components and the supporting resources.  In our example the block will container the single HelloComponent component.  The following XML description should be declared under a BLOCK-INF directory. It declares a block named "tutorial".  The root container includes the declaration of the hello component.  Based on this infromation Merlin will create a container and deploy the hello component on startup.
          </p>
   <source><![CDATA[
  -<block name="tutorial">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>banking</name>
  +   </info>
  +
  +  <implementation>
        <component name="hello" class="tutorial.HelloComponent" activation="startup"/>
  -  </container>
  +  </implementation>
  +
   </block>
   ]]></source>
         </subsection>
  
  
  
  1.4       +9 -3      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/casting.xml
  
  Index: casting.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/casting.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- casting.xml	4 Apr 2003 15:49:48 -0000	1.3
  +++ casting.xml	17 Apr 2003 03:44:11 -0000	1.4
  @@ -224,12 +224,18 @@
             context implementation.
           </p>
   <source><![CDATA[
  -<block name="tutorial">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>tutorial</name>
  +   </info>
  +
  +  <implementation>
        <component name="hello" class="tutorial.HelloComponent" activation="startup">
          <context class="tutorial.DemoContextProvider"/>
        </component>
  -  </container>
  +  </implementation>
  +
   </block>
   ]]></source>
         </subsection>
  
  
  
  1.3       +9 -3      avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/entries.xml
  
  Index: entries.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/hello/context/entries.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- entries.xml	4 Apr 2003 12:17:19 -0000	1.2
  +++ entries.xml	17 Apr 2003 03:44:11 -0000	1.3
  @@ -141,8 +141,13 @@
           </p>
           <p><i>block.xml</i></p>
   <source><![CDATA[
  -<block name="tutorial">
  -   <container>
  +<block>
  +
  +   <info>
  +     <name>tutorial</name>
  +   </info>
  +
  +   <implementation>
        <component name="hello" class="tutorial.HelloComponent" activation="startup">
          <context>
            <entry key="cruncher" class="tutorial.NumberCruncher">
  @@ -151,7 +156,8 @@
            </entry>
          </context>
        </component>
  -  </container>
  +   </implementation>
  +
   </block>
   ]]></source>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org