bloritsch    2003/06/18 09:29:30

  Modified:    profile  apache-avalon.xml gump.xml
               project  avalon-logkit.xml avalon-phoenix.xml
                        incubator-altrmi.xml jakarta-james.xml
  Added:       project  avalon-components.xml
  Removed:     project  avalon-cornerstone.xml
  Log:
  changing all cornerstone references to avalon-components
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-gump/profile/apache-avalon.xml
  
  Index: apache-avalon.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/profile/apache-avalon.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apache-avalon.xml 4 Jun 2003 16:51:55 -0000       1.2
  +++ apache-avalon.xml 18 Jun 2003 16:29:28 -0000      1.3
  @@ -6,7 +6,7 @@
   
     <module href="project/avalon-sandbox.xml"/>
     <module href="project/avalon.xml"/>
  -  <module href="project/avalon-cornerstone.xml"/>
  +  <module href="project/avalon-components.xml"/>
     <module href="project/avalon-excalibur.xml"/>
     <module href="project/avalon-logkit.xml"/>
     <module href="project/avalon-phoenix.xml"/>
  
  
  
  1.230     +1 -1      jakarta-gump/profile/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/profile/gump.xml,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -r1.229 -r1.230
  --- gump.xml  17 Jun 2003 13:59:47 -0000      1.229
  +++ gump.xml  18 Jun 2003 16:29:29 -0000      1.230
  @@ -10,7 +10,7 @@
     <module 
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/avalon/buildsystem/gump-integration/project/avalon.xml"/>
     <module href="project/avalon-sandbox.xml"/>
   <!-- maybe this causes dependency failure weirdness  <module 
