Return-Path: 
 <cvs-return-17035-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 63266 invoked by uid 500); 17 Jun 2003 17:28:39 -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 63222 invoked from network); 17 Jun 2003 17:28:39 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 17 Jun 2003 17:28:39 -0000
Received: (qmail 3748 invoked by uid 1152); 17 Jun 2003 17:28:38 -0000
Date: 17 Jun 2003 17:28:38 -0000
Message-ID: <20030617172838.3747.qmail@icarus.apache.org>
From: bloritsch@apache.org
To: avalon-cvs@apache.org
Subject: cvs commit: avalon/framework maven.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bloritsch    2003/06/17 10:28:38

  Modified:    buildsystem maven-template.xml
               fortress/cli maven.xml
               fortress/container maven.xml
               fortress/docs maven.xml
               fortress/examples maven.xml
               fortress/platform maven.xml
               fortress/servlet maven.xml
               fortress/tools maven.xml
               framework maven.xml
  Log:
  Simplify the Maven descriptors.
  
  Revision  Changes    Path
  1.2       +2 -5      avalon/buildsystem/maven-template.xml
  
  Index: maven-template.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/maven-template.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven-template.xml	9 Jun 2003 15:26:24 -0000	1.1
  +++ maven-template.xml	17 Jun 2003 17:28:37 -0000	1.2
  @@ -15,9 +15,7 @@
           <!-- friendly error in case file is not available -->
           <ant:available file="${avalon.buildsystem}/maven-common.xml"
                   property="buildsystem.available"/>
  -        <j:set var="avalon.buildsystem.available" value="${buildsystem.available}"/>
  -        <j:if test="${empty(avalon.buildsystem.available)}">
  -            <ant:fail>
  +        <ant:fail unless="buildsystem.available">
               ===================================================================
               BUILD SYSTEM FAILURE!
               ===================================================================
  @@ -25,8 +23,7 @@
               a required file, ${avalon.buildsystem}/maven-common.xml, cannot be
               found. Try setting the avalon.buildsystem property in
               project.properties to the correct location.
  -            </ant:fail>
  -        </j:if>
  +        </ant:fail>
       </goal>
   
       <!-- include the avalon-wide custom goal decorators from maven-common.xml -->
  
  
  
  1.3       +0 -0      avalon/fortress/cli/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/cli/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.7       +0 -0      avalon/fortress/container/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/container/maven.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  
  
  
  1.3       +0 -0      avalon/fortress/docs/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/docs/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.3       +0 -0      avalon/fortress/examples/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/examples/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.3       +0 -0      avalon/fortress/platform/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/platform/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.3       +0 -0      avalon/fortress/servlet/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/servlet/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.5       +0 -0      avalon/fortress/tools/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/fortress/tools/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  
  1.5       +0 -0      avalon/framework/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/framework/maven.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  

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