avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosim...@apache.org
Subject cvs commit: jakarta-avalon-apps/xcommander build.xml default.properties
Date Tue, 16 Jul 2002 16:47:20 GMT
leosimons    2002/07/16 09:47:20

  Modified:    .        cocoonbuild.xml cocoon.properties
               xcommander build.xml default.properties
  Added:       .        build.xml default.properties
  Log:
  move functionality into a buildfile common to all of jakarta-avalon-apps. The setup is similar to maven: the xcommander buildfile calls targets in the main buildfile using module:{original-target-name}.
  
  Revision  Changes    Path
  1.3       +124 -139  jakarta-avalon-apps/cocoonbuild.xml
  
  Index: cocoonbuild.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/cocoonbuild.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- cocoonbuild.xml	15 Jul 2002 05:59:35 -0000	1.2
  +++ cocoonbuild.xml	16 Jul 2002 16:47:19 -0000	1.3
  @@ -1,145 +1,130 @@
  +<?xml version="1.0"?>
  +
   <!--	buildfile for generation of html documentation using cocoon.
   	We assume that this file is always called from a buildfile
   	located in a subdirectory of the current dir, so file
   	locations are prefixed with ../ in many places.			-->
   <project default="cocoon:html-docs">
  -
  -    <!-- Setup the filters -->
  -    <target name="cocoon:setup-filters">
  -    
  -    <property file="../cocoon.properties"/>
  -    
  -    <filter token="Name" value="Avalon ${Name}"/>
  -    <filter token="name" value="${dir-name}"/>
  -    <filter token="version" value="${version}"/>
  -    <filter token="year" value="${year}"/>
  -    <filter token="status" value="${status}"/>
  -    <filter token="release" value="${release}"/>
  -    <filter token="short-version" value="${short.version}"/>
  -      
  -    <!-- Skin filters -->
  -    <filter token="skin"              value="${use.skin}"/>
  -    <filter token="link1"             value="apache"/>
  -    <filter token="link1.href"        value="http://www.apache.org"/>
  -    <filter token="link2"             value="jakarta"/>
  -    <filter token="link2.href"        value="http://jakarta.apache.org"/>
  -    <filter token="link3"             value=""/>
  -    <filter token="link3.href"        value=""/>
  -    <filter token="group-logo.src"    value="images/jakarta-logo.gif"/>
  -    <filter token="group-logo.href"   value="http://jakarta.apache.org/"/>
  -    <filter token="project-logo.src"  value="images/header.gif"/>                    
  -    <filter token="project-logo.href" value="http://jakarta.apache.org/avalon/"/>                    
  -    <filter token="year" value="2002"/>  
  -    <filter token="vendor" value="Apache Software Foundation"/>        
  -
  -        <!-- Base pointers for non-xdocs documentation. Override these in .ant.properties to link to local docs -->
  -        <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -        <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  -        <property name="excalibur.base" value="http://jakarta.apache.org/avalon/excalibur"/>
  -        <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  -        <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  -        <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -        <property name="apps.base" value="http://jakarta.apache.org/avalon/apps"/>
  -        <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  -
  -        <filter token="year" value="${year}"/>
  -        <filter token="AVALON_BASE" value="${avalon.base}"/>
  -        <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -        <filter token="EXCALIBUR_BASE" value="${excalibur.base}"/>
  -        <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -        <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -        <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -        <filter token="TESTLET_BASE" value="${testlet.base}"/>
  -        <filter token="APPS_BASE" value="${apps.base}"/>
  -        
  -    </target>
  -    
  -    <target name="cocoon:setup-html-docs" depends="cocoon:setup-filters" description="generates the xdocs-based documentation">
  -
  -        <mkdir dir="${build.dir}"/>
  -        <mkdir dir="${cocoon.build.context}"/>
  -        <mkdir dir="${cocoon.build.docs}"/>
  -        <mkdir dir="${cocoon.build.xdocs}"/>
  -        <mkdir dir="${cocoon.work}"/>
  -        
  -
  -        <copy todir="${cocoon.build.context}" overwrite="true" filtering="on">
  -            <fileset dir="${cocoon.main.context.dir}">
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${cocoon.build.context}" filtering="off">
  -            <fileset dir="${cocoon.main.context.dir}">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${cocoon.build.xdocs}" filtering="on" overwrite="true">
  -            <fileset dir="${cocoon.xdocs.dir}"/>
  -        </copy>
  -
  -        <copy file="${cocoon.main.context.dir}/resources/schema/CatalogManager.properties" 
  -              todir="${cocoon.build.context}/resources/schema" filtering="off"/>
  -                
  -    </target>
  -  
  -    <target name="cocoon:html-listed-docs" depends="cocoon:setup-html-docs" description="generates the xdocs-based documentation">
  -
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Building docs from list, please stand by ..."/>
  -                
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${cocoon.build.context}/"/>
  -            <arg value="-d${cocoon.build.docs}"/>
  -            <arg value="-w${cocoon.work}"/>
  -            <arg value="-l${cocoon.work}/cocoon.log"/>
  -            <arg value="-b${build.dir}/brokenlinks.txt"/>
  -            <arg value="-uERROR"/>
  -            <arg value="-f./build/content/xdocs/doc.uris"/>
  -            <arg value="-rno"/>            
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -
  -
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>
  -    
  -    </target>
  -    
  -    <target name="cocoon:html-docs" depends="cocoon:setup-html-docs" description="generates the xdocs-based documentation">
  -
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Crawling docs, please stand by ..."/>
  -                
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${cocoon.build.context}/"/>
  -            <arg value="-d${cocoon.build.docs}"/>
  -            <arg value="-w${cocoon.work}"/>
  -            <arg value="-l${cocoon.work}/cocoon.log"/>
  -            <arg value="-b${build.dir}/brokenlinks.txt"/>            
  -            <arg value="-uERROR"/>
  -            <arg value="index.html"/>
  -            <classpath>
  -              <path id="tools.class.path">
  -                <pathelement location="${junit.jar}"/>
  -                <pathelement location="${tools.jar}"/>
  -                <fileset dir="${tools.dir}/lib"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -              </path>
  -            </classpath>
  -        </java>
  -
  -
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>
  -    
  -    </target>  
  -    
  +	<property file="./default.properties"/>
  +	<property file="../default.properties"/>
  +	<property file="../cocoon.properties"/>
  +
  +	<!-- Setup the filters -->
  +	<target name="cocoon:setup-filters">
  +		<filter token="Name" value="Avalon ${Name}"/>
  +		<filter token="name" value="${dir-name}"/>
  +		<filter token="version" value="${version}"/>
  +		<filter token="year" value="${year}"/>
  +		<filter token="status" value="${status}"/>
  +		<filter token="release" value="${release}"/>
  +		<filter token="short-version" value="${short.version}"/>
  +
  +		<!-- Skin filters -->
  +		<filter token="skin"              value="${use.skin}"/>
  +		<filter token="link1"             value="apache"/>
  +		<filter token="link1.href"        value="http://www.apache.org"/>
  +		<filter token="link2"             value="jakarta"/>
  +		<filter token="link2.href"        value="http://jakarta.apache.org"/>
  +		<filter token="link3"             value=""/>
  +		<filter token="link3.href"        value=""/>
  +		<filter token="group-logo.src"    value="images/jakarta-logo.gif"/>
  +		<filter token="group-logo.href"   value="http://jakarta.apache.org/"/>
  +		<filter token="project-logo.src"  value="images/header.gif"/>                    
  +		<filter token="project-logo.href" value="http://jakarta.apache.org/avalon/"/>                    
  +		<filter token="year" value="2002"/>  
  +		<filter token="vendor" value="Apache Software Foundation"/>        
  +
  +		<filter token="year" value="${year}"/>
  +		<filter token="AVALON_BASE" value="${avalon.base}"/>
  +		<filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  +		<filter token="EXCALIBUR_BASE" value="${excalibur.base}"/>
  +		<filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  +		<filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  +		<filter token="LOGKIT_BASE" value="${logkit.base}"/>
  +		<filter token="TESTLET_BASE" value="${testlet.base}"/>
  +		<filter token="APPS_BASE" value="${apps.base}"/>
  +	</target>
  +
  +	<target name="cocoon:setup-html-docs" depends="cocoon:setup-filters" description="generates the xdocs-based documentation">
  +		<mkdir dir="${build.dir}"/>
  +		<mkdir dir="${cocoon.build.context}"/>
  +		<mkdir dir="${cocoon.build.docs}"/>
  +		<mkdir dir="${cocoon.build.xdocs}"/>
  +		<mkdir dir="${cocoon.work}"/>
  +
  +		<copy todir="${cocoon.build.context}" overwrite="true" filtering="on">
  +			<fileset dir="${cocoon.main.context.dir}">
  +				<exclude name="**/*.gif"/>
  +				<exclude name="**/*.jpg"/>
  +				<exclude name="**/*.png"/>
  +			</fileset>
  +		</copy>
  +
  +		<copy todir="${cocoon.build.context}" filtering="off">
  +			<fileset dir="${cocoon.main.context.dir}">
  +				<include name="**/*.gif"/>
  +				<include name="**/*.jpg"/>
  +				<include name="**/*.png"/>
  +			</fileset>
  +		</copy>
  +
  +		<copy todir="${cocoon.build.xdocs}" filtering="on" overwrite="true">
  +			<fileset dir="${cocoon.xdocs.dir}"/>
  +		</copy>
  +
  +		<copy file="${cocoon.main.context.dir}/resources/schema/CatalogManager.properties" 
  +				todir="${cocoon.build.context}/resources/schema" filtering="off"/>
  +	</target>
  +
  +	<target name="cocoon:html-listed-docs" depends="cocoon:setup-html-docs" description="generates the xdocs-based documentation">
  +		<echo message="-------------------------------------------------------------"/>
  +		<echo message="  Building docs from list, please stand by ..."/>
  +		
  +		<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  +			<arg value="-c${cocoon.build.context}/"/>
  +			<arg value="-d${cocoon.build.docs}"/>
  +			<arg value="-w${cocoon.work}"/>
  +			<arg value="-l${cocoon.work}/cocoon.log"/>
  +			<arg value="-b${build.dir}/brokenlinks.txt"/>
  +			<arg value="-uERROR"/>
  +			<arg value="-f./build/content/xdocs/doc.uris"/>
  +			<arg value="-rno"/>            
  +
  +			<classpath>
  +				<path refid="tools.class.path"/>
  +				<fileset dir="${tools.dir}/ext"/>
  +			</classpath>
  +		</java>
  +		
  +		<echo message="  ...docs generated succesfully in ./build/docs dir."/>
  +		<echo message="-------------------------------------------------------------"/>
  +	</target>
  +	
  +	<target name="cocoon:html-docs" depends="cocoon:setup-html-docs" description="generates the xdocs-based documentation">
  +		<echo message="-------------------------------------------------------------"/>
  +		<echo message="  Crawling docs, please stand by ..."/>
  +
  +		<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  +			<arg value="-c${cocoon.build.context}/"/>
  +			<arg value="-d${cocoon.build.docs}"/>
  +			<arg value="-w${cocoon.work}"/>
  +			<arg value="-l${cocoon.work}/cocoon.log"/>
  +			<arg value="-b${build.dir}/brokenlinks.txt"/>            
  +			<arg value="-uERROR"/>
  +			<arg value="index.html"/>
  +
  +			<classpath>
  +				<path id="tools.class.path">
  +					<pathelement location="${junit.jar}"/>
  +					<pathelement location="${tools.jar}"/>
  +					<fileset dir="${tools.dir}/lib"/>
  +					<fileset dir="${tools.dir}/ext"/>
  +				</path>
  +			</classpath>
  +		</java>
  +
  +		<echo message="  ...docs generated succesfully in ./build/docs dir."/>
  +		<echo message="-------------------------------------------------------------"/>
  +	</target>  
  +	
   </project>
  
  
  
  1.2       +4 -6      jakarta-avalon-apps/cocoon.properties
  
  Index: cocoon.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/cocoon.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cocoon.properties	14 Jul 2002 16:43:30 -0000	1.1
  +++ cocoon.properties	16 Jul 2002 16:47:19 -0000	1.2
  @@ -1,9 +1,7 @@
  -# --------------------------------------------------
  -#           DOC GENERATION CONFIGURATION
  -# --------------------------------------------------
  -# locations of required materials for documentation generation with Cocoon.
  -#
  -# it implies that jakarta-avalon module is in the same dir
  +# ============================================================================
  +# Standard Build Properties for documentation generation using cocoon
  +# ============================================================================
  +# We imply that jakarta-avalon module is in the same dir
   # as the apps module. We assume we are called from a subdirectory of
   # the current directory, and that the build.dir and src.dir properties
   # are set
  
  
  
  1.1                  jakarta-avalon-apps/build.xml
  
  Index: build.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!--	Common buildfile for all jakarta-avalon-apps applications.
  	We assume that this file is always called from a buildfile located in
  	a subdirectory of the current dir, so file locations are prefixed with
  	../ in many places. It has a setup very similar to maven, with
  	'module:' prefixing the	targets called from application buildfiles.
  	Targets not prefixed by 'module:' build all the available applications -->
  <project default="main">
  
  <!-- ==========================================================================================
  	MODULE SETUP
       ========================================================================================== -->
  
       	<target name="module:setup">
  		<!-- set up properties -->
  		<property file="${user.home}/build.properties"/>
  		<property file="${user.home}/.ant.properties"/>
  		<property file="${basedir}/ant.properties"/>
  		<property file="${basedir}/../ant.properties"/>
  		<property file="${basedir}/default.properties"/>
  		<property file="${basedir}/../default.properties"/>
  		<property file="${basedir}/../cocoon.properties"/>
  
  		<!-- set up classpath --> 
  		<path id="project.class.path">
  			<pathelement path="${java.class.path}" />
  			<pathelement path="${build.classes}" />
  			<fileset dir="${common.lib}">
  				<include name="*.jar" />
  			</fileset>
  			<fileset dir="${lib.dir}">
  				<include name="*.jar" />
  			</fileset>
  		</path>
  	
  		<path id="tools.class.path">
  			<path refid="project.class.path"/>
  			<fileset dir="${tools.lib}">
  				<include name="*.jar" />
  				<exclude name="ant.jar" />
  			</fileset>
  		</path>
  
  		<!-- set up custom tasks --> 
  		<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  			<classpath refid="project.class.path" />
  		</taskdef>
  	
  		<taskdef name="phoenix-blocks"
  				classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
  				classpathref="project.class.path"/>
  	</target>
  
       	<target name="cocoon:setup" depends="module:setup">
  		<!-- set up properties -->
  		<property file="${basedir}/../cocoon.properties"/>
  	</target>
  <!-- ==========================================================================================
  	NON-MODULE TARGETS
       ========================================================================================== -->
  
       <target name="main" description="Call the main target of every application.">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="ERROR: Sorry, this hasn't been implemented yet." />
  		<echo message="-------------------------------------------------------------" />
  
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Creating all build products." />
  		<echo message="-------------------------------------------------------------" />
  
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Creating build products for XCommander" />
  		<echo message="-------------------------------------------------------------" />
       </target>
  
  <!-- ==========================================================================================
  	DEFAULT TARGETS
       ========================================================================================== -->
  
  	<target name="module:main" depends="module:sar,module:setup"/>
  	<target name="module:all" depends="module:main,module:docs,module:setup"/>
  
  <!-- ==========================================================================================
  	SETUP TARGETS
       ========================================================================================== -->
  
  	<target name="test-xdoclet" depends="module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: XDoclet is available" />
  		<echo message="-------------------------------------------------------------" />
  		<available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>
  	</target>
  
  <!-- ==========================================================================================
  	COMPILE TARGETS
       ========================================================================================== -->
  
  	<!-- Compiles module -->
  	<target name="module:compile" depends="module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Compiling ${Name} java classes" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${build.classes}"/>
  		
  		<javac srcdir="${java.dir}"
  				destdir="${build.classes}"
  				debug="${build.debug}"
  				optimize="${build.optimize}"
  				deprecation="${build.deprecation}">
  			<classpath refid="project.class.path" />
  		</javac>
  		
  		<copy todir="${build.classes}">
  			<fileset dir="${java.dir}">
  				<exclude name="**/test/**"/>
  				<exclude name="**/*.java"/>
  			</fileset>
  		</copy>
  	</target>
  
  	<!-- Make .xinfo and manifest automatically for blocks -->
  	<target name="module:phoenix-xdoclet" depends="module:compile,module:setup" if="xdoclet.present">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Compiling ${Name} xinfo files" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${build.xdoclet}"/>
  		
  		<phoenix-blocks
  				destdir="${build.xdoclet}"
  				classpathref="project.class.path">
  			<fileset dir="${java.dir}">
  				<include name="**/*.java" />
  			</fileset>
  
  			<blockinfo/>
  			<manifest manifestFile="manifest.mf" />
  		</phoenix-blocks>
  	</target>
  
  	<!-- Make .xinfo and manifest automatically for blocks -->
  	<target name="module:no-phoenix-xdoclet" depends="module:compile,module:setup" unless="xdoclet.present">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Getting ${Name} xinfo files" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${build.xdoclet}"/>
  		<unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
  	</target>
  
  	<!-- Performs unit tests -->
  	<target name="module:test" depends="module:compile,module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Running unit tests for ${Name}" />
  		<echo message="-------------------------------------------------------------" />
  		<echo message="We haven't implemented this yet. Sorry!" />
  	</target>
  
  <!-- ==========================================================================================
  	DISTRIBUTION TARGETS
       ========================================================================================== -->
  
  	<!-- Jars up project -->
  	<target name="module:jar" depends="test-xdoclet, module:phoenix-xdoclet, module:no-phoenix-xdoclet,module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Creating jar file for ${Name}" />
  		<echo message="   generated file: ${build.lib}/${name}.jar" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${build.lib}"/>
  		
  		<jar jarfile="${build.lib}/${name}.jar"
  				 manifest="${build.xdoclet}/manifest.mf">
  
  			<fileset dir="${build.classes}">
  				<include name="org/apache/**"/>
  			</fileset>
  			<fileset dir="${build.xdoclet}">
  				<include name="**/*.xinfo"/>
  			</fileset>
  		</jar>
  	</target>
  
  	<!-- Sars up project -->
  	<target name="module:sar" depends="module:jar,module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Creating sar file for ${Name}" />
  		<echo message="   generated file: ${build.lib}/${name}.sar" />
  		<echo message="-------------------------------------------------------------" />
  		<sar sarfile="${build.lib}/${name}.sar"
  				config="${conf.dir}/${name}-config.xml"
  				environment="${conf.dir}/${name}-environment.xml"
  				assembly="${conf.dir}/${name}-assembly.xml" >
  		
  			<lib dir="${build.lib}/">
  				<include name="*.jar"/>
  			</lib>
  		
  			<lib dir="${common.lib}">
  				<include name="${cornerstone.jar}"/>
  			</lib>
  		</sar>
  		
  		<mkdir dir="${dist.dir}"/>
  		
  		<copy todir="${dist.dir}">
  			<fileset dir="${build.lib}">
  				<include name="**"/>
  			</fileset>
  		</copy>
  	</target>
  
  	<!-- Completely build all dists -->
  	<target name="module:dist" depends="module:sar,module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Creating distributions for ${Name}" />
  		<echo message="   putting files in: ${dist.base}" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${dist.base}"/>
  		
  		<antcall target="module:bin-dist" inheritAll="false">
  			<param name="bin.dist.dir" value="${dist.name}" />
  		</antcall>
  		
  		<zip zipfile="${dist.base}/${dist.name}-bin.zip"
  				basedir="${dist.name}/.."
  				includes="${dist.name}/**"/>
  		
  		<tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  			<tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  				<include name="${dist.name}/**"/>
  			</tarfileset>
  		</tar>
  		
  		<gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  				src="${dist.base}/${dist.name}-bin.tar"/>
  		
  		<delete file="${dist.base}/${dist.name}-bin.tar"/>
  		<delete dir="${dist.name}" />
  		
  		<antcall target="module:src-dist" inheritAll="false">
  			<param name="src.dist.dir" value="${dist.name}" />
  		</antcall>
  		
  		<zip zipfile="${dist.base}/${dist.name}-src.zip"
  				basedir="${dist.name}/.."
  				includes="${dist.name}/**">
  			<fileset dir="${common.lib}">
  				<include name="avalon-*"/>
  				<include name="cornerstone.jar"/>
  				<include name="phoenix-*"/>
  			</fileset>
  		</zip>
  		
  		<tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
  			<tarfileset dir="${dist.name}/.." mode="755" username="avalon" group="avalon">
  				<include name="${dist.name}/build.sh"/>
  			</tarfileset>
  			<tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  				<include name="${dist.name}/**"/>
  				<exclude name="${dist.name}/build.sh"/>
  			</tarfileset>
  			<tarfileset dir="${common.lib}" username="avalon" group="avalon">
  				<include name="avalon-*"/>
  				<include name="cornerstone.jar"/>
  				<include name="phoenix-*"/>
  			</tarfileset>      
  		</tar>
  		
  		<gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
  				src="${dist.base}/${dist.name}-src.tar"/>
  
  		<delete file="${dist.base}/${dist.name}-src.tar"/>
  		<delete dir="${dist.name}" />
  	</target>
  
  	<!-- Creates all the .sar files -->  
  	<target name="module:bin-dist" depends="module:all,module:setup">
  		
  		<!-- bin.dist.dir usually set before this target is called -->
  		<property name="bin.dist.dir" value="dist"/>
  		<property name="bin.dist.lib" value="${bin.dist.dir}/lib"/>
  		<property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
  		
  		<mkdir dir="${bin.dist.docs}"/>
  		<copy todir="${bin.dist.docs}">
  			<fileset dir="${build.docs}"/>   
  		</copy>
  		
  		<copy file="${build.lib}/${name}.sar" tofile="${bin.dist.dir}/${dist.name}.sar"/>
  		
  		<chmod dir="${bin.dist.dir}" perm="go-rwx" />
  	</target>
  
  	<target name="module:src-dist" depends="module:docs,module:setup">
  		<!-- src.dist.dir has usually already been set -->
  		<property name="src.dist.dir" value="dist-src"/>
  		<property name="src.dist.src" value="${src.dist.dir}/src"/>
  		<property name="src.dist.docs" value="${src.dist.dir}/docs"/>
  		
  		<mkdir dir="${src.dist.docs}"/>
  		
  		<copy todir="${src.dist.docs}">
  			<fileset dir="${build.docs}"/>   
  		</copy>
  		
  		<copy todir="${src.dist.src}">
  			<fileset dir="${src.dir}"/>
  		</copy>
  		
  		<zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
  				basedir="${build.xdoclet}"/>
  		
  		<copy todir="${src.dist.dir}">
  			<fileset dir=".">
  				<include name="build.xml"/>
  			</fileset>
  		</copy>
  		
  		<mkdir dir="${src.dist.dir}/lib"/>
  
  		<copy todir="${src.dist.dir}/lib">
  			<fileset dir="lib">
  				<include name="**"/>
  			</fileset>
  		</copy>
  		
  		<fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
  		
  		<chmod dir="${src.dist.dir}" perm="go-rwx" />
  	</target>
  
  	<target name="module:install" depends="module:main,module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Installing ${Name} into phoenix" />
  		<echo message="   install dir: ${install.dir}" />
  		<echo message="-------------------------------------------------------------" />
  		<delete dir="${install.dir}/${name}" />
  		<copy file="${build.lib}/${name}.sar" todir="${install.dir}" />
  	</target>
  
  	<target name="module:uninstall" description="Uninstalls from Phoenix" depends="module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Removing ${Name} from phoenix" />
  		<echo message="   install dir: ${install.dir}" />
  		<echo message="-------------------------------------------------------------" />
  		<delete dir="${install.dir}/${name}/" />
  		<delete file="${name}.sar" dir="${install.dir}"/>
  	</target>
  
  	<target name="module:clean" depends="module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Cleaning up products of the ${Name} build process" />
  		<echo message="-------------------------------------------------------------" />
  		<delete dir="${build.dir}" />
  		<delete>
  			<fileset dir="." includes="**/*~" defaultexcludes="no"/>
  		</delete>
  	</target>
  	
  	<target name="module:real-clean" depends="module:clean">
  		<delete dir="${bin.dist.dir}" />
  		<delete dir="${dist.base}" />
  	</target>
  
  <!-- ==========================================================================================
  	DOCUMENTATION GENERATION
  ========================================================================================== -->
  
  	<!-- Creates all docs -->
  	<target name="module:docs" depends="module:html-docs, module:javadocs,module:setup"/>
  
  	<!-- copy docs to site dir -->
  	<target name="module:site" depends="module:docs">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Copying the documentation for ${Name} to the site" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${site.dir}/${dir-name}"/>
  		<copy todir="${site.dir}/${dir-name}">
  		<fileset dir="${build.docs}">
  			<include name="**"/>
  		</fileset>
  		</copy>
  	</target>
  
  	<!-- Creates javadocs -->
  	<target name="module:javadocs" depends="module:compile,module:setup" unless="skip.javadocs">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Creating javadocs for ${Name}" />
  		<echo message="-------------------------------------------------------------" />
  		<mkdir dir="${build.javadocs}"/>
  		<javadoc packagenames="org.apache.*"
  		sourcepath="${java.dir}"
  		destdir="${build.javadocs}">
  		<classpath refid="project.class.path" />
  		<doclet name="com.sun.tools.doclets.standard.Standard">
  			<param name="-author"/>
  			<param name="-version"/>
  			<param name="-doctitle" value="${Name}"/>
  			<param name="-windowtitle" value="${Name} API"/>
  			<param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
  			<param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
  			<param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
  			<param name="-bottom"
  			value="&quot;Copyright &#169; ${year} Apache Jakarta Project. All Rights Reserved.&quot;"/>
  		</doclet>
  		</javadoc>
  	</target>
  
  	<target name="module:html-docs" depends="module:setup">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="INFO: Cleaning HTML documentation for ${Name}" />
  		<echo message="-------------------------------------------------------------" />
  		<antcall target="${documentation.tool}:html-docs" />
  	</target>
  	
  <!-- ==========================================================================================
  	DOCUMENTATION GENERATION USING COCOON
       ========================================================================================== -->
  
  	<!-- Setup the filters -->
  	<target name="cocoon:setup-filters" depends="cocoon:setup,cocoon:setup">
  		<filter token="Name" value="Avalon ${Name}"/>
  		<filter token="name" value="${dir-name}"/>
  		<filter token="version" value="${version}"/>
  		<filter token="year" value="${year}"/>
  		<filter token="status" value="${status}"/>
  		<filter token="release" value="${release}"/>
  		<filter token="short-version" value="${short.version}"/>
  
  		<!-- Skin filters -->
  		<filter token="skin"              value="${use.skin}"/>
  		<filter token="link1"             value="apache"/>
  		<filter token="link1.href"        value="http://www.apache.org"/>
  		<filter token="link2"             value="jakarta"/>
  		<filter token="link2.href"        value="http://jakarta.apache.org"/>
  		<filter token="link3"             value=""/>
  		<filter token="link3.href"        value=""/>
  		<filter token="group-logo.src"    value="images/jakarta-logo.gif"/>
  		<filter token="group-logo.href"   value="http://jakarta.apache.org/"/>
  		<filter token="project-logo.src"  value="images/header.gif"/>                    
  		<filter token="project-logo.href" value="http://jakarta.apache.org/avalon/"/>                    
  		<filter token="year" value="2002"/>  
  		<filter token="vendor" value="Apache Software Foundation"/>        
  
  		<filter token="year" value="${year}"/>
  		<filter token="AVALON_BASE" value="${avalon.base}"/>
  		<filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  		<filter token="EXCALIBUR_BASE" value="${excalibur.base}"/>
  		<filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  		<filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  		<filter token="LOGKIT_BASE" value="${logkit.base}"/>
  		<filter token="TESTLET_BASE" value="${testlet.base}"/>
  		<filter token="APPS_BASE" value="${apps.base}"/>
  	</target>
  
  	<target name="cocoon:setup-html-docs" depends="cocoon:setup-filters,cocoon:setup" description="generates the xdocs-based documentation">
  		<mkdir dir="${build.dir}"/>
  		<mkdir dir="${cocoon.build.context}"/>
  		<mkdir dir="${cocoon.build.docs}"/>
  		<mkdir dir="${cocoon.build.xdocs}"/>
  		<mkdir dir="${cocoon.work}"/>
  
  		<copy todir="${cocoon.build.context}" overwrite="true" filtering="on">
  			<fileset dir="${cocoon.main.context.dir}">
  				<exclude name="**/*.gif"/>
  				<exclude name="**/*.jpg"/>
  				<exclude name="**/*.png"/>
  			</fileset>
  		</copy>
  
  		<copy todir="${cocoon.build.context}" filtering="off">
  			<fileset dir="${cocoon.main.context.dir}">
  				<include name="**/*.gif"/>
  				<include name="**/*.jpg"/>
  				<include name="**/*.png"/>
  			</fileset>
  		</copy>
  
  		<copy todir="${cocoon.build.xdocs}" filtering="on" overwrite="true">
  			<fileset dir="${cocoon.xdocs.dir}"/>
  		</copy>
  
  		<copy file="${cocoon.main.context.dir}/resources/schema/CatalogManager.properties" 
  				todir="${cocoon.build.context}/resources/schema" filtering="off"/>
  	</target>
  
  	<target name="cocoon:html-listed-docs" depends="cocoon:setup-html-docs,cocoon:setup" description="generates the xdocs-based documentation">
  		<echo message="-------------------------------------------------------------"/>
  		<echo message="  Building docs from list, please stand by ..."/>
  		
  		<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  			<arg value="-c${cocoon.build.context}/"/>
  			<arg value="-d${cocoon.build.docs}"/>
  			<arg value="-w${cocoon.work}"/>
  			<arg value="-l${cocoon.work}/cocoon.log"/>
  			<arg value="-b${build.dir}/brokenlinks.txt"/>
  			<arg value="-uERROR"/>
  			<arg value="-f./build/content/xdocs/doc.uris"/>
  			<arg value="-rno"/>            
  
  			<classpath>
  				<path refid="tools.class.path"/>
  				<fileset dir="${tools.dir}/ext"/>
  			</classpath>
  		</java>
  		
  		<echo message="  ...docs generated succesfully in ./build/docs dir."/>
  		<echo message="-------------------------------------------------------------"/>
  	</target>
  	
  	<target name="cocoon:html-docs" depends="cocoon:setup-html-docs,cocoon:setup" description="generates the xdocs-based documentation">
  		<echo message="-------------------------------------------------------------"/>
  		<echo message="  Crawling docs, please stand by ..."/>
  
  		<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  			<arg value="-c${cocoon.build.context}/"/>
  			<arg value="-d${cocoon.build.docs}"/>
  			<arg value="-w${cocoon.work}"/>
  			<arg value="-l${cocoon.work}/cocoon.log"/>
  			<arg value="-b${build.dir}/brokenlinks.txt"/>            
  			<arg value="-uERROR"/>
  			<arg value="index.html"/>
  
  			<classpath>
  				<path id="tools.class.path">
  					<pathelement location="${junit.jar}"/>
  					<pathelement location="${tools.jar}"/>
  					<fileset dir="${tools.dir}/lib"/>
  					<fileset dir="${tools.dir}/ext"/>
  				</path>
  			</classpath>
  		</java>
  
  		<echo message="  ...docs generated succesfully in ./build/docs dir."/>
  		<echo message="-------------------------------------------------------------"/>
  	</target>  
  	
  </project>
  
  
  
  1.1                  jakarta-avalon-apps/default.properties
  
  Index: default.properties
  ===================================================================
  # ============================================================================
  # Standard Build Properties for applications in jakarta-avalon-apps
  # ============================================================================
  # Specifies the default values for properties commonly required in ant build
  # scripts
  # Normally parts are overridden by ./{projectname}/default.properties and/or
  # ant.properties files. This file is not ment for editing by the average user;
  # use ant.properties files instead
  #
  # We imply that the jakarta-avalon module is in the same dir
  # as the apps module. We assume we are called from a subdirectory of
  # the current directory, and that the basedir has been properly set.
  
  # ----------------------------------------------------------------------------
  #           DOC GENERATION CONFIGURATION
  # ----------------------------------------------------------------------------
  # this should be overridden for each application
  
  name				= avalon-app
  Name				= Avalon Application
  dir-name			= avalon-app
  version				= 0.7
  package-version			= 1.0
  year				= 2000-2002
  
  # ----------------------------------------------------------------------------
  #             COMPILATION ENVIRONMENT
  # ----------------------------------------------------------------------------
  #  Settings used to configure compile environment
  
  build.debug			= on
  build.optimize			= off
  build.deprecation		= on
  build.compress			= false
  junit.failonerror		= false
  
  # ----------------------------------------------------------------------------
  #             DIRECTORY LOCATIONS
  # ----------------------------------------------------------------------------
  
  # ----- other cvs modules -----
  avalon-framework.dir		= ${basedir}/../../jakarta-avalon
  avalon-excalibur.dir		= ${basedir}/../../jakarta-avalon-excalibur
  avalon-phoenix.dir		= ${basedir}/../../jakarta-avalon-phoenix
  avalon-cornerstone.dir		= ${basedir}/../../jakarta-avalon-cornerstone
  avalon-logkit.dir		= ${basedir}/../../jakarta-avalon-logkit
  
  # ----- build destinations -----
  build.dir			= ${basedir}/build
  build.classes			= ${build.dir}/classes
  build.lib			= ${build.dir}/lib
  build.conf			= ${build.dir}/conf
  build.xdoclet			= ${build.dir}/xdoclet
  build.testsrc			= ${build.dir}/testsrc
  build.testclasses		= ${build.dir}/testclasses
  build.xdocs			= ${build.context}/content/xdocs
  build.docs			= ${build.dir}/docs
  build.javadocs			= ${build.docs}/api
  build.tests			= ${build.dir}/tests
  build.reports			= ${build.dir}/reports
  # intermediate location for documentation generation
  build.context			= ${build.dir}/documentation
  
  # ----- build sources -----
  src.dir				= ${basedir}/src
  java.dir			= ${src.dir}/java
  conf.dir			= ${src.dir}/conf
  test.dir			= ${src.dir}/test
  manifest.dir			= ${src.dir}/manifest
  xdocs.dir			= ${src.dir}/xdocs
  lib.dir				= ${basedir}/lib
  
  # ----- build distributions -----
  dist.dir			= ${basedir}/dist
  dist.javadocs			= ${dist.dir}/docs/api
  site.dir			= ${basedir}/../site/build/docs/apps/
  # directory for distribution archives
  dist.base = ${basedir}/distributions
  
  # ----- common libraries -----
  common.lib			= ${basedir}/../common/lib
  common.tools			= ${basedir}/../tools
  common.util			= ${basedir}/../util
  
  # ----- external -----
  tools.dir			= ${avalon-framework.dir}/tools
  tools.lib			= ${tools.dir}/lib
  # location of documentation generation required material
  context.dir			= ${avalon-framework.dir}/src/documentation
  
  # ----------------------------------------------------------------------------
  #                LIBRARY LOCATIONS
  # ----------------------------------------------------------------------------
  
  # ----- Avalon Framework -----
  avalon-framework.home		= ${avalon-framework.dir}
  avalon-framework.lib		= ${avalon-framework.home}/build/lib
  avalon-framework.jar		= ${avalon-framework.lib}/avalon-framework.jar
  
  # ----- XML Libraries -----
  xml-apis.jar			= ${tools.lib}/xml-apis.jar
  xerces.jar			= ${tools.lib}/xerces-2.0.1.jar
  xalan.jar			= ${tools.lib}/xalan-2.3.1.jar
  
  # ----- Other libraries -----
  junit.jar			= ${tools.lib}/junit-3.7.jar
  tools.jar			= ${java.home}/../lib/tools.jar
  cornerstone.jar			= ${common.lib}/cornerstone.jar
  
  # ----------------------------------------------------------------------------
  #         REMOTE DOCUMENTATION LOCATIONS
  # ----------------------------------------------------------------------------
  # Base pointers for non-xdocs documentation. Override these in .ant.properties
  # to link to local docs
  
  avalon.base			= http://jakarta.apache.org/avalon
  framework.base			= http://jakarta.apache.org/avalon/framework
  excalibur.base			= http://jakarta.apache.org/avalon/excalibur
  phoenix.base			= http://jakarta.apache.org/avalon/phoenix
  cornerstone.base		= http://jakarta.apache.org/avalon/cornerstone
  logkit.base			= http://jakarta.apache.org/avalon/logkit
  apps.base			= http://jakarta.apache.org/avalon/apps
  testlet.base			= http://jakarta.apache.org/avalon/testlet
  
  # ----------------------------------------------------------------------------
  #                OTHER PROPERTIES
  # ----------------------------------------------------------------------------
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name			= ${name}-${version}
  
  #  name of jar file
  jar.name			= ${name}-${version}.jar
  
  # which method of documetation generation to use
  documentation.tool		= cocoon
  
  
  
  
  1.15      +92 -334   jakarta-avalon-apps/xcommander/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/xcommander/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	14 Jul 2002 16:43:31 -0000	1.14
  +++ build.xml	16 Jul 2002 16:47:19 -0000	1.15
  @@ -1,381 +1,139 @@
   <?xml version="1.0"?>
   
  -<project name="XCommander" default="main" basedir=".">
  +<!--
  +==============================================================================
  + Avalon Applications XCommander build file
   
  -<!-- ==========================================================================================
  -	PROPERTY SETUP
  -     ========================================================================================== -->
   
  -	<!-- give user chance to override properties -->
  -	<property file="${user.home}/build.properties"/>
  -	<property file="${basedir}/../ant.properties"/>
  -	<property file="${basedir}/ant.properties"/>
  -	<property file="${user.home}/.ant.properties"/>
  -	<property file="${basedir}/../default.properties"/>
  -	<property file="${basedir}/default.properties"/>
  -
  -	<!-- Set the installation variables for Cornerstone/Phoenix -->
  -	<property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  -	<property name="install.dir" value="${phoenix.home}/apps"/>
  -
  -	<!-- Set the properties for intermediate directory -->
  -	<property name="build.dir" value="build"/>
  -	<property name="build.lib" value="${build.dir}/lib"/>
  -	<property name="build.xdoclet" value="${build.dir}/xdoclet"/>
  -	<property name="build.src" value="${build.dir}/src"/>
  -	<property name="build.classes" value="${build.dir}/classes"/>
  -	<property name="build.javadocs" value="${build.dir}/javadocs"/>
  -	<property name="build.docs" value="${build.dir}/docs"/>
  -	<property name="build.context" value="${build.dir}/documentation"/>
  -	<property name="build.xdocs" value="${build.context}/content/xdocs"/>
  -
  -	<!-- Set the properties for source directories -->
  -	<property name="src.dir" value="src"/>
  -	<property name="java.dir" value="${src.dir}/java"/>
  -	<property name="manifest.dir" value="${src.dir}/manifest"/>
  -	<property name="conf.dir" value="${src.dir}/conf"/>
  -	<property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -	<property name="xdocs.dir" value="${src.dir}/xdocs"/>
  -	<property name="tools.dir" location="../../jakarta-avalon/tools"/>
  +Type 'ant' to build. The flag '-projecthelp' will list normal targets. If
  +combined with '-verbose', all targets are printed.
   
  -	<property name="dist.base" value="distributions"/>
  +This buildfile delegates 
   
  +Authors:
  +	Leo Simons <lsimons@multimia.com>
   
  -<!-- ==========================================================================================
  -	CLASSPATH SETUP
  -     ========================================================================================== -->
  -
  -	<path id="project.class.path">
  -		<pathelement path="${java.class.path}" />
  -		<pathelement path="${build.classes}" />
  -		<fileset dir="../common/lib">
  -			<include name="*.jar" />
  -		</fileset>
  -		<fileset dir="lib">
  -			<include name="*.jar" />
  -		</fileset>
  -	</path>
  -
  -	<path id="tools.class.path">
  -		<path refid="project.class.path"/>
  -		<pathelement location="${xerces.jar}"/>
  -		<pathelement location="${xalan.jar}"/>
  -		<pathelement location="${tools.jar}"/>
  -		<fileset dir="${tools.dir}/lib">
  -			<exclude name="ant.jar" />
  -		</fileset>
  -	</path>
  -
  -	<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  -		<classpath refid="project.class.path" />
  -	</taskdef>
  +Legal:
  +	Copyright (c) 2002 The Apache Software Foundation. All Rights Reserved.
  +==============================================================================
  +-->
  +<project name="XCommander" default="main" basedir=".">
   
   <!-- ==========================================================================================
   	DEFAULT TARGETS
        ========================================================================================== -->
   
  -  <target name="main" depends="sars" description="Default target to generate build products minus docs"/>
  -  <target name="all" depends="main,docs" description="Generate build products including docs"/>
  +	<target name="main" depends="sar" description="Default target to generate build products minus docs"/>
  +	<target name="all" depends="main,docs" description="Generate build products including docs"/>
  +	<target name="docs" depends="html-docs,javadocs" description="generates all the Avalon documentation"/>
   
   <!-- ==========================================================================================
   	COMPILE TARGETS
        ========================================================================================== -->
   
  -  <!-- Compiles project -->
  -  <target name="compile">
  -
  -    <mkdir dir="${build.classes}"/>
  -
  -    <javac srcdir="${java.dir}"
  -           destdir="${build.classes}"
  -           debug="${build.debug}"
  -           optimize="${build.optimize}"
  -           deprecation="${build.deprecation}">
  -      <classpath refid="project.class.path" />
  -
  -    </javac>
  -
  -    <copy todir="${build.classes}">
  -      <fileset dir="${java.dir}">
  -        <exclude name="**/test/**"/>
  -        <exclude name="**/*.java"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
  -  <target name="test-xdoclet">
  -    <available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>
  -  </target>
  -
  -  <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-xdoclet" depends="compile" if="xdoclet.present">
  +	<target name="compile">
  +		<ant antfile="${basedir}/../build.xml" target="module:compiler"/>
  +	</target>
   
  -    <mkdir dir="${build.xdoclet}"/>
  +	<target name="phoenix-xdoclet">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="WARNING: Deprecated. You should not call this target directly" />
  +		<echo message="-------------------------------------------------------------" />
  +		<ant antfile="${basedir}/../build.xml" target="module:phoenix-xdoclet"/>
  +	</target>
   
  -    <taskdef name="phoenix-blocks"
  -             classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
  -             classpathref="project.class.path"/>
  +	<target name="no-phoenix-xdoclet">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="WARNING: Deprecated. You should not call this target directly" />
  +		<echo message="-------------------------------------------------------------" />
  +		<ant antfile="${basedir}/../build.xml" target="module:no-phoenix-xdoclet"/>
  +	</target>
   
  -    <phoenix-blocks
  -        destdir="${build.xdoclet}"
  -        classpathref="project.class.path">
  -      <fileset dir="${java.dir}">
  -        <include name="**/*.java" />
  -      </fileset>
  -      <blockinfo/>
  -      <manifest manifestFile="manifest.mf" />
  -    </phoenix-blocks>
  +	<target name="check">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="WARNING: Deprecated. Use the test target instead" />
  +		<echo message="-------------------------------------------------------------" />
  +		<ant antfile="${basedir}/../build.xml" target="module:test"/>
  +	</target>
  +	
  +	<target name="test" description="Run unit tests to verify the application works corretly.">
  +		<ant antfile="${basedir}/../build.xml" target="module:test"/>
  +	</target>
   
  -  </target>
   
  -  <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="no-phoenix-xdoclet" depends="compile" unless="xdoclet.present">
  +<!-- ==========================================================================================
  +	DISTRIBUTION TARGETS
  +     ========================================================================================== -->
   
  -    <mkdir dir="${build.xdoclet}"/>
  +	<target name="jars">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="WARNING: Deprecated. Use the jar target instead" />
  +		<echo message="-------------------------------------------------------------" />
  +		<ant antfile="${basedir}/../build.xml" target="module:jar"/>
  +	</target>
  +	<target name="jar">
  +		<ant antfile="${basedir}/../build.xml" target="module:jar"/>
  +	</target>
   
  -    <unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
  +	<target name="sars">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="WARNING: Deprecated. Use the jar target instead" />
  +		<echo message="-------------------------------------------------------------" />
  +		<ant antfile="${basedir}/../build.xml" target="module:sar"/>
  +	</target>
  +	<target name="sar">
  +		<ant antfile="${basedir}/../build.xml" target="module:sar"/>
  +	</target>
   
  -  </target>
  +	<target name="dist">
  +		<ant antfile="${basedir}/../build.xml" target="module:dist"/>
  +	</target>
   
  -  <!-- Performs unit tests -->
  -  <target name="check" depends="compile" description="Perform any built in tests">
  -  </target>
  +	<target name="bin-dist">
  +		<ant antfile="${basedir}/../build.xml" target="module:bin-dist"/>
  +	</target>
   
  +	<target name="src-dist">
  +		<ant antfile="${basedir}/../build.xml" target="module:src-dist"/>
  +	</target>
   
  -<!-- ==========================================================================================
  -	DISTRIBUTION TARGETS
  -     ========================================================================================== -->
  +	<target name="install" description="Installs into Phoenix">
  +		<ant antfile="${basedir}/../build.xml" target="module:install"/>
  +	</target>
   
  -  <!-- Jars up project -->
  -  <target name="jars" depends="test-xdoclet, phoenix-xdoclet, no-phoenix-xdoclet">
  +	<target name="uninstall" description="Uninstalls from Phoenix">
  +		<ant antfile="${basedir}/../build.xml" target="module:uninstall"/>
  +	</target>
   
  -    <mkdir dir="${build.lib}"/>
  +	<target name="clean" description="Cleans up artifacts from build process">
  +		<ant antfile="${basedir}/../build.xml" target="module:clean"/>
  +	</target>
   
  -    <jar jarfile="${build.lib}/${name}.jar"
  -         manifest="${build.xdoclet}/manifest.mf">
  -      <fileset dir="${build.classes}">
  -        <include name="org/apache/avalon/xcommander/**"/>
  -      </fileset>
  -      <fileset dir="${build.xdoclet}">
  -        <include name="**/*.xinfo"/>
  -      </fileset>
  -    </jar>
  -
  -  </target>
  -
  -  <target name="sars" depends="jars">
  -
  -    <sar sarfile="${build.lib}/xcommander.sar"
  -         config="${conf.dir}/xcommander-config.xml"
  -         environment="${conf.dir}/xcommander-environment.xml"
  -         assembly="${conf.dir}/xcommander-assembly.xml" >
  -
  -      <lib dir="${build.lib}/">
  -        <include name="*.jar"/>
  -      </lib>
  -
  -      <lib dir="../common/lib">
  -        <include name="cornerstone.jar"/>
  -      </lib>
  -
  -    </sar>
  -
  -    <mkdir dir="dist"/>
  -
  -    <copy todir="dist">
  -      <fileset dir="${build.lib}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
  -
  -  <!-- Completely build all dists -->
  -  <target name="dist" depends="sars" description="Generates the distribution">
  -
  -    <property name="dist.name" value="${Name}-${version}"/>
  -
  -    <mkdir dir="${dist.base}"/>
  -
  -    <antcall target="bin-dist" inheritAll="false">
  -      <param name="bin.dist.dir" value="${dist.name}" />
  -    </antcall>
  -
  -    <zip zipfile="${dist.base}/${dist.name}-bin.zip"
  -         basedir="${dist.name}/.."
  -         includes="${dist.name}/**"/>
  -
  -    <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  -      <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  -        <include name="${dist.name}/**"/>
  -      </tarfileset>
  -    </tar>
  -
  -    <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  -          src="${dist.base}/${dist.name}-bin.tar"/>
  -
  -    <delete file="${dist.base}/${dist.name}-bin.tar"/>
  -    <delete dir="${dist.name}" />
  -
  -    <antcall target="src-dist" inheritAll="false">
  -      <param name="src.dist.dir" value="${dist.name}" />
  -    </antcall>
  -
  -    <zip zipfile="${dist.base}/${dist.name}-src.zip"
  -         basedir="${dist.name}/.."
  -         includes="${dist.name}/**">
  -      <fileset dir="..">
  -        <include name="common/lib/avalon-*"/>
  -        <include name="common/lib/cornerstone.jar"/>
  -        <include name="common/lib/phoenix-*"/>
  -      </fileset>
  -    </zip>
  -
  -    <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
  -      <tarfileset dir="${dist.name}/.." mode="755" username="avalon" group="avalon">
  -        <include name="${dist.name}/build.sh"/>
  -      </tarfileset>
  -      <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  -        <include name="${dist.name}/**"/>
  -        <exclude name="${dist.name}/build.sh"/>
  -      </tarfileset>
  -      <tarfileset dir=".." username="avalon" group="avalon">
  -        <include name="common/lib/avalon-*"/>
  -        <include name="common/lib/cornerstone.jar"/>
  -        <include name="common/lib/phoenix-*"/>
  -      </tarfileset>      
  -    </tar>
  -
  -    <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
  -          src="${dist.base}/${dist.name}-src.tar"/>
  -    <delete file="${dist.base}/${dist.name}-src.tar"/>
  -    <delete dir="${dist.name}" />
  -
  -  </target>
  -
  -  <!-- Creates all the .sar files -->  
  -  <target name="bin-dist" depends="all">
  -
  -    <!-- bin.dist.dir usually set before this target is called -->
  -    <property name="bin.dist.dir" value="dist"/>
  -    <property name="bin.dist.lib" value="${bin.dist.dir}/lib"/>
  -    <property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
  -
  -    <mkdir dir="${bin.dist.docs}"/>
  -    <copy todir="${bin.dist.docs}">
  -      <fileset dir="${build.docs}"/>   
  -    </copy>
  -
  -    <copy file="${build.lib}/${name}.sar" tofile="${bin.dist.dir}/${name}-${version}.sar"/>
  -
  -    <chmod dir="${bin.dist.dir}" perm="go-rwx" />
  -  </target>
  -
  -  <target name="src-dist" depends="docs">
  -    <!-- src.dist.dir has usually already been set -->
  -    <property name="src.dist.dir" value="dist-src"/>
  -    <property name="src.dist.src" value="${src.dist.dir}/src"/>
  -    <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
  -
  -    <mkdir dir="${src.dist.docs}"/>
  -
  -    <copy todir="${src.dist.docs}">
  -      <fileset dir="${build.docs}"/>   
  -    </copy>
  -
  -    <copy todir="${src.dist.src}">
  -      <fileset dir="${src.dir}"/>
  -    </copy>
  -    
  -    <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
  -         basedir="${build.xdoclet}"/>
  -
  -    <copy todir="${src.dist.dir}">
  -      <fileset dir=".">
  -        <include name="build.xml"/>
  -      </fileset>
  -    </copy>
  -    
  -    <mkdir dir="${src.dist.dir}/lib"/>
  -    <copy todir="${src.dist.dir}/lib">
  -      <fileset dir="lib">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>
  -    
  -    <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
  -
  -    <chmod dir="${src.dist.dir}" perm="go-rwx" />
  -  </target>
  -
  -  <target name="install" depends="main" description="Installs into Phoenix">
  -    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  -    <echo message="Installing to ${install.dir}" />
  -    <delete dir="${install.dir}/xcommander" />
  -    <copy file="${build.lib}/xcommander.sar" todir="${install.dir}" />
  -  </target>
  -
  -  <target name="uninstall" description="Uninstalls from Phoenix">
  -
  -    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  -    <delete dir="${install.dir}/xcommander/" />
  -    <delete file="xcommander.sar" dir="${install.dir}"/>
  -  </target>
  -
  -  <target name="clean" description="Cleans up artifacts from build process">
  -    <delete dir="${build.dir}" />
  -    <delete>
  -      <fileset dir="." includes="**/*~" defaultexcludes="no"/>
  -    </delete>
  -  </target>
  -
  -  <target name="distclean" depends="clean" description="Cleans up all generated files and directories">
  -    <delete dir="${bin.dist.dir}" />
  -    <delete dir="${dist.base}" />
  -  </target>
  +	<target name="distclean">
  +		<echo message="-------------------------------------------------------------" />
  +		<echo message="WARNING: Deprecated. Use the real-clean target instead" />
  +		<echo message="-------------------------------------------------------------" />
  +		<ant antfile="${basedir}/../build.xml" target="module:real-clean"/>
  +	</target>
  +	<target name="real-clean" description="Cleans up all generated files and directories">
  +		<ant antfile="${basedir}/../build.xml" target="module:real-clean"/>
  +	</target>
   
   <!-- ==========================================================================================
   	DOCUMENTATION GENERATION
   ========================================================================================== -->
   
  -	<!-- Creates all docs -->
  -	<target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  -
   	<!-- copy docs to site dir -->
   	<target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  -		<mkdir dir="../site/build/docs/apps/${dir-name}"/>
  -		<copy todir="../site/build/docs/apps/${dir-name}">
  -		<fileset dir="${build.docs}">
  -			<include name="**"/>
  -		</fileset>
  -		</copy>
  +		<ant antfile="${basedir}/../build.xml" target="module:site"/>
   	</target>
   
   	<!-- Creates javadocs -->
   	<target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  -		<mkdir dir="${build.javadocs}"/>
  -		<javadoc packagenames="org.apache.*"
  -		sourcepath="${java.dir}"
  -		destdir="${build.javadocs}">
  -		<classpath refid="project.class.path" />
  -		<doclet name="com.sun.tools.doclets.standard.Standard">
  -			<param name="-author"/>
  -			<param name="-version"/>
  -			<param name="-doctitle" value="${Name}"/>
  -			<param name="-windowtitle" value="${Name} API"/>
  -			<param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
  -			<param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
  -			<param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
  -			<param name="-bottom"
  -			value="&quot;Copyright &#169; ${year} Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -		</doclet>
  -		</javadoc>
  +		<ant antfile="${basedir}/../build.xml" target="module:javadocs"/>
   	</target>
   
   	<target name="html-docs" description="generates the xdocs-based documentation">
  -		<!-- we call the cocoonbuild.xml target common to all of excalibur. This builds our html site -->
  -		<ant antfile="${basedir}/../cocoonbuild.xml"/>
  +		<ant antfile="${basedir}/../build.xml" target="module:html-docs"/>
   	</target>
   </project>
  
  
  
  1.2       +12 -66    jakarta-avalon-apps/xcommander/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/xcommander/default.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.properties	14 Jul 2002 16:43:31 -0000	1.1
  +++ default.properties	16 Jul 2002 16:47:19 -0000	1.2
  @@ -1,70 +1,16 @@
  -# -------------------------------------------------------------------
  -# B U I L D  P R O P E R T I E S
  -# -------------------------------------------------------------------
  -# Specifies default property values
  -# Overridden by ../default.properties and all ant.properties
  -# Not user-editable; use ant.properties files instead
  +# ============================================================================
  +# Standard Build Properties for XCommander
  +# ============================================================================
  +# Overrides the incorrect values in ../default.properties.
   
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   #           DOC GENERATION CONFIGURATION
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   
  -name=xcommander
  -Name=Avalon Apps XCommander
  -dir-name=xcommander
  -version=0.7
  -package-version=1.0
  -year=2000-2002
  +name				= xcommander
  +Name				= Avalon Apps XCommander
  +dir-name			= xcommander
  +version				= 0.7
  +package-version			= 1.0
  +year				= 2000-2002
   
  -# --------------------------------------------------
  -#                REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -# ----- Avalon Framework -----
  -avalon-framework.home=${basedir}/../../jakarta-avalon
  -avalon-framework.lib=${avalon-framework.home}/build/lib
  -avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  -
  -# --------------------------------------------------
  -#             COMPILATION ENVIRONMENT
  -# --------------------------------------------------
  -
  -#  Settings used to configure compile environment
  -build.debug = on
  -build.optimize = off
  -build.deprecation = on
  -build.compress = false
  -junit.failonerror = false
  -
  -#  location of intermediate products
  -build.dir = build
  -build.testsrc = ${build.dir}/testsrc
  -build.testclasses = ${build.dir}/testclasses
  -build.lib = ${build.dir}/lib
  -build.conf = ${build.dir}/conf
  -build.classes = ${build.dir}/classes
  -build.tests = ${build.dir}/tests
  -build.reports = ${build.dir}/reports
  -build.docs = ${build.dir}/docs
  -build.javadocs = ${build.docs}/api
  -
  -#  Set the properties for source directories
  -src.dir = src
  -java.dir = ${src.dir}/java
  -conf.dir = ${src.dir}/conf
  -test.dir = ${src.dir}/test
  -
  -#  Set the properties for distribution directories
  -dist.dir = dist
  -dist.javadocs = ${dist.dir}/docs/api
  -
  -#  name of .zip/.tar.gz/.bz2 files and their top-level directory
  -dist.name = ${name}-${version}
  -
  -#  name of jar file
  -jar.name = ${name}-${version}.jar
  -
  -#  property indicating directory where all distribution archives are placed
  -dist.base = distributions
  -
  -depchecker.prefix=.
  
  
  

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


Mime
View raw message