Return-Path: 
 <cvs-return-18358-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 97412 invoked from network); 12 Sep 2003 14:00:41 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 12 Sep 2003 14:00:41 -0000
Received: (qmail 76993 invoked by uid 500); 12 Sep 2003 14:00:36 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 76928 invoked by uid 500); 12 Sep 2003 14:00:35 -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 76915 invoked by uid 500); 12 Sep 2003 14:00:35 -0000
Received: (qmail 76912 invoked from network); 12 Sep 2003 14:00:35 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 12 Sep 2003 14:00:35 -0000
Received: (qmail 97345 invoked by uid 1438); 12 Sep 2003 14:00:39 -0000
Date: 12 Sep 2003 14:00:39 -0000
Message-ID: <20030912140039.97344.qmail@minotaur.apache.org>
From: mcconnell@apache.org
To: avalon-sandbox-cvs@apache.org
Subject: cvs commit: avalon-sandbox/merlin/merlin-platform/tutorials
 project.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

mcconnell    2003/09/12 07:00:39

  Modified:    merlin/activation/impl project.xml
               merlin/composition/api project.xml
               merlin/composition/spi project.xml
               merlin/merlin-platform/src/config debug.xml kernel.xml
               merlin/merlin-platform/src/repository/merlin/jnlps
                        merlin.jnlp
               merlin/merlin-platform/src/repository/merlin/xmls kernel.xml
               merlin/merlin-platform/tutorials project.xml
  Log:
  Check shortDescription on all project.xml files.
  
  Revision  Changes    Path
  1.3       +1 -3      avalon-sandbox/merlin/activation/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/activation/impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 09:20:22 -0000	1.2
  +++ project.xml	12 Sep 2003 14:00:38 -0000	1.3
  @@ -11,9 +11,7 @@
     <currentVersion>1.0-beta-1-RC1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
  -  <shortDescription>
  -    Component activation framework.
  -  </shortDescription>
  +  <shortDescription>Runtime activation framework.</shortDescription>
   
     <dependencies>
   
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/composition/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 09:49:17 -0000	1.2
  +++ project.xml	12 Sep 2003 14:00:38 -0000	1.3
  @@ -11,7 +11,7 @@
     <currentVersion>1.0-beta-1-RC1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
  -  <shortDescription>Avalon Composition Service Provider Interface</shortDescription>
  +  <shortDescription>Avalon Composition SPI</shortDescription>
   
     <description>
   An API supporting component composition.
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/composition/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/spi/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	10 Sep 2003 09:49:17 -0000	1.2
  +++ project.xml	12 Sep 2003 14:00:38 -0000	1.3
  @@ -11,7 +11,7 @@
     <currentVersion>1.0-beta-1-RC1</currentVersion>
   
     <inceptionYear>2002</inceptionYear>
  -  <shortDescription>Avalon Composition Service Provider Interface</shortDescription>
  +  <shortDescription>Avalon Composition SPI</shortDescription>
   
     <description>
   An API supporting component composition.
  
  
  
  1.4       +1 -1      avalon-sandbox/merlin/merlin-platform/src/config/debug.xml
  
  Index: debug.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/debug.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- debug.xml	11 Sep 2003 02:35:01 -0000	1.3
  +++ debug.xml	12 Sep 2003 14:00:39 -0000	1.4
  @@ -7,7 +7,7 @@
   
      <repository>
        <hosts>
  -       <host>http://www.ibiblio.org/merlin/</host>
  +       <host>http://www.dpml.net/repository/</host>
          <host>http://www.ibiblio.org/maven/</host>
        </hosts>
      </repository>
  
  
  
  1.13      +1 -1      avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- kernel.xml	11 Sep 2003 02:35:01 -0000	1.12
  +++ kernel.xml	12 Sep 2003 14:00:39 -0000	1.13
  @@ -11,7 +11,7 @@
   
      <repository>
        <hosts>
  -       <host>http://www.ibiblio.org/merlin/repository/</host>
  +       <host>http://www.dpml.net/repository/</host>
          <host>http://www.ibiblio.org/maven/</host>
        </hosts>
      </repository>
  
  
  
  1.2       +1 -1      avalon-sandbox/merlin/merlin-platform/src/repository/merlin/jnlps/merlin.jnlp
  
  Index: merlin.jnlp
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/merlin/jnlps/merlin.jnlp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- merlin.jnlp	31 Aug 2003 14:40:25 -0000	1.1
  +++ merlin.jnlp	12 Sep 2003 14:00:39 -0000	1.2
  @@ -21,6 +21,6 @@
          href="http://www.dpml.net/repository/avalon-framework/jars/avalon-framework-impl-4.1.5.jar"/>
     </resources>
     <application-desc main-class="org.apache.avalon.merlin.mgr.jnlp.Loader">
  -    <argument>http://www.osm.net/test/jnlp/block.xml</argument>
  +    <argument>http://www.dpml.net/repository/test/jnlp/block.xml</argument>
     </application-desc>
   </jnlp>
  
  
  
  1.4       +1 -1      avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/repository/merlin/xmls/kernel.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- kernel.xml	2 Sep 2003 08:59:34 -0000	1.3
  +++ kernel.xml	12 Sep 2003 14:00:39 -0000	1.4
  @@ -8,7 +8,7 @@
   
      <repository>
        <hosts>
  -       <host>http://www.ibiblio.org/merlin/repository/</host>
  +       <host>http://www.dpml.net/repository/</host>
          <host>http://www.ibiblio.org/maven/</host>
        </hosts>
      </repository>
  
  
  
  1.5       +1 -1      avalon-sandbox/merlin/merlin-platform/tutorials/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	25 Aug 2003 16:41:05 -0000	1.4
  +++ project.xml	12 Sep 2003 14:00:39 -0000	1.5
  @@ -12,7 +12,7 @@
       <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:avalon-sandbox/merlin/merlin-platform/src/tutorials</connection>
       <url>http://cvs.apache.org/viewcvs/avalon-sandbox/merlin/merlin-platform/src/tutorials</url>
     </repository>
  -  <shortDescription>Merlin Tutorial set</shortDescription>
  +  <shortDescription>Merlin Tutorials</shortDescription>
     <description>
   	A set of tutorials on merlin
     </description>
  
  
  

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