gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: gump/profile gump.xml
Date Fri, 15 Oct 2004 11:34:44 GMT
niclas      2004/10/15 04:34:44

  Modified:    profile  gump.xml
  Added:       project  merlin.xml
  Log:
  Solution to the merlin-unit / avalon-merlin-unit mismatch.
  
  Revision  Changes    Path
  1.1                  gump/project/merlin.xml
  
  Index: merlin.xml
  ===================================================================
  <?xml version="1.0" ?>
  <!--
    Copyright 2001-2004 The Apache Software Foundation
  
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
  
         http://www.apache.org/licenses/LICENSE-2.0
  
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
  <module name="merlin">
    <url href="http://avalon.apache.org/"/>
    <description>Avalon Merlin compatibility layer</description>
    <svn repository="avalon-svn" dir="trunk/"/>
  
    <project name="merlin-unit">
        <depend project="avalon-merlin-unit" inherit="jars"/>
    </project>
  </module>
  
  
  
  1.429     +1 -0      gump/profile/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/gump/profile/gump.xml,v
  retrieving revision 1.428
  retrieving revision 1.429
  diff -u -r1.428 -r1.429
  --- gump.xml	14 Oct 2004 14:53:38 -0000	1.428
  +++ gump.xml	15 Oct 2004 11:34:44 -0000	1.429
  @@ -25,6 +25,7 @@
   <!-- Apache.Avalon (SVN) -->
     <module href="project/avalon-tools.xml"/> <!-- magic bootstrap -->
     <module href="http://svn.apache.org/repos/asf/avalon/trunk/central/system/gump/avalon-trunk.xml"/>
  +  <module href="project/merlin.xml"/> <!-- Merlin compatibility layer -->
   
     <!-- <module href="project/avalon-trunk.xml"/> -->
   
  
  
  

Mime
View raw message