Return-Path: 
 <cvs-return-14326-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 860 invoked by uid 500); 14 Feb 2003 06:16:55 -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 849 invoked by uid 500); 14 Feb 2003 06:16:55 -0000
Received: (qmail 846 invoked from network); 14 Feb 2003 06:16:55 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 14 Feb 2003 06:16:55 -0000
Received: (qmail 28853 invoked by uid 1438); 14 Feb 2003 06:16:54 -0000
Date: 14 Feb 2003 06:16:54 -0000
Message-ID: <20030214061654.28852.qmail@icarus.apache.org>
From: mcconnell@apache.org
To: avalon-sandbox-cvs@apache.org
Subject: cvs commit: avalon-sandbox/merlin build.xml default.properties
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mcconnell    2003/02/13 22:16:54

  Modified:    merlin   build.xml default.properties
  Log:
  Updated javadoc local link referernces and removed broken report tasks.
  
  Revision  Changes    Path
  1.21      +1 -1      avalon-sandbox/merlin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	13 Feb 2003 18:21:22 -0000	1.20
  +++ build.xml	14 Feb 2003 06:16:54 -0000	1.21
  @@ -433,7 +433,7 @@
             description="Generates the javadocs" unless="skip.javadocs">
       <mkdir dir="${build.javadocs}"/>
       <javadoc sourcepath="${java.dir}" packagenames="*,*.*"
  -       destdir="${build.javadocs}" overview="${java.dir}/package.html">
  +       destdir="${build.javadocs}">
        <classpath refid="project.class.path" />
         <group title="Kernel">
           <package name=""/>
  
  
  
  1.20      +6 -4      avalon-sandbox/merlin/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- default.properties	13 Feb 2003 18:21:22 -0000	1.19
  +++ default.properties	14 Feb 2003 06:16:54 -0000	1.20
  @@ -207,9 +207,11 @@
   checkstyle-cache = ${build.dir}/checkstyle.cache
   
   # javadoc links
  +doc.root = ../../../..
   j2se.api.link = http://java.sun.com/j2se/1.4/docs/api/
   j2ee.api.link = http://java.sun.com/j2ee/sdk_1.3/techdocs/api/
  -avalon.api.link = ../../avalon/api
  -assembly.api.link =../../assembly/api
  -lifecycle.api.link =../../lifecycle/api
  -meta.api.link =../../meta/api
  +avalon.api.link = ${doc.root}/../avalon/docs/api
  +assembly.api.link = ${doc.root}/assembly/build/docs/api
  +lifecycle.api.link = ${doc.root}/lifecycle/build/docs/api
  +meta.api.link = ${doc.root}/meta/build/docs/api
  +
  
  
  

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