mcconnell    2003/08/19 07:12:32

  Modified:    merlin/merlin-platform/tutorials/composition README.txt
                        maven.xml
               merlin/merlin-platform/tutorials/configuration/block
                        project.xml
               merlin/merlin-platform/tutorials/configuration/defaults
                        project.xml
               merlin/merlin-platform/tutorials/configuration/override
                        project.xml
               merlin/merlin-platform/tutorials/configuration/simple
                        project.xml
  Added:       merlin/merlin-platform/tutorials/configuration .cvsignore
                        maven.xml project.xml
  Log:
  Tutorial updates.
  
  Revision  Changes    Path
  1.3       +16 -5     
avalon-sandbox/merlin/merlin-platform/tutorials/composition/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/README.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README.txt        19 Aug 2003 13:39:24 -0000      1.2
  +++ README.txt        19 Aug 2003 14:12:32 -0000      1.3
  @@ -1,15 +1,24 @@
   
   Composition Management
  -----------------------
  +======================
  +
  +Overview
  +--------
   
   This tutorial presents the creation ofn virtual components
   using composition of package containers.  In this demonstration
   we have three application groups, a top level application, a 
   locator system, and a publisher system.  The top level app
   pulls in the two sub-systems as virtual components.  The sub-
  -systems are themselves fuolly deployable containers in their 
  -own right and could be executed independetly.
  +systems are themselves fully deployable blocks in their 
  +own right (although in this demonstratotion they represent
  +very simple sub-systems).  In practice, the combination of 
  +packaged deployment profiles, default configurations, 
  +auto discovery, auto assembly, and block composition provides
  +a powerful framework complex systems delivery.
   
  +Build and execution instructions:
  +---------------------------------
   
     $ maven build
     $ merlin application\impl\target\*.jar -system %MAVEN_HOME% -execute
  @@ -26,11 +35,13 @@
     [INFO   ] (application.application): done
   
   
  -Use the following command to pull in container debug level log entries.
  +Use the following command to include container debug level log entries for the 
demanding developer.
   
     $ merlin application\impl\target\*.jar -system %MAVEN_HOME% -execute -config 
application\impl\conf\config.xml
   
  +Summary
  +-------
   
  -The purpose of this demonstration is to show how the container can be viewed as an 
implementation strategy for the creation of a virtual service, and how that service 
can be composed within a higher level containers, enabling new services without 
artificial barriers.
  +The purpose of this demonstration is to show how the container can be viewed as an 
implementation strategy for the creation of a virtual service, and how these service 
can be composed within a higher level containers, enabling new implementation 
solutions.  The key to achiving this is related to the <service> directives inside the 
<container> direective.  Each service directive describes a service that is exported 
by the container in its role as a virtual component.
   
   
  
  
  
  1.2       +1 -0      