href="project/avalon.xml"/>-->
  -  <module href="project/avalon-cornerstone.xml"/>
  +  <module href="project/avalon-components.xml"/>
     <module href="project/avalon-excalibur.xml"/>
     <module href="project/avalon-logkit.xml"/>
     <module href="project/avalon-phoenix.xml"/>
  
  
  
  1.11      +25 -0     jakarta-gump/project/avalon-logkit.xml
  
  Index: avalon-logkit.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/avalon-logkit.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- avalon-logkit.xml 14 Jun 2003 16:19:46 -0000      1.10
  +++ avalon-logkit.xml 18 Jun 2003 16:29:30 -0000      1.11
  @@ -50,4 +50,29 @@
               to="[EMAIL PROTECTED]"/>
     </project>
   
  +  <project name="avalon-logkit-maven">
  +    <package>org.apache.log</package>
  +
  +    <ant file="gump-build.xml" target="dist">
  +    </ant>
  +    <depend project="ant" inherit="runtime"/>
  +    <depend project="xml-xerces"/>
  +    <depend project="junit"/>
  +
  +    <depend project="jdbc" runtime="true"/>
  +    <depend project="jms" runtime="true"/>
  +    <depend project="javamail" runtime="true"/>
  +    <depend project="jaf" runtime="true"/>
  +    <depend project="jakarta-servletapi-4" runtime="true"/>
  +    <depend project="jakarta-log4j" runtime="true"/>
  +
  +    <home nested="build/lib"/>
  +    <jar name="logkit.jar"/>
  +
  +    <javadoc nested="build/javadocs" module="avalon"/>
  +    <license name="LICENSE"/>
  +        <nag from="Gump Integration Build &lt;[EMAIL PROTECTED]&gt;"
  +                to="[EMAIL PROTECTED]"/>
  +  </project>
  +
   </module>
  
  
  
  1.49      +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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- avalon-phoenix.xml        14 Jun 2003 16:19:46 -0000      1.48
  +++ avalon-phoenix.xml        18 Jun 2003 16:29:30 -0000      1.49
  @@ -81,7 +81,7 @@
           <option project="checkstyle" inherit="runtime"/>
           <depend project="avalon-framework" id="combined"/>
           <depend project="avalon-phoenix" inherit="all"/>
  -        <depend project="avalon-cornerstone"/>
  +        <depend project="avalon-components"/>
   
           <home nested="examples/demo"/>
           <work nested="examples/demo/target/classes"/>
  @@ -133,7 +133,7 @@
           <depend project="xml-xerces"/>
           <depend project="avalon-framework" id="combined"/>
           <depend project="avalon-phoenix" inherit="all"/>
  -        <depend project="avalon-cornerstone"/>
  +        <depend project="avalon-components"/>
           <depend project="excalibur-thread"/>
   
           <option project="checkstyle" inherit="runtime"/>
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- incubator-altrmi.xml      14 Jun 2003 16:19:46 -0000      1.18
  +++ incubator-altrmi.xml      18 Jun 2003 16:29:30 -0000      1.19
  @@ -28,7 +28,7 @@
           <depend project="jakarta-log4j"/>
           <depend project="commons-attributes" inherit="runtime"/>
           <depend project="excalibur-lifecycle"/>
  -        <depend project="avalon-cornerstone"/>
  +        <depend project="avalon-components"/>
           <depend project="avalon-phoenix"/>
           <depend project="commons-betwixt"/>
           <depend project="commons-digester"/>
  
  
  
  1.29      +1 -1      jakarta-gump/project/jakarta-james.xml
  
  Index: jakarta-james.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/project/jakarta-james.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- jakarta-james.xml 14 Jun 2003 16:19:46 -0000      1.28
  +++ jakarta-james.xml 18 Jun 2003 16:29:30 -0000      1.29
  @@ -16,7 +16,7 @@
       <depend project="xml-xerces" />
       <depend project="javamail" />
       <depend project="avalon-framework" id="combined"/>
  -    <depend project="avalon-cornerstone" />
  +    <depend project="avalon-components" />
       <depend project="excalibur-compatibility"/>
       <!--    <depend project="excalibur-cli"/> -->
       <!-- <depend project="excalibur-concurrent"/> -->
  
  
  
  1.1                  jakarta-gump/project/avalon-components.xml
  
  Index: avalon-components.xml
  ===================================================================
  <module name="avalon-components">
  
    <!-- components 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 components and
         excalibur this is on hold -->
  
    <url href="http://avalon.apache.org/"/>
    <description>
      Set of default services for Avalon/Phoenix
    </description>
  
    <cvs repository="avalon"/>
  
    <project name="avalon-components">
      <package>org.apache.avalon.cornerstone</package>
  
      <ant />
  
      <!-- runtime dependencies -->
      <depend project="avalon-framework" runtime="true" id="combined"/>
      <depend project="avalon-logkit" runtime="true"/>
      <depend project="xml-xerces" id="parser" runtime="true"/>
      <depend project="excalibur-compatibility" runtime="true"/>
      <depend project="excalibur-datasource" runtime="true"/>
      <depend project="excalibur-i18n" runtime="true"/>
      <depend project="excalibur-thread" runtime="true"/>
      <depend project="avalon-phoenix"
          ids="client metagenerate" inherit="all" runtime="true"/>
  
      <!-- buildtime dependencies -->
      <depend project="junit"/>
      <depend project="excalibur-compatibility"/>
      <depend project="excalibur-datasource"/>
      <depend project="excalibur-i18n"/>
      <depend project="excalibur-thread"/>
      <depend project="avalon-phoenix" ids="client metagenerate" inherit="runtime"/>
      <depend project="ant" inherit="runtime"/>
      <depend project="jakarta-velocity" inherit="runtime"/>
  
      <option project="excalibur-event"/>
      <option project="jakarta-bcel"/>
      <option project="jsse"/>
  
      <work nested="build/classes"/>
  
      <home nested="build/lib"/>
      <jar name="cornerstone.jar"/>
  
      <javadoc nested="docs/api" module="avalon"/>
      <license name="LICENSE.txt"/>
  
      <nag from="Gump Integration Build &lt;[EMAIL PROTECTED]&gt;"
              to="[EMAIL PROTECTED]"/>
    </project>
  
  </module>
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to