gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosim...@apache.org
Subject cvs commit: jakarta-gump/project avalon-cornerstone.xml avalon-excalibur.xml avalon-phoenix.xml avalon-sandbox.xml incubator-altrmi.xml
Date Fri, 21 Feb 2003 20:09:08 GMT
leosimons    2003/02/21 12:09:07

  Modified:    project  avalon-cornerstone.xml avalon-excalibur.xml
                        avalon-phoenix.xml avalon-sandbox.xml
                        incubator-altrmi.xml
  Log:
  further cleanup of avalon gump definitions
  
  Revision  Changes    Path
  1.4       +20 -4     jakarta-gump/project/avalon-cornerstone.xml
  
  Index: avalon-cornerstone.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/avalon-cornerstone.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- avalon-cornerstone.xml	21 Feb 2003 19:55:53 -0000	1.3
  +++ avalon-cornerstone.xml	21 Feb 2003 20:09:06 -0000	1.4
  @@ -1,5 +1,11 @@
   <module name="avalon-cornerstone">
   
  +  <!-- cornerstone has been partially split into seperate
  +       projects, and this needs to be updated to reflect
  +       that to allow more granular depenencies. But as we
  +       might be further integrating cornerstone and
  +       excalibur this is on hold -->
  +
     <url href="http://avalon.apache.org/"/>
     <description>
       Set of default services for Avalon/Phoenix
  @@ -17,16 +23,26 @@
   
       <ant />
   
  -    <depend project="avalon"/>
  -    <depend project="avalon-logkit"/>
  -    <depend project="xml-xerces" id="parser"/>
  +    <!-- runtime dependencies -->
  +    <depend project="avalon" runtime="true"/>
  +    <depend project="avalon-logkit" runtime="true"/>
  +    <depend project="xml-xerces" id="parser" runtime="true"/>
  +    <depend project="excalibur-io" runtime="true"/>
  +    <depend project="excalibur-datasource" runtime="true"/>
  +    <depend project="excalibur-i18n" runtime="true"/>
  +    <depend project="excalibur-thread" runtime="true"/>
  +    <depend project="excalibur-threadcontext" runtime="true"/>
  +    <depend project="avalon-phoenix"
  +        ids="client metagenerate" inherit="all" runtime="true"/>
  +
  +    <!-- buildtime dependencies -->
       <depend project="junit"/>
       <depend project="excalibur-io"/>
       <depend project="excalibur-datasource"/>
       <depend project="excalibur-i18n"/>
       <depend project="excalibur-thread"/>
       <depend project="excalibur-threadcontext"/>
  -    <depend project="avalon-phoenix" ids="client metagenerate"/>
  +    <depend project="avalon-phoenix" ids="client metagenerate" inherit="runtime"/>
       <depend project="ant" inherit="runtime"/>
       <depend project="jakarta-velocity" inherit="runtime"/>
   
  
  
  
  1.3       +52 -27    jakarta-gump/project/avalon-excalibur.xml
  
  Index: avalon-excalibur.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/avalon-excalibur.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- avalon-excalibur.xml	20 Feb 2003 17:21:28 -0000	1.2
  +++ avalon-excalibur.xml	21 Feb 2003 20:09:06 -0000	1.3
  @@ -1,18 +1,30 @@
   <module name="avalon-excalibur">
  +    <!-- excalibur projects missing from GUMP:
  +
  +    - cache
  +    - configuration
  +    - jprocess
  +    - xfc
  +
  +    note the future of these is uncertain and they are all in fact alpha packages
  +
  +    -->
   
       <url href="http://avalon.apache.org/excalibur"/>
       <description>
  -      A repository of reusable components
  +      A repository of reusable components supporting the avalon patterns of Inversion of
  +      Control and Seperation of Concerns by using avalon-framework.
       </description>
   
       <cvs repository="avalon"/>
   
  -    <project name="avalon-excalibur">
  +    <project name="dist-avalon-excalibur">
           <!-- this basically depends on all excalibur subprojects and their dependencies.
                It creates a rather big jar if successful -->
   
           <package>org.apache.excalibur</package>
           <package>org.apache.avalon.excalibur</package>
  +        <package>org.apache.avalon.fortress</package>
   
           <ant target="dist">
               <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
  @@ -22,30 +34,36 @@
           </ant>
   
           <!-- 'internal deps'. Should be full list of all excalibur-* projects -->
  -        <depend project="incubator-altrmi" inherit="runtime"/>
  -        <depend project="excalibur-cli" runtime="true"/>
  -        <depend project="excalibur-component" runtime="true"/>
  -        <depend project="excalibur-collections" runtime="true"/>
  -        <depend project="excalibur-container" runtime="true"/>
  -        <depend project="excalibur-concurrent"/>
  -        <depend project="excalibur-datasource" runtime="true"/>
  -        <depend project="excalibur-event" runtime="true"/>
  -        <depend project="excalibur-extension" runtime="true"/>
  -        <depend project="excalibur-i18n" runtime="true"/>
  -        <depend project="excalibur-info" runtime="true" inherit="runtime"/>
  -        <depend project="excalibur-instrument-manager" runtime="true"/>
  -        <depend project="excalibur-instrument" runtime="true"/>
  -        <depend project="excalibur-io"/>
  -        <depend project="excalibur-logger" runtime="true"/>
  -        <depend project="excalibur-meta" runtime="true"/>
  -        <depend project="excalibur-monitor" runtime="true"/>
  -        <depend project="excalibur-pool" runtime="true"/>
  -        <depend project="excalibur-sourceresolve"/>
  -        <depend project="excalibur-testcase"/>
  -        <depend project="excalibur-thread"/>
  -        <depend project="excalibur-threadcontext"/>
  -        <depend project="excalibur-xmlutil"/>
  -        <depend project="excalibur-util"/>
  +        <depend project="excalibur-baxter" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-cli" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-component" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-collections" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-configuration" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-container" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-converter" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-datasource" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-event" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-extension" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-fortress" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-i18n" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-instrument" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-instrument-client" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-instrument-manager" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-io" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-loader" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-logger" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-meta" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-monitor" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-naming" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-policy" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-pool" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-sourceresolve" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-store" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-testcase" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-thread" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-threadcontext" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-xmlutil" runtime="true" inherit="jars"/>
  +        <depend project="excalibur-util" runtime="true" inherit="jars"/>
   
           <!-- build-time dependencies -->
           <depend project="dist-bsf"/>
  @@ -57,11 +75,18 @@
           <depend project="jdom"/>
           <depend project="junit"/>
           <depend project="rhino"/>
  -        <depend project="xml-cocoon2"/>
  +        <depend project="xml-forrest"/>
           <depend project="xml-xalan2"/>
   
           <!-- runtime dependencies -->
           <depend project="avalon" runtime="true"/>
  +
  +        <depend project="excalibur-concurrent" runtime="true"/>
  +
  +        <!-- this should go -->
  +        <depend project="avalon-sandbox-info" runtime="true" inherit="runtime"/>
  +
  +        <depend project="incubator-altrmi" inherit="runtime" runtime="true"/>
           <depend project="xml-xerces" id="parser" runtime="true"/>
   
           <!-- optional dependencies -->
  
  
  
  1.3       +2 -2      jakarta-gump/project/avalon-phoenix.xml
  
  Index: avalon-phoenix.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/avalon-phoenix.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- avalon-phoenix.xml	21 Feb 2003 17:11:44 -0000	1.2
  +++ avalon-phoenix.xml	21 Feb 2003 20:09:06 -0000	1.3
  @@ -30,7 +30,7 @@
       <depend project="excalibur-configuration" runtime="true"/>
       <depend project="excalibur-converter" runtime="true"/>
       <depend project="excalibur-io" runtime="true"/>
  -    <depend project="excalibur-info" runtime="true"/>
  +    <depend project="avalon-sandbox-info" runtime="true"/>
       <depend project="excalibur-cli" runtime="true"/>
       <depend project="excalibur-extension" runtime="true"/>
       <depend project="excalibur-threadcontext" runtime="true"/>
  @@ -59,7 +59,7 @@
       <home nested="build/lib"/>
       <jar name="phoenix-client.jar" id="client"/>
   
  -    <!-- metagenerate depends only on qdox and excalibur-info.
  +    <!-- metagenerate depends only on qdox and avalon-sandbox-info.
            phoenix build should be updated to split this out -->
       <jar name="phoenix-metagenerate.jar" id="metagenerate"/>
       <jar name="phoenix-loader.jar" id="loader"/>
  
  
  
  1.17      +56 -54    jakarta-gump/project/avalon-sandbox.xml
  
  Index: avalon-sandbox.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/avalon-sandbox.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- avalon-sandbox.xml	19 Feb 2003 13:05:56 -0000	1.16
  +++ avalon-sandbox.xml	21 Feb 2003 20:09:06 -0000	1.17
  @@ -1,29 +1,40 @@
   <module name="avalon-sandbox">
   
  -    <url href="http://avalon.apache.org/excalibur"/>
  +    <url href="http://avalon.apache.org/"/>
       <description>
  -      A repository of reusable components
  +      A repository of alpha-stage reusable components
       </description>
   
       <cvs repository="avalon"/>
   
  -    <project name="avalon-sandbox-lifecycle">
  -        <package>org.apache.avalon.lifecycle</package>
  +    <project name="avalon-sandbox-assembly">
  +        <package>org.apache.avalon.assembly</package>
   
  -        <ant basedir="lifecycle">
  +        <ant basedir="assembly" target="jar">
  +            <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
               <property name="package-version" value="@@DATE@@"/>
               <property name="junit.failonerror" value="true"/>
  -            <property name="jakarta-site.dir" project="jakarta-site2"
  -                      reference="home" />
  +            <property name="do.checkstyle" value="false"/>
  +            <property name="skip.dependencies" value="true"/>
           </ant>
   
           <depend project="ant" inherit="runtime"/>
           <depend project="avalon" runtime="true"/>
  +        <depend project="avalon-sandbox-lifecycle" runtime="true"/>
  +        <depend project="avalon-sandbox-meta" runtime="true"/>
  +        <depend project="excalibur-i18n" runtime="true"/>
  +        <depend project="excalibur-configuration" runtime="true"/>
  +        <depend project="excalibur-logger" runtime="true"/>
  +        <depend project="excalibur-extension" runtime="true"/>
  +        <depend project="excalibur-event" runtime="true"/>
  +        <depend project="excalibur-collections" runtime="true"/>
  +        <depend project="excalibur-thread" runtime="true"/>
           <depend project="xml-xerces"/>
  -        <work nested="lifecycle/build/classes"/>
  +        <depend project="xml-xalan2"/>
  +        <work nested="assembly/build/classes"/>
   
  -        <home nested="lifecycle"/>
  -        <jar name="build/lib/avalon-lifecycle-@@DATE@@.jar"/>
  +        <home nested="assembly"/>
  +        <jar name="build/lib/avalon-assembly-@@DATE@@.jar"/>
   
           <license name="LICENSE.txt"/>
   
  @@ -31,59 +42,54 @@
                   to="dev@avalon.apache.org"/>
       </project>
   
  -    <project name="avalon-sandbox-meta">
  -        <package>org.apache.avalon.meta</package>
  +    <project name="avalon-sandbox-info">
  +        <package>org.apache.avalon.framework.info</package>
   
  -        <ant basedir="meta">
  -            <property name="package-version" value="@@DATE@@"/>
  +        <ant basedir="info">
  +            <property name="version" value="@@DATE@@"/>
               <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="false"/>
  +            <property name="do.checkstyle" value="true"/>
               <property name="skip.dependencies" value="true"/>
  +            <property name="jakarta-site.dir" project="jakarta-site2"
  +                      reference="home" />
           </ant>
   
           <depend project="ant" inherit="runtime"/>
  +        <option project="checkstyle" inherit="runtime"/>
  +        <depend project="junit"/>
  +        <depend project="avalon-sandbox-qdox" runtime="true" inherit="runtime"/>
           <depend project="avalon" runtime="true"/>
           <depend project="excalibur-i18n" runtime="true"/>
  -        <depend project="excalibur-configuration" runtime="true"/>
           <depend project="xml-xerces"/>
           <depend project="xml-xalan2"/>
  -        <work nested="meta/build/classes"/>
  +        <work nested="info/build/classes"/>
   
  -        <home nested="meta"/>
  -        <jar name="build/lib/avalon-meta-@@DATE@@.jar"/>
  +        <home nested="info"/>
  +        <jar name="build/lib/sandbox-info-@@DATE@@.jar"/>
   
  -        <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
  +        <nag from="Peter Donald &lt;peter@apache.org&gt;"
                   to="dev@avalon.apache.org"/>
       </project>
   
  -    <project name="avalon-sandbox-assembly">
  -        <package>org.apache.avalon.assembly</package>
  +    <project name="avalon-sandbox-lifecycle">
  +        <package>org.apache.avalon.lifecycle</package>
   
  -        <ant basedir="assembly" target="jar">
  -            <depend property="logkit.jar" project="avalon-logkit" runtime="true"/>
  +        <ant basedir="lifecycle">
               <property name="package-version" value="@@DATE@@"/>
               <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="false"/>
  -            <property name="skip.dependencies" value="true"/>
  +            <property name="jakarta-site.dir" project="jakarta-site2"
  +                      reference="home" />
           </ant>
   
           <depend project="ant" inherit="runtime"/>
           <depend project="avalon" runtime="true"/>
  -        <depend project="avalon-sandbox-lifecycle" runtime="true"/>
  -        <depend project="avalon-sandbox-meta" runtime="true"/>
  -        <depend project="excalibur-i18n" runtime="true"/>
  -        <depend project="excalibur-configuration" runtime="true"/>
  -        <depend project="excalibur-logger" runtime="true"/>
  -        <depend project="excalibur-extension" runtime="true"/>
  -        <depend project="excalibur-event" runtime="true"/>
  -        <depend project="excalibur-collections" runtime="true"/>
  -        <depend project="excalibur-thread" runtime="true"/>
           <depend project="xml-xerces"/>
  -        <depend project="xml-xalan2"/>
  -        <work nested="assembly/build/classes"/>
  +        <work nested="lifecycle/build/classes"/>
   
  -        <home nested="assembly"/>
  -        <jar name="build/lib/avalon-assembly-@@DATE@@.jar"/>
  +        <home nested="lifecycle"/>
  +        <jar name="build/lib/avalon-lifecycle-@@DATE@@.jar"/>
  +
  +        <license name="LICENSE.txt"/>
   
           <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
                   to="dev@avalon.apache.org"/>
  @@ -125,36 +131,32 @@
                   to="dev@avalon.apache.org"/>
       </project>
   
  -    <project name="excalibur-info">
  -        <package>org.apache.avalon.framework.info</package>
  +    <project name="avalon-sandbox-meta">
  +        <package>org.apache.avalon.meta</package>
   
  -        <ant basedir="info">
  -            <property name="version" value="@@DATE@@"/>
  +        <ant basedir="meta">
  +            <property name="package-version" value="@@DATE@@"/>
               <property name="junit.failonerror" value="true"/>
  -            <property name="do.checkstyle" value="true"/>
  +            <property name="do.checkstyle" value="false"/>
               <property name="skip.dependencies" value="true"/>
  -            <property name="jakarta-site.dir" project="jakarta-site2"
  -                      reference="home" />
           </ant>
   
           <depend project="ant" inherit="runtime"/>
  -        <option project="checkstyle" inherit="runtime"/>
  -        <depend project="junit"/>
  -        <depend project="excalibur-qdox" runtime="true" inherit="runtime"/>
           <depend project="avalon" runtime="true"/>
           <depend project="excalibur-i18n" runtime="true"/>
  +        <depend project="excalibur-configuration" runtime="true"/>
           <depend project="xml-xerces"/>
           <depend project="xml-xalan2"/>
  -        <work nested="info/build/classes"/>
  +        <work nested="meta/build/classes"/>
   
  -        <home nested="info"/>
  -        <jar name="build/lib/sandbox-info-@@DATE@@.jar"/>
  +        <home nested="meta"/>
  +        <jar name="build/lib/avalon-meta-@@DATE@@.jar"/>
   
  -        <nag from="Peter Donald &lt;peter@apache.org&gt;"
  +        <nag from="Gump Integration Build &lt;dev@avalon.apache.org&gt;"
                   to="dev@avalon.apache.org"/>
       </project>
   
  -    <project name="excalibur-qdox">
  +    <project name="avalon-sandbox-qdox">
           <jar name="info/lib/qdox-20021116-patched.jar"/>
       </project>
   
  
  
  
  1.6       +1 -1      jakarta-gump/project/incubator-altrmi.xml
  
  Index: incubator-altrmi.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/incubator-altrmi.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- incubator-altrmi.xml	21 Feb 2003 17:11:44 -0000	1.5
  +++ incubator-altrmi.xml	21 Feb 2003 20:09:06 -0000	1.6
  @@ -32,7 +32,7 @@
           <!-- inserting the dependencies of phoenix-metagenerate.jar by hand here
                until avalon-phoenix-metagenerate becomes available seperately -->
           <depend project="phoenix-qdox"/>
  -        <depend project="excalibur-info"/>
  +        <depend project="avalon-sandbox-info"/>
   
           <work nested="altrmi/build/classes"/>
   
  
  
  

Mime
View raw message