avalon-sandbox/merlin/merlin-platform/tutorials/composition/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml 19 Aug 2003 13:39:24 -0000      1.1
  +++ maven.xml 19 Aug 2003 14:12:32 -0000      1.2
  @@ -28,4 +28,5 @@
       <attainGoal name="cleanup"/>
       <attainGoal name="build"/>
     </goal>
  +
   </project>
  
  
  
  1.3       +2 -1      
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/.cvsignore
  
  
  
  
  1.3       +26 -5     
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/maven.xml
  
  
  
  
  1.3       +13 -11    
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/project.xml
  
  
  
  
  1.5       +3 -45     
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml       18 Aug 2003 11:26:06 -0000      1.4
  +++ project.xml       19 Aug 2003 14:12:32 -0000      1.5
  @@ -2,50 +2,8 @@
   
   <project>
   
  -  <groupId>merlin</groupId>
  -  <id>merlin-tutorial-configuration</id>
  -  <name>Merlin Configuration Tutorial</name>
  -  <package>tutorial</package>
  -
  -  <currentVersion>1.0</currentVersion>
  -  <inceptionYear>2003</inceptionYear>
  -  <shortDescription>Merlin Configuration Tutorial.</shortDescription>
  -
  -  <dependencies>
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>SNAPSHOT</version>
  -    </dependency>
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>SNAPSHOT</version>
  -    </dependency>
  -  </dependencies>
  -  
  -  <build>
  -
  -    <sourceDirectory>${basedir}/src/java</sourceDirectory>
  -
  -    <resources>
  -      <resource>
  -        <directory>${basedir}/conf</directory>
  -        <targetPath>BLOCK-INF</targetPath>
  -        <includes>
  -          <include>block.xml</include>
  -        </includes>
  -      </resource>
  -      <resource>
  -        <directory>${maven.src.dir}/java</directory>
  -        <includes>
  -          <include>**/*.x*</include>
  -        </includes>
  -      </resource>
  -    </resources>
  -
  -    <jars></jars>
  -
  -  </build>
  +  <extend>${basedir}/../project.xml</extend>
  +  <id>merlin-block-configuration</id>
  +  <name>Block Configuration Tutorial</name>
   
   </project>
  
  
  
  1.5       +3 -46     
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml       18 Aug 2003 11:54:32 -0000      1.4
  +++ project.xml       19 Aug 2003 14:12:32 -0000      1.5
  @@ -2,51 +2,8 @@
   
   <project>
   
  -  <groupId>merlin</groupId>
  -  <id>merlin-tutorial-configuration</id>
  -  <name>Merlin Configuration Tutorial</name>
  -  <package>tutorial</package>
  -
  -  <currentVersion>1.0</currentVersion>
  -  <inceptionYear>2003</inceptionYear>
  -  <shortDescription>Merlin Configuration Tutorial.</shortDescription>
  -
  -  <dependencies>
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-dev</version>
  -    </dependency>
  -
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-dev</version>
  -    </dependency>
  -  </dependencies>
  -  
  -  <build>
  -
  -    <sourceDirectory>${basedir}/src/java</sourceDirectory>
  -
  -    <resources>
  -      <resource>
  -        <directory>${basedir}/conf</directory>
  -        <targetPath>BLOCK-INF</targetPath>
  -        <includes>
  -          <include>block.xml</include>
  -        </includes>
  -      </resource>
  -      <resource>
  -        <directory>${basedir}/src/java</directory>
  -        <includes>
  -          <include>**/*.x*</include>
  -        </includes>
  -      </resource>
  -    </resources>
  -
  -    <jars></jars>
  -
  -  </build>
  +  <extend>${basedir}/../project.xml</extend>
  +  <id>merlin-defaults-configuration</id>
  +  <name>Defaults Configuration Tutorial</name>
   
   </project>
  
  
  
  1.5       +3 -46     
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml       18 Aug 2003 11:54:32 -0000      1.4
  +++ project.xml       19 Aug 2003 14:12:32 -0000      1.5
  @@ -2,51 +2,8 @@
   
   <project>
   
  -  <groupId>merlin</groupId>
  -  <id>merlin-tutorial-configuration</id>
  -  <name>Merlin Configuration Tutorial</name>
  -  <package>tutorial</package>
  -
  -  <currentVersion>1.0</currentVersion>
  -  <inceptionYear>2003</inceptionYear>
  -  <shortDescription>Merlin Configuration Tutorial.</shortDescription>
  -
  -  <dependencies>
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-dev</version>
  -    </dependency>
  -
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-dev</version>
  -    </dependency>
  -  </dependencies>
  -  
  -  <build>
  -
  -    <sourceDirectory>${basedir}/src/java</sourceDirectory>
  -
  -    <resources>
  -      <resource>
  -        <directory>${basedir}/conf</directory>
  -        <targetPath>BLOCK-INF</targetPath>
  -        <includes>
  -          <include>block.xml</include>
  -        </includes>
  -      </resource>
  -      <resource>
  -        <directory>${basedir}/src/java</directory>
  -        <includes>
  -          <include>**/*.x*</include>
  -        </includes>
  -      </resource>
  -    </resources>
  -
  -    <jars></jars>
  -
  -  </build>
  +  <extend>${basedir}/../project.xml</extend>
  +  <id>merlin-override-configuration</id>
  +  <name>Override Configuration Tutorial</name>
   
   </project>
  
  
  
  1.5       +3 -47     
avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/simple/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml       18 Aug 2003 11:54:32 -0000      1.4
  +++ project.xml       19 Aug 2003 14:12:32 -0000      1.5
  @@ -1,52 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -
   <project>
   
  -  <groupId>merlin</groupId>
  -  <id>merlin-tutorial-configuration</id>
  -  <name>Merlin Configuration Tutorial</name>
  -  <package>tutorial</package>
  -
  -  <currentVersion>1.0</currentVersion>
  -  <inceptionYear>2003</inceptionYear>
  -  <shortDescription>Merlin Configuration Tutorial.</shortDescription>
  -
  -  <dependencies>
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5-dev</version>
  -    </dependency>
  -
  -    <dependency>
  -      <groupId>avalon-framework</groupId>
  -      <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5-dev</version>
  -    </dependency>
  -  </dependencies>
  -  
  -  <build>
  -
  -    <sourceDirectory>${basedir}/src/java</sourceDirectory>
  -
  -    <resources>
  -      <resource>
  -        <directory>${basedir}/conf</directory>
  -        <targetPath>BLOCK-INF</targetPath>
  -        <includes>
  -          <include>block.xml</include>
  -        </includes>
  -      </resource>
  -      <resource>
  -        <directory>${basedir}/src/java</directory>
  -        <includes>
  -          <include>**/*.x*</include>
  -        </includes>
  -      </resource>
  -    </resources>
  -
  -    <jars></jars>
  -
  -  </build>
  +  <extend>${basedir}/../project.xml</extend>
  +  <id>merlin-simple-configuration</id>
  +  <name>Simple Configuration Tutorial</name>
   
   </project>
  
  
  

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

Reply via email to