avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/tutorials/simple-web project.xml
Date Sun, 16 May 2004 11:47:44 GMT
mcconnell    2004/05/16 04:47:44

  Modified:    tutorials/composition/application/impl/conf block.xml
               tutorials/composition/application/impl project.xml
               tutorials/composition/location/api project.xml
               tutorials/composition/location/impl/conf block.xml
               tutorials/composition/location/impl project.xml
               tutorials/composition/publisher/api project.xml
               tutorials/composition/publisher/impl/conf block.xml
               tutorials/composition/publisher/impl project.xml
               tutorials/configuration/block/conf block.xml
               tutorials/configuration/block project.xml
               tutorials/configuration/defaults/conf block.xml
               tutorials/configuration/defaults project.xml
               tutorials/configuration/injection/conf block.xml
               tutorials/configuration/injection project.xml
               tutorials/configuration/override/conf block.xml
               tutorials/configuration/override project.xml
               tutorials/context/alias/conf block.xml
               tutorials/context/alias project.xml
               tutorials/context/avalon/conf block.xml
               tutorials/context/avalon project.xml
               tutorials/context/casting/conf block.xml
               tutorials/context/casting project.xml
               tutorials/context/custom/conf block.xml
               tutorials/context/custom project.xml
               tutorials/context/injection/conf block.xml
               tutorials/context/injection project.xml
               tutorials/context/plus/conf block.xml
               tutorials/context/plus project.xml
               tutorials/context/strategy/conf block.xml
               tutorials/context/strategy project.xml
               tutorials/dependencies/auto/conf block.xml
               tutorials/dependencies/auto project.xml
               tutorials/dependencies/manual/conf block.xml
               tutorials/dependencies/manual project.xml
               tutorials/dynamics/conf block.xml
               tutorials/dynamics project.xml
               tutorials/hello project.xml
               tutorials/jmx project.xml
               tutorials/lifecycle/activation/conf block.xml
               tutorials/lifecycle/activation project.xml
               tutorials/lifecycle/excalibur/conf block.xml
               tutorials/lifecycle/excalibur project.xml
               tutorials maven.xml project.xml
               tutorials/meta project.xml
               tutorials/parameterization project.xml
               tutorials/profiles/conf block.xml
               tutorials/profiles project.xml
               tutorials/security/application/impl/conf block.xml
               tutorials/security/application/impl project.xml
               tutorials/security/location/api project.xml
               tutorials/security/location/impl/conf block.xml
               tutorials/security/location/impl project.xml
               tutorials/security/publisher/api project.xml
               tutorials/security/publisher/impl/conf block.xml
               tutorials/security/publisher/impl project.xml
               tutorials/selection/conf block.xml
               tutorials/selection project.xml
               tutorials/simple-web/conf block.xml
               tutorials/simple-web project.xml
  Log:
  Fix tutorial version references.
  
  Revision  Changes    Path
  1.2       +2 -2      avalon/tutorials/composition/application/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/application/impl/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:41 -0000	1.1
  +++ block.xml	16 May 2004 11:47:40 -0000	1.2
  @@ -4,8 +4,8 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
              <resource id="merlin-tutorial:locator-api" version="1.0"/>
              <resource id="merlin-tutorial:publisher-api" version="1.0"/>
              <resource id="merlin-tutorial:application-impl" version="1.0"/>
  
  
  
  1.3       +2 -2      avalon/tutorials/composition/application/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/application/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:40 -0000	1.3
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.3       +1 -1      avalon/tutorials/composition/location/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/location/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:40 -0000	1.3
  @@ -12,7 +12,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.2       +2 -2      avalon/tutorials/composition/location/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/location/impl/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:42 -0000	1.1
  +++ block.xml	16 May 2004 11:47:40 -0000	1.2
  @@ -10,8 +10,8 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            <resource id="merlin-tutorial:locator-api" version="1.0"/>
            <resource id="merlin-tutorial:locator-impl" version="1.0"/>
          </repository>
  
  
  
  1.3       +2 -2      avalon/tutorials/composition/location/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/location/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.3       +1 -1      avalon/tutorials/composition/publisher/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/publisher/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -12,7 +12,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.2       +2 -2      avalon/tutorials/composition/publisher/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/publisher/impl/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:43 -0000	1.1
  +++ block.xml	16 May 2004 11:47:41 -0000	1.2
  @@ -10,8 +10,8 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            <resource id="merlin-tutorial:publisher-api" version="1.0"/>
            <resource id="merlin-tutorial:publisher-impl" version="1.0"/>
          </repository>
  
  
  
  1.3       +2 -2      avalon/tutorials/composition/publisher/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/composition/publisher/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.2       +1 -1      avalon/tutorials/configuration/block/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/block/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:48 -0000	1.1
  +++ block.xml	16 May 2004 11:47:41 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/configuration/block/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/block/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -10,12 +10,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.3       +1 -1      avalon/tutorials/configuration/defaults/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/defaults/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	10 Mar 2004 10:52:18 -0000	1.2
  +++ block.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/configuration/defaults/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/defaults/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:28 -0000	1.2
  +++ project.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -10,12 +10,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.2       +1 -1      avalon/tutorials/configuration/injection/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/injection/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	11 Mar 2004 13:21:17 -0000	1.1
  +++ block.xml	16 May 2004 11:47:41 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +1 -1      avalon/tutorials/configuration/injection/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/injection/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:41 -0000	1.3
  @@ -10,7 +10,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.2       +1 -1      avalon/tutorials/configuration/override/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/override/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:49 -0000	1.1
  +++ block.xml	16 May 2004 11:47:41 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/configuration/override/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/configuration/override/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:42 -0000	1.3
  @@ -10,12 +10,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.2       +1 -1      avalon/tutorials/context/alias/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/alias/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	5 May 2004 19:59:21 -0000	1.1
  +++ block.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.2       +2 -2      avalon/tutorials/context/alias/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/alias/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	5 May 2004 19:59:21 -0000	1.1
  +++ project.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/context/avalon/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/avalon/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:49 -0000	1.1
  +++ block.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/context/avalon/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/avalon/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:42 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/context/casting/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/casting/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:50 -0000	1.1
  +++ block.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/context/casting/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/casting/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:42 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/context/custom/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/custom/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:56 -0000	1.1
  +++ block.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/context/custom/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/custom/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:42 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/context/injection/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/injection/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	11 Mar 2004 12:59:30 -0000	1.1
  +++ block.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/context/injection/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/injection/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:42 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/context/plus/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/plus/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	2 Apr 2004 08:08:48 -0000	1.1
  +++ block.xml	16 May 2004 11:47:42 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/context/plus/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/plus/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:42 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/context/strategy/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/strategy/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:56 -0000	1.1
  +++ block.xml	16 May 2004 11:47:43 -0000	1.2
  @@ -8,7 +8,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.11      +2 -2      avalon/tutorials/context/strategy/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/context/strategy/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.10
  +++ project.xml	16 May 2004 11:47:43 -0000	1.11
  @@ -19,12 +19,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>&avalon-composition-id;</groupId>
  
  
  
  1.2       +2 -2      avalon/tutorials/dependencies/auto/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dependencies/auto/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:33:59 -0000	1.1
  +++ block.xml	16 May 2004 11:47:43 -0000	1.2
  @@ -4,8 +4,8 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            </repository>
          </classpath>
        </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/dependencies/auto/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dependencies/auto/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:43 -0000	1.3
  @@ -16,13 +16,13 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.2       +1 -1      avalon/tutorials/dependencies/manual/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dependencies/manual/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:34:00 -0000	1.1
  +++ block.xml	16 May 2004 11:47:43 -0000	1.2
  @@ -4,7 +4,7 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            </repository>
          </classpath>
        </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/dependencies/manual/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dependencies/manual/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:43 -0000	1.3
  @@ -16,13 +16,13 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
   
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +1 -1      avalon/tutorials/dynamics/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dynamics/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	22 Feb 2004 16:12:58 -0000	1.2
  +++ block.xml	16 May 2004 11:47:43 -0000	1.3
  @@ -4,7 +4,7 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            </repository>
          </classpath>
        </classloader>
  
  
  
  1.7       +2 -2      avalon/tutorials/dynamics/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/dynamics/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.6
  +++ project.xml	16 May 2004 11:47:43 -0000	1.7
  @@ -19,12 +19,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>&avalon-composition-id;</groupId>
  
  
  
  1.17      +1 -1      avalon/tutorials/hello/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/hello/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.16
  +++ project.xml	16 May 2004 11:47:43 -0000	1.17
  @@ -21,7 +21,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.5       +1 -1      avalon/tutorials/jmx/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/jmx/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.4
  +++ project.xml	16 May 2004 11:47:43 -0000	1.5
  @@ -24,7 +24,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
   
       <dependency>
  
  
  
  1.2       +1 -1      avalon/tutorials/lifecycle/activation/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/lifecycle/activation/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:34:02 -0000	1.1
  +++ block.xml	16 May 2004 11:47:43 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.12      +2 -2      avalon/tutorials/lifecycle/activation/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/lifecycle/activation/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.11
  +++ project.xml	16 May 2004 11:47:43 -0000	1.12
  @@ -19,12 +19,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>&avalon-composition-id;</groupId>
  
  
  
  1.2       +1 -1      avalon/tutorials/lifecycle/excalibur/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/lifecycle/excalibur/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	24 Sep 2003 09:34:03 -0000	1.1
  +++ block.xml	16 May 2004 11:47:43 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.4       +2 -2      avalon/tutorials/lifecycle/excalibur/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/lifecycle/excalibur/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.3
  +++ project.xml	16 May 2004 11:47:43 -0000	1.4
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>excalibur-lifecycle</groupId>
  
  
  
  1.6       +8 -0      avalon/tutorials/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/maven.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- maven.xml	26 Apr 2004 04:49:09 -0000	1.5
  +++ maven.xml	16 May 2004 11:47:43 -0000	1.6
  @@ -62,6 +62,13 @@
         </fileset>
       </ant:copy>
   
  +    <ant:copy toDir="${maven.build.dir}/tutorials">
  +      <fileset dir="${basedir}/../buildsystem/site">
  +        <include name="LICENSE*"/>
  +        <include name="NOTICE*"/>
  +      </fileset>
  +    </ant:copy>
  +
     </goal>
   
     <goal name="avalon:dist" prereqs="avalon:build">
  @@ -77,6 +84,7 @@
   
       <j:set var="tutorial.name" value="${maven.final.name}"/>
       <ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
  +
       <ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
         <zipfileset dir="${basedir}/target/tutorials" prefix="tutorial"/>
       </ant:zip>
  
  
  
  1.5       +1 -1      avalon/tutorials/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	26 Apr 2004 04:49:09 -0000	1.4
  +++ project.xml	16 May 2004 11:47:43 -0000	1.5
  @@ -10,6 +10,6 @@
       
       <!-- a short but descriptive name for the project -->
       <name>Merlin Simple Web Server Tutorials</name>
  -  <currentVersion>&merlin-product-version;</currentVersion>
  +    <currentVersion>&merlin-product-version;</currentVersion>
   
   </project>
  
  
  
  1.3       +2 -2      avalon/tutorials/meta/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/meta/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:43 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.11      +1 -1      avalon/tutorials/parameterization/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/parameterization/project.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.10
  +++ project.xml	16 May 2004 11:47:43 -0000	1.11
  @@ -24,7 +24,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
   
       <dependency>
  
  
  
  1.2       +1 -1      avalon/tutorials/profiles/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/profiles/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	3 Oct 2003 14:42:34 -0000	1.1
  +++ block.xml	16 May 2004 11:47:43 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.5       +2 -2      avalon/tutorials/profiles/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/profiles/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.4
  +++ project.xml	16 May 2004 11:47:43 -0000	1.5
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.4       +2 -2      avalon/tutorials/security/application/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/application/impl/conf/block.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- block.xml	7 Mar 2004 03:02:42 -0000	1.3
  +++ block.xml	16 May 2004 11:47:43 -0000	1.4
  @@ -4,8 +4,8 @@
        <classloader>
          <classpath>
            <repository>
  -           <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -           <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +           <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +           <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
              <resource id="merlin-tutorial:secure-locator-api" version="1.0"/>
              <resource id="merlin-tutorial:secure-publisher-api" version="1.0"/>
            </repository>
  
  
  
  1.5       +3 -2      avalon/tutorials/security/application/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/application/impl/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.4
  +++ project.xml	16 May 2004 11:47:43 -0000	1.5
  @@ -5,6 +5,7 @@
     <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-application-impl</id>
  +  <groupId>merlin-tutorial</groupId>
     <name>Composition Application Tutorial</name>
     <currentVersion>1.0</currentVersion>
   
  @@ -12,12 +13,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.4       +2 -1      avalon/tutorials/security/location/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/location/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.3
  +++ project.xml	16 May 2004 11:47:43 -0000	1.4
  @@ -5,6 +5,7 @@
     <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-locator-api</id>
  +  <groupId>merlin-tutorial</groupId>
     <name>Composition Locator API Tutorial</name>
     <currentVersion>1.0</currentVersion>
   
  @@ -12,7 +13,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.3       +2 -2      avalon/tutorials/security/location/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/location/impl/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	1 Mar 2004 23:45:34 -0000	1.2
  +++ block.xml	16 May 2004 11:47:43 -0000	1.3
  @@ -10,8 +10,8 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            <resource id="merlin-tutorial:locator-api" version="1.0"/>
            <resource id="merlin-tutorial:locator-impl" version="1.0"/>
          </repository>
  
  
  
  1.4       +3 -2      avalon/tutorials/security/location/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/location/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.3
  +++ project.xml	16 May 2004 11:47:43 -0000	1.4
  @@ -5,6 +5,7 @@
     <extend>${basedir}/../../../master.xml</extend>
   
     <id>secure-locator-impl</id>
  +  <groupId>merlin-tutorial</groupId>
     <name>Composition Locator Impl Tutorial</name>
     <currentVersion>1.0</currentVersion>
   
  @@ -12,12 +13,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.4       +1 -1      avalon/tutorials/security/publisher/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/publisher/api/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.3
  +++ project.xml	16 May 2004 11:47:43 -0000	1.4
  @@ -12,7 +12,7 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
   
  
  
  
  1.2       +2 -2      avalon/tutorials/security/publisher/impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/publisher/impl/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	1 Mar 2004 23:04:25 -0000	1.1
  +++ block.xml	16 May 2004 11:47:44 -0000	1.2
  @@ -10,8 +10,8 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
            <resource id="merlin-tutorial:publisher-api" version="1.0"/>
            <resource id="merlin-tutorial:publisher-impl" version="1.0"/>
          </repository>
  
  
  
  1.4       +2 -2      avalon/tutorials/security/publisher/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/security/publisher/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.3
  +++ project.xml	16 May 2004 11:47:44 -0000	1.4
  @@ -12,12 +12,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>merlin-tutorial</groupId>
  
  
  
  1.2       +1 -1      avalon/tutorials/selection/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/selection/conf/block.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- block.xml	4 Oct 2003 09:52:24 -0000	1.1
  +++ block.xml	16 May 2004 11:47:44 -0000	1.2
  @@ -4,7 +4,7 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +         <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
          </repository>
        </classpath>
      </classloader>
  
  
  
  1.3       +2 -2      avalon/tutorials/selection/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/selection/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	15 Apr 2004 11:53:29 -0000	1.2
  +++ project.xml	16 May 2004 11:47:44 -0000	1.3
  @@ -16,12 +16,12 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
  -      <version>4.1.5</version>
  +      <version>4.2.0</version>
       </dependency>
     </dependencies>
     
  
  
  
  1.3       +12 -12    avalon/tutorials/simple-web/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/simple-web/conf/block.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- block.xml	14 Apr 2004 23:52:23 -0000	1.2
  +++ block.xml	16 May 2004 11:47:44 -0000	1.3
  @@ -9,19 +9,19 @@
     <classloader>
       <classpath>
         <repository>
  -        <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
  -        <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
  +        <resource id="avalon-framework:avalon-framework-api" version="4.2.0"/>
  +        <resource id="avalon-framework:avalon-framework-impl" version="4.2.0"/>
           <resource id="commons-collections:commons-collections" version="2.1"/>
  -        <resource id="excalibur-pool:excalibur-pool-api" version="2.0"/>
  -        <resource id="excalibur-pool:excalibur-pool-impl" version="2.0"/>
  -        <resource id="excalibur-thread:excalibur-thread-api" version="2.0"/>
  -        <resource id="excalibur-thread:excalibur-thread-impl" version="2.0"/>
  -        <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
  -        <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="SNAPSHOT"/>
  -        <resource id="cornerstone-connection:cornerstone-connection-api" version="1.0"/>
  -        <resource id="cornerstone-connection:cornerstone-connection-impl" version="SNAPSHOT"/>
  -        <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
  -        <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
  +        <resource id="excalibur-pool:excalibur-pool-api" version="2.0.0"/>
  +        <resource id="excalibur-pool:excalibur-pool-impl" version="2.0.0"/>
  +        <resource id="excalibur-thread:excalibur-thread-api" version="2.0.0"/>
  +        <resource id="excalibur-thread:excalibur-thread-impl" version="2.0.0"/>
  +        <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0.0"/>
  +        <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="2.0.0"/>
  +        <resource id="cornerstone-connection:cornerstone-connection-api" version="2.0.0"/>
  +        <resource id="cornerstone-connection:cornerstone-connection-impl" version="2.0.0"/>
  +        <resource id="cornerstone-threads:cornerstone-threads-api" version="2.0.0"/>
  +        <resource id="cornerstone-threads:cornerstone-threads-impl" version="2.0.0"/>
         </repository>
       </classpath>
     </classloader>
  
  
  
  1.4       +3 -3      avalon/tutorials/simple-web/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/tutorials/simple-web/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	15 Apr 2004 11:53:30 -0000	1.3
  +++ project.xml	16 May 2004 11:47:44 -0000	1.4
  @@ -26,19 +26,19 @@
   	    <dependency>
   	      <groupId>avalon-framework</groupId>
   	      <artifactId>avalon-framework-api</artifactId>
  -	      <version>4.1.5</version>
  +	      <version>4.2.0</version>
   	    </dependency>
   
   	    <dependency>
   	      <groupId>cornerstone-sockets</groupId>
   	      <artifactId>cornerstone-sockets-api</artifactId>
  -	      <version>1.0</version>
  +	      <version>1.0.0</version>
   	    </dependency>
   	    
   	    <dependency>
   	      <groupId>cornerstone-connection</groupId>
   	      <artifactId>cornerstone-connection-api</artifactId>
  -	      <version>SNAPSHOT</version>
  +	      <version>2.0.0</version>
   	    </dependency>
   	    
       </dependencies>
  
  
  

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


Mime
View raw message