Return-Path: 
 <cvs-return-16970-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 16906 invoked by uid 500); 15 Jun 2003 10:10:03 -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 16894 invoked from network); 15 Jun 2003 10:10:03 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 15 Jun 2003 10:10:03 -0000
Received: (qmail 78728 invoked by uid 1291); 15 Jun 2003 10:10:01 -0000
Date: 15 Jun 2003 10:10:01 -0000
Message-ID: <20030615101001.78727.qmail@icarus.apache.org>
From: leosimons@apache.org
To: avalon-cvs@apache.org
Subject: cvs commit: avalon/buildsystem/gump-integration/project avalon.xml
 avalon-framework.xml avalon-fortress-tools.xml avalon-fortress-examples.xml
 avalon-fortress-container.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

leosimons    2003/06/15 03:10:01

  Modified:    buildsystem/gump-integration/project avalon.xml
                        avalon-framework.xml avalon-fortress-tools.xml
                        avalon-fortress-examples.xml
                        avalon-fortress-container.xml
  Log:
  try and fix exp gump setup
  
  Revision  Changes    Path
  1.4       +25 -29    avalon/buildsystem/gump-integration/project/avalon.xml
  
  Index: avalon.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/gump-integration/project/avalon.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- avalon.xml	15 Jun 2003 09:10:53 -0000	1.3
  +++ avalon.xml	15 Jun 2003 10:10:01 -0000	1.4
  @@ -1,52 +1,48 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <module name="avalon">
  -    <url href="http://avalon.apache.org/"></url>
  +    <url href="http://avalon.apache.org/"/>
       <description>
         Avalon's main repository.
       </description>
  -    <cvs repository="avalon"></cvs>
  +    <cvs repository="avalon"/>
   
       <project name="avalon">
           <!-- deprecated! -->
   
           <!-- can't just reference the new avalon-framework project here
  -             because we go from 1 to multiple jars. This is a copied
  -             descriptor. -->
  +        because we go from 1 to multiple jars. This is a copied
  +        descriptor. -->
   
           <package>org.apache.avalon</package>
           <ant target="dist" basedir="framework">
               <property name="project.version" value="@@DATE@@"></property>
           </ant>
   
  -        <depend project="ant"></depend>
  -        <depend inherit="runtime" project="ant"></depend>
  -        <depend project="xml-xalan2"></depend>
  -        <depend project="xml-xerces"></depend>
  -
  -          <depend runtime="true" project="junit"></depend>
  -          <depend runtime="true" project="jakarta-log4j"></depend>
  -          <depend runtime="true" project="avalon-logkit"></depend>
  -
  -        <work nested="framework/target/classes"></work>
  -        <work nested="framework/target/api-classes"></work>
  -        <work nested="framework/target/impl-classes"></work>
  -        <work nested="framework/target/test-classes"></work>
  -
  -        <home nested="framework"></home>
  -        <jar name="target/avalon-framework-@@DATE@@.jar" id="combined"></jar>
  -        <javadoc nested="framework/target/docs/apidocs"></javadoc>
  +        <depend project="ant" inherit="runtime"/>
  +        <depend project="xml-xalan2"/>
  +        <depend project="xml-xerces"/>
  +
  +        <depend runtime="true" project="junit"/>
  +        <depend runtime="true" project="jakarta-log4j"/>
  +        <depend runtime="true" project="avalon-logkit"/>
  +
  +        <work nested="framework/target/classes"/>
  +        <work nested="framework/target/api-classes"/>
  +        <work nested="framework/target/impl-classes"/>
  +        <work nested="framework/target/test-classes"/>
  +
  +        <home nested="framework"/>
  +        <jar name="target/avalon-framework-@@DATE@@.jar" id="combined"/>
  +        <javadoc nested="framework/target/docs/apidocs"/>
   
  -        <nag to="dev@avalon.apache.org" from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"></nag>
  +        <nag to="dev@avalon.apache.org" from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"/>
       </project>
   
  -    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-framework.xml"></project>
  -
  -    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml"></project>
  -
  -    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-fortress-tools.xml"></project>
  -
  -    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-fortress-examples.xml"></project>
  +    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-framework.xml"/>
  +    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml"/>
  +    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-fortress-tools.xml"/>
  +    <project href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon-fortress-examples.xml"/>
   
   
   </module>
  
  
  
  1.5       +19 -24    avalon/buildsystem/gump-integration/project/avalon-framework.xml
  
  Index: avalon-framework.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/gump-integration/project/avalon-framework.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- avalon-framework.xml	14 Jun 2003 15:54:26 -0000	1.4
  +++ avalon-framework.xml	15 Jun 2003 10:10:01 -0000	1.5
  @@ -6,29 +6,24 @@
           <property name="project.version" value="@@DATE@@"></property>
       </ant>
   
  +    <depend project="ant" inherit="runtime"/>
  +    <depend project="xml-xalan2"/>
  +    <depend project="xml-xerces"/>
  +    <depend runtime="true" project="junit"/>
  +
  +    <depend runtime="true" project="jakarta-log4j"/>
  +    <depend runtime="true" project="avalon-logkit"/>
  +
  +    <work nested="framework/target/classes"/>
  +    <work nested="framework/target/api-classes"/>
  +    <work nested="framework/target/impl-classes"/>
  +    <work nested="framework/target/test-classes"/>
  +
  +    <home nested="framework"/>
  +    <jar name="target/avalon-framework-@@DATE@@.jar" id="combined"/>
  +    <jar name="target/avalon-framework-@@DATE@@-api.jar" id="api"/>
  +    <jar name="target/avalon-framework-@@DATE@@-impl.jar" id="impl"/>
  +    <javadoc nested="framework/target/docs/apidocs"/>
   
  -    <depend inherit="runtime" project="ant"></depend>
  -    <depend project="xml-xalan2"></depend>
  -    <depend project="xml-xerces"></depend>
  -
  -
  -
  -      <depend runtime="true" project="junit"></depend>
  -
  -      <depend runtime="true" project="jakarta-log4j"></depend>
  -
  -      <depend runtime="true" project="avalon-logkit"></depend>
  -
  -    <work nested="framework/target/classes"></work>
  -    <work nested="framework/target/api-classes"></work>
  -    <work nested="framework/target/impl-classes"></work>
  -    <work nested="framework/target/test-classes"></work>
  -
  -    <home nested="framework"></home>
  -    <jar name="target/avalon-framework-@@DATE@@.jar" id="combined"></jar>
  -    <jar name="target/avalon-framework-@@DATE@@-api.jar" id="api"></jar>
  -    <jar name="target/avalon-framework-@@DATE@@-impl.jar" id="impl"></jar>
  -    <javadoc nested="framework/target/docs/apidocs"></javadoc>
  -
  -    <nag to="dev@avalon.apache.org" from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"></nag>
  +    <nag to="dev@avalon.apache.org" from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"/>
   </project>
  
  
  
  1.3       +1 -7      avalon/buildsystem/gump-integration/project/avalon-fortress-tools.xml
  
  Index: avalon-fortress-tools.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/gump-integration/project/avalon-fortress-tools.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- avalon-fortress-tools.xml	10 Jun 2003 18:37:56 -0000	1.2
  +++ avalon-fortress-tools.xml	15 Jun 2003 10:10:01 -0000	1.3
  @@ -7,18 +7,12 @@
       </ant>
   
   
  -    <depend inherit="runtime" project="ant"></depend>
  +    <depend project="ant" inherit="runtime"></depend>
       <depend project="xml-xalan2"></depend>
       <depend project="xml-xerces"></depend>
   
  -
  -
  -      <depend runtime="true" project="ant"></depend>
  -
         <depend runtime="true" project="avalon-fortress-container"></depend>
  -
         <depend runtime="true" project="junit"></depend>
  -
         <depend runtime="true" project="qdox"></depend>
   
   
  
  
  
  1.4       +1 -3      avalon/buildsystem/gump-integration/project/avalon-fortress-examples.xml
  
  Index: avalon-fortress-examples.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/gump-integration/project/avalon-fortress-examples.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- avalon-fortress-examples.xml	10 Jun 2003 18:44:43 -0000	1.3
  +++ avalon-fortress-examples.xml	15 Jun 2003 10:10:01 -0000	1.4
  @@ -7,13 +7,11 @@
       </ant>
   
   
  -    <depend inherit="runtime" project="ant"></depend>
  +    <depend project="ant" inherit="runtime"></depend>
       <depend project="xml-xalan2"></depend>
       <depend project="xml-xerces"></depend>
   
   
  -
  -      <depend runtime="true" project="ant"></depend>
   
         <depend runtime="true" project="avalon-fortress-container"></depend>
   
  
  
  
  1.7       +1 -4      avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml
  
  Index: avalon-fortress-container.xml
  ===================================================================
  RCS file: /home/cvs/avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- avalon-fortress-container.xml	14 Jun 2003 15:54:26 -0000	1.6
  +++ avalon-fortress-container.xml	15 Jun 2003 10:10:01 -0000	1.7
  @@ -7,13 +7,10 @@
       </ant>
   
   
  -    <depend inherit="runtime" project="ant"></depend>
  +    <depend project="ant" inherit="runtime"></depend>
       <depend project="xml-xalan2"></depend>
       <depend project="xml-xerces"></depend>
   
  -
  -
  -      <depend runtime="true" project="ant"></depend>
   
         <depend runtime="true" project="jakarta-bcel"></depend>
   
  
  
  

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