Return-Path: 
 <cvs-return-23006-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 12364 invoked from network); 5 Apr 2004 13:33:02 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 5 Apr 2004 13:33:02 -0000
Received: (qmail 30278 invoked by uid 500); 5 Apr 2004 13:32:57 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 30213 invoked by uid 500); 5 Apr 2004 13:32:57 -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 30181 invoked from network); 5 Apr 2004 13:32:57 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 5 Apr 2004 13:32:57 -0000
Received: (qmail 12331 invoked by uid 1438); 5 Apr 2004 13:33:00 -0000
Date: 5 Apr 2004 13:33:00 -0000
Message-ID: <20040405133300.12330.qmail@minotaur.apache.org>
From: mcconnell@apache.org
To: avalon-cvs@apache.org
Subject: cvs commit: avalon/merlin/activation/impl index.ent 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    2004/04/05 06:33:00

  Modified:    merlin/activation/api project.xml
               merlin/activation/impl project.xml
  Added:       merlin/activation/api index.ent
               merlin/activation/impl index.ent
  Log:
  Parameterize build using entity references.
  
  Revision  Changes    Path
  1.10      +10 -6     avalon/merlin/activation/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	4 Apr 2004 06:30:54 -0000	1.9
  +++ project.xml	5 Apr 2004 13:33:00 -0000	1.10
  @@ -1,14 +1,18 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../project.xml</extend>
   
  -  <groupId>avalon-activation</groupId>
  -  <id>avalon-activation-api</id>
  +  <groupId>&avalon-activation-id;</groupId>
  +  <id>&avalon-activation-api-id;</id>
  +  <currentVersion>&avalon-activation-api-version;</currentVersion>
  +
     <name>Avalon Activation API</name>
     <package>org.apache.avalon.activation</package>
  -
     <inceptionYear>2002</inceptionYear>
     <shortDescription>Activation API</shortDescription>
   
  @@ -29,9 +33,9 @@
         <version>1.4-SNAPSHOT</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-composition</groupId>
  -      <artifactId>avalon-composition-api</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <groupId>&avalon-composition-id;</groupId>
  +      <artifactId>&avalon-composition-api-id;</artifactId>
  +      <version>&avalon-composition-api-version;</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.1                  avalon/merlin/activation/api/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
  
  
  
  1.24      +20 -16    avalon/merlin/activation/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- project.xml	4 Apr 2004 06:30:54 -0000	1.23
  +++ project.xml	5 Apr 2004 13:33:00 -0000	1.24
  @@ -1,16 +1,20 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
   
   <project>
   
     <extend>${basedir}/../../project.xml</extend>
   
  -  <groupId>avalon-activation</groupId>
  -  <id>avalon-activation-impl</id>
  +  <groupId>&avalon-activation-id;</groupId>
  +  <id>&avalon-activation-impl-id;</id>
  +  <currentVersion>&avalon-activation-impl-version;</currentVersion>
  +
     <name>Avalon Activation Framework</name>
     <package>org.apache.avalon.activation</package>
  -
  -  <inceptionYear>2002</inceptionYear>
     <shortDescription>Runtime activation framework.</shortDescription>
  +  <inceptionYear>2002</inceptionYear>
   
     <dependencies>
   
  @@ -34,25 +38,25 @@
       </dependency>
   
       <dependency>
  -      <groupId>avalon-activation</groupId>
  -      <artifactId>avalon-activation-api</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <groupId>&avalon-activation-id;</groupId>
  +      <artifactId>&avalon-activation-api-id;</artifactId>
  +      <version>&avalon-activation-api-version;</version>
       </dependency>
   
       <dependency>
  -      <groupId>avalon-composition</groupId>
  -      <artifactId>avalon-composition-api</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <groupId>&avalon-composition-id;</groupId>
  +      <artifactId>&avalon-composition-api-id;</artifactId>
  +      <version>&avalon-composition-api-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-composition</groupId>
  -      <artifactId>avalon-composition-spi</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <groupId>&avalon-composition-id;</groupId>
  +      <artifactId>&avalon-composition-spi-id;</artifactId>
  +      <version>&avalon-composition-spi-version;</version>
       </dependency>
       <dependency>
  -      <groupId>avalon-composition</groupId>
  -      <artifactId>avalon-composition-impl</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <groupId>&avalon-composition-id;</groupId>
  +      <artifactId>&avalon-composition-impl-id;</artifactId>
  +      <version>&avalon-composition-impl-version;</version>
       </dependency>
   
       <dependency>
  
  
  
  1.1                  avalon/merlin/activation/impl/index.ent
  
  Index: index.ent
  ===================================================================
  <!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
  
  
  

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