Return-Path: 
 <avalon-cvs-return-5868-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 72118 invoked from network); 6 Apr 2002 12:21:52 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 6 Apr 2002 12:21:52 -0000
Received: (qmail 10206 invoked by uid 97); 6 Apr 2002 12:21:53 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 10190 invoked by uid 97); 6 Apr 2002 12:21:53 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 10179 invoked by uid 97); 6 Apr 2002 12:21:52 -0000
Date: 6 Apr 2002 12:21:50 -0000
Message-ID: <20020406122150.90915.qmail@icarus.apache.org>
From: jefft@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit: jakarta-avalon-excalibur/monitor default.properties
 build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       02/04/06 04:21:50

  Modified:    monitor  Tag: depchecking build.xml
  Added:       monitor  Tag: depchecking default.properties
  Log:
  Add depchecking
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +20 -57    jakarta-avalon-excalibur/monitor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- build.xml	5 Apr 2002 06:36:50 -0000	1.1
  +++ build.xml	6 Apr 2002 12:21:50 -0000	1.1.2.1
  @@ -1,61 +1,13 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur template" default="main" basedir=".">
  +<project name="Excalibur Monitor" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -75,8 +28,14 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +73,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -158,7 +117,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +262,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +58 -0     jakarta-avalon-excalibur/monitor/Attic/default.properties
  
  
  
  

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