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/db build.xml default.properties
Date Fri, 26 Jul 2002 14:21:59 GMT
leosimons    2002/07/26 07:21:59

  Modified:    .        build.xml cocoonbuild.xml
               xcommander build.xml
               site     build.xml
               simpleserver build.xml
               sevak    build.xml
               overlord build.xml
               httpproxy build.xml
               hsql     build.xml
               ftpserver build.xml default.properties
               demo     build.xml default.properties
               db       build.xml default.properties
  Added:       .        build-sites.sh
               simpleserver default.properties
               sevak    default.properties
               overlord default.properties
               httpproxy default.properties
               hsql     default.properties
               demo     newbuild.xml
  Log:
  fix documentation generation scripts for avalon-apps.
  
  Revision  Changes    Path
  1.3       +77 -67    jakarta-avalon-apps/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	16 Jul 2002 16:51:31 -0000	1.2
  +++ build.xml	26 Jul 2002 14:21:58 -0000	1.3
  @@ -25,7 +25,7 @@
   	MODULE SETUP
        ========================================================================================== -->
   
  -     	<target name="module:setup">
  +     	<target name="module:setup" unless="override.setup">
   		<!-- set up properties -->
   		<property file="${user.home}/build.properties"/>
   		<property file="${user.home}/.ant.properties"/>
  @@ -35,7 +35,7 @@
   		<property file="${basedir}/../default.properties"/>
   		<property file="${basedir}/../cocoon.properties"/>
   
  -		<!-- set up classpath --> 
  +		<!-- set up classpath -->
   		<path id="project.class.path">
   			<pathelement path="${java.class.path}" />
   			<pathelement path="${build.classes}" />
  @@ -55,7 +55,7 @@
   			</fileset>
   		</path>
   
  -		<!-- set up custom tasks --> 
  +		<!-- set up custom tasks -->
   		<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
   			<classpath refid="project.class.path" />
   		</taskdef>
  @@ -91,18 +91,18 @@
   	DEFAULT TARGETS
        ========================================================================================== -->
   
  -	<target name="module:main" depends="module:sar,module:setup"/>
  -	<target name="module:all" depends="module:main,module:docs,module:setup"/>
  +	<target name="module:main" depends="module:sar,module:setup" unless="override.main"/>
  +	<target name="module:all" depends="module:main,module:docs,module:setup" unless="override.all"/>
   
   <!-- ==========================================================================================
   	SETUP TARGETS
        ========================================================================================== -->
   
  -	<target name="test-xdoclet" depends="module:setup">
  +	<target name="test-xdoclet" depends="module:setup" unless="override.test-xdoclet">
  +		<available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: XDoclet is available" />
   		<echo message="-------------------------------------------------------------" />
  -		<available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>
   	</target>
   
   <!-- ==========================================================================================
  @@ -110,12 +110,12 @@
        ========================================================================================== -->
   
   	<!-- Compiles module -->
  -	<target name="module:compile" depends="module:setup">
  +	<target name="module:compile" depends="module:setup" unless="override.compile">
   		<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}"
  @@ -123,7 +123,7 @@
   				deprecation="${build.deprecation}">
   			<classpath refid="project.class.path" />
   		</javac>
  -		
  +
   		<copy todir="${build.classes}">
   			<fileset dir="${java.dir}">
   				<exclude name="**/test/**"/>
  @@ -133,12 +133,12 @@
   	</target>
   
   	<!-- Make .xinfo and manifest automatically for blocks -->
  -	<target name="module:phoenix-xdoclet" depends="module:compile,module:setup" if="xdoclet.present">
  +	<target name="module:phoenix-xdoclet" depends="module:compile,module:setup,test-xdoclet" 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">
  @@ -152,7 +152,7 @@
   	</target>
   
   	<!-- Make .xinfo and manifest automatically for blocks -->
  -	<target name="module:no-phoenix-xdoclet" depends="module:compile,module:setup" unless="xdoclet.present">
  +	<target name="module:no-phoenix-xdoclet" depends="module:compile,module:setup,test-xdoclet" unless="xdoclet.present">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Getting ${Name} xinfo files" />
   		<echo message="-------------------------------------------------------------" />
  @@ -161,7 +161,7 @@
   	</target>
   
   	<!-- Performs unit tests -->
  -	<target name="module:test" depends="module:compile,module:setup">
  +	<target name="module:test" depends="module:compile,module:setup" unless="override.test">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Running unit tests for ${Name}" />
   		<echo message="-------------------------------------------------------------" />
  @@ -173,13 +173,13 @@
        ========================================================================================== -->
   
   	<!-- Jars up project -->
  -	<target name="module:jar" depends="test-xdoclet, module:phoenix-xdoclet, module:no-phoenix-xdoclet,module:setup">
  +	<target name="module:jar" depends="test-xdoclet, module:phoenix-xdoclet, module:no-phoenix-xdoclet,module:setup" unless="override.jar">
   		<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">
   
  @@ -193,7 +193,7 @@
   	</target>
   
   	<!-- Sars up project -->
  -	<target name="module:sar" depends="module:jar,module:setup">
  +	<target name="module:sar" depends="module:jar,module:setup" unless="override.sar">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Creating sar file for ${Name}" />
   		<echo message="   generated file: ${build.lib}/${name}.sar" />
  @@ -202,18 +202,18 @@
   				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="**"/>
  @@ -222,37 +222,37 @@
   	</target>
   
   	<!-- Completely build all dists -->
  -	<target name="module:dist" depends="module:sar,module:setup">
  +	<target name="module:dist" depends="module:sar,module:setup" unless="override.dist">
   		<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}/**">
  @@ -262,7 +262,7 @@
   				<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"/>
  @@ -275,9 +275,9 @@
   				<include name="avalon-*"/>
   				<include name="cornerstone.jar"/>
   				<include name="phoenix-*"/>
  -			</tarfileset>      
  +			</tarfileset>
   		</tar>
  -		
  +
   		<gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
   				src="${dist.base}/${dist.name}-src.tar"/>
   
  @@ -285,49 +285,49 @@
   		<delete dir="${dist.name}" />
   	</target>
   
  -	<!-- Creates all the .sar files -->  
  -	<target name="module:bin-dist" depends="module:all,module:setup">
  -		
  +	<!-- Creates all the .sar files -->
  +	<target name="module:bin-dist" depends="module:all,module:setup" unless="override.bin-dist">
  +
   		<!-- 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}"/>   
  +			<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">
  +	<target name="module:src-dist" depends="module:docs,module:setup" unless="override.src-dist">
   		<!-- 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}"/>   
  +			<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">
  @@ -335,13 +335,13 @@
   				<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">
  +	<target name="module:install" depends="module:main,module:setup" unless="override.install">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Installing ${Name} into phoenix" />
   		<echo message="   install dir: ${install.dir}" />
  @@ -350,7 +350,7 @@
   		<copy file="${build.lib}/${name}.sar" todir="${install.dir}" />
   	</target>
   
  -	<target name="module:uninstall" description="Uninstalls from Phoenix" depends="module:setup">
  +	<target name="module:uninstall" description="Uninstalls from Phoenix" depends="module:setup" unless="override.uninstall">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Removing ${Name} from phoenix" />
   		<echo message="   install dir: ${install.dir}" />
  @@ -359,7 +359,7 @@
   		<delete file="${name}.sar" dir="${install.dir}"/>
   	</target>
   
  -	<target name="module:clean" depends="module:setup">
  +	<target name="module:clean" depends="module:setup" unless="override.clean">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Cleaning up products of the ${Name} build process" />
   		<echo message="-------------------------------------------------------------" />
  @@ -368,7 +368,7 @@
   			<fileset dir="." includes="**/*~" defaultexcludes="no"/>
   		</delete>
   	</target>
  -	
  +
   	<target name="module:real-clean" depends="module:clean">
   		<delete dir="${bin.dist.dir}" />
   		<delete dir="${dist.base}" />
  @@ -379,10 +379,10 @@
   ========================================================================================== -->
   
   	<!-- Creates all docs -->
  -	<target name="module:docs" depends="module:html-docs, module:javadocs,module:setup"/>
  +	<target name="module:docs" depends="module:html-docs, module:javadocs,module:setup" unless="override.docs"/>
   
   	<!-- copy docs to site dir -->
  -	<target name="module:site" depends="module:docs">
  +	<target name="module:site" depends="module:docs" unless="override.site">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Copying the documentation for ${Name} to the site" />
   		<echo message="-------------------------------------------------------------" />
  @@ -418,13 +418,13 @@
   		</javadoc>
   	</target>
   
  -	<target name="module:html-docs" depends="module:setup">
  +	<target name="module:html-docs" depends="module:setup" unless="override.html-docs">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Cleaning HTML documentation for ${Name}" />
   		<echo message="-------------------------------------------------------------" />
   		<antcall target="${documentation.tool}:html-docs" />
   	</target>
  -	
  +
   <!-- ==========================================================================================
   	DOCUMENTATION GENERATION USING COCOON
        ========================================================================================== -->
  @@ -466,6 +466,8 @@
   	</target>
   
   	<target name="cocoon:setup-html-docs" depends="cocoon:setup-filters,cocoon:setup" description="generates the xdocs-based documentation">
  +		<delete dir="${cocoon.work}"/>
  +		
   		<mkdir dir="${build.dir}"/>
   		<mkdir dir="${cocoon.build.context}"/>
   		<mkdir dir="${cocoon.build.docs}"/>
  @@ -492,14 +494,14 @@
   			<fileset dir="${cocoon.xdocs.dir}"/>
   		</copy>
   
  -		<copy file="${cocoon.main.context.dir}/resources/schema/CatalogManager.properties" 
  +		<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}"/>
  @@ -508,18 +510,20 @@
   			<arg value="-b${build.dir}/brokenlinks.txt"/>
   			<arg value="-uERROR"/>
   			<arg value="-f./build/content/xdocs/doc.uris"/>
  -			<arg value="-rno"/>            
  +			<arg value="-rno"/>
   
   			<classpath>
   				<path refid="tools.class.path"/>
   				<fileset dir="${tools.dir}/ext"/>
   			</classpath>
   		</java>
  -		
  +
  +		<delete dir="${cocoon.work}"/>
  +
   		<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 ..."/>
  @@ -529,7 +533,7 @@
   			<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="-b${build.dir}/brokenlinks.txt"/>
   			<arg value="-uERROR"/>
   			<arg value="index.html"/>
   
  @@ -537,14 +541,20 @@
   				<path id="tools.class.path">
   					<pathelement location="${junit.jar}"/>
   					<pathelement location="${tools.jar}"/>
  -					<fileset dir="${tools.dir}/lib"/>
  -					<fileset dir="${tools.dir}/ext"/>
  +					<fileset dir="${tools.dir}/lib">
  +						<include name="*.jar"/>
  +					</fileset>
  +					<fileset dir="${tools.dir}/ext">
  +						<include name="*.jar"/>
  +					</fileset>
   				</path>
   			</classpath>
   		</java>
   
  +		<delete dir="${cocoon.work}"/>
  +
   		<echo message="  ...docs generated succesfully in ./build/docs dir."/>
   		<echo message="-------------------------------------------------------------"/>
  -	</target>  
  -	
  +	</target>
  +
   </project>
  
  
  
  1.4       +23 -14    jakarta-avalon-apps/cocoonbuild.xml
  
  Index: cocoonbuild.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/cocoonbuild.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cocoonbuild.xml	16 Jul 2002 16:47:19 -0000	1.3
  +++ cocoonbuild.xml	26 Jul 2002 14:21:58 -0000	1.4
  @@ -29,10 +29,10 @@
   		<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="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}"/>
  @@ -46,6 +46,7 @@
   	</target>
   
   	<target name="cocoon:setup-html-docs" depends="cocoon:setup-filters" description="generates the xdocs-based documentation">
  +		<delete dir="${cocoon.work}"/>
   		<mkdir dir="${build.dir}"/>
   		<mkdir dir="${cocoon.build.context}"/>
   		<mkdir dir="${cocoon.build.docs}"/>
  @@ -72,14 +73,14 @@
   			<fileset dir="${cocoon.xdocs.dir}"/>
   		</copy>
   
  -		<copy file="${cocoon.main.context.dir}/resources/schema/CatalogManager.properties" 
  +		<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}"/>
  @@ -88,18 +89,20 @@
   			<arg value="-b${build.dir}/brokenlinks.txt"/>
   			<arg value="-uERROR"/>
   			<arg value="-f./build/content/xdocs/doc.uris"/>
  -			<arg value="-rno"/>            
  +			<arg value="-rno"/>
   
   			<classpath>
   				<path refid="tools.class.path"/>
   				<fileset dir="${tools.dir}/ext"/>
   			</classpath>
   		</java>
  -		
  +
  +		<delete dir="${cocoon.work}"/>
  +
   		<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 ..."/>
  @@ -109,7 +112,7 @@
   			<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="-b${build.dir}/brokenlinks.txt"/>
   			<arg value="-uERROR"/>
   			<arg value="index.html"/>
   
  @@ -117,14 +120,20 @@
   				<path id="tools.class.path">
   					<pathelement location="${junit.jar}"/>
   					<pathelement location="${tools.jar}"/>
  -					<fileset dir="${tools.dir}/lib"/>
  -					<fileset dir="${tools.dir}/ext"/>
  +					<fileset dir="${tools.dir}/lib">
  +						<include name="*.jar"/>
  +					</fileset>
  +					<fileset dir="${tools.dir}/ext">
  +						<include name="*.jar"/>
  +					</fileset>
   				</path>
   			</classpath>
   		</java>
   
  +		<delete dir="${cocoon.work}"/>
  +
   		<echo message="  ...docs generated succesfully in ./build/docs dir."/>
   		<echo message="-------------------------------------------------------------"/>
  -	</target>  
  -	
  +	</target>
  +
   </project>
  
  
  
  1.1                  jakarta-avalon-apps/build-sites.sh
  
  Index: build-sites.sh
  ===================================================================
  #!/bin/sh
  # quick stupid script by LSD
  # this script is in the public domain
  
  # update these projects
  PROJECTS="db demo enterprise ftpserver hsql httpproxy overlord sevak simpleserver xcommander"
  MULTI_PROCESS="no"
  ANT_COMMAND="ant site"
  
  echo "*---------------------------------------------------*"
  echo "| This is the Morning Cappuchino script             |"
  echo "|---------------------------------------------------|"
  echo "| Go and grab yourself a coffee while I build the   |"
  echo "| following projects for you:                       |"
  echo "*---------------------------------------------------*"
  for module in ${PROJECTS}
  do
  echo "    - ${module}"
  done
  echo "*---------------------------------------------------*"
  echo ""
  
  CURRDIR=${PWD}
  
  for module in ${PROJECTS}
  do
  	echo "updating module: " ${module}
  	if [ "${MULTI_PROCESS}" = "yes" ]
  	then
  		$(cd ${CURRDIR}/${module}; ${ANT_COMMAND}) &
  	else
  		cd ${CURRDIR}/${module}; ${ANT_COMMAND}
  	fi
  done
  
  
  
  1.17      +1 -1      jakarta-avalon-apps/xcommander/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/xcommander/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml	16 Jul 2002 16:51:31 -0000	1.16
  +++ build.xml	26 Jul 2002 14:21:58 -0000	1.17
  @@ -34,7 +34,7 @@
        ========================================================================================== -->
   
   	<target name="compile">
  -		<ant antfile="${basedir}/../build.xml" target="module:compiler"/>
  +		<ant antfile="${basedir}/../build.xml" target="module:compile"/>
   	</target>
   
   	<target name="phoenix-xdoclet">
  
  
  
  1.11      +1 -1      jakarta-avalon-apps/site/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/site/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	14 Jul 2002 16:43:31 -0000	1.10
  +++ build.xml	26 Jul 2002 14:21:58 -0000	1.11
  @@ -17,7 +17,7 @@
     <!-- 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.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"/>
  
  
  
  1.14      +62 -127   jakarta-avalon-apps/simpleserver/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	6 Jun 2002 20:48:40 -0000	1.13
  +++ build.xml	26 Jul 2002 14:21:58 -0000	1.14
  @@ -2,21 +2,19 @@
   
   <project name="SimpleServer" default="main" basedir=".">
   
  -  <!--
  -    Give user a chance to override without editing this file
  -    (and without typing -D each time they compile it)
  -  -->
  -  <property file=".ant.properties"/>
  -  <property file="${user.home}/.ant.properties"/>
  -
  -  <property name="name" value="simpleserver"/>
  -  <property name="Name" value="SimpleServer"/>
  -  <property name="version" value="0.7"/>
  -  <property name="year" value="1999-2001"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="off"/>
  +<!-- ==========================================================================================
  +	PROPERTY 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 the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  @@ -206,135 +204,30 @@
   
         <lib dir="${build.lib}/">
           <include name="*.jar"/>
  -        <exclude name="demo-test-extension2.jar"/>        
  -      </lib>          
  +        <exclude name="demo-test-extension2.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>    
  +    </copy>
   
     </target>
   
  -  
  +
     <!-- Performs unit tests -->
     <target name="check" depends="compile" description="Perform any built in tests">
     </target>
  -
  -  <!-- Create the API documentation -->
  -  <target name="javadocs" description="Generates the Java Docs">
  -
  -    <delete dir="${build.docs}/api"/>
  -    <mkdir dir="${build.docs}/api"/>
  -
  -    <javadoc packagenames="org.apache.*"
  -             sourcepath="${java.dir}"
  -             destdir="${build.docs}/api">
  -      <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="-bottom"
  -              value="&quot;Copyright &#169; 2001 Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -      </doclet>
  -    </javadoc>
  -  </target>
  -
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  -
  -  
  -    <target name="html-docs" depends="setup-filters" description="generates the xdocs-based documentation">
  -
  -      <property name="use.skin"              value="avalon-site"/>
  -
  -      <!-- 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="avalon"/>
  -      <filter token="link3.href"        value="http://jakarta.apache.org/avalon/"/>
  -      <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"/>  
  -    
  -        <mkdir dir="${build.context}"/>
  -        <mkdir dir="${build.docs}"/>
  -        <mkdir dir="${build.xdocs}"/>
  -        <mkdir dir="${build.dir}/work"/>       
  -
  -        <copy todir="${build.context}" overwrite="true" filtering="on">
  -            <fileset dir="${context.dir}">
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${build.context}" filtering="off">
  -            <fileset dir="${context.dir}">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${build.xdocs}" filtering="on" overwrite="true">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
  -        
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Building docs, please stand by ..."/>
  -        
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${build.context}/"/>
  -            <arg value="-d${build.docs}"/>
  -            <arg value="-w${build.dir}/work"/>
  -            <arg value="-l${build.dir}/work/cocoon.log"/>
  -            <arg value="-uWARN"/>
  -            <arg value="index.html"/>
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -
  -        <!-- hack for stupid transport on api link -->
  -        <replace dir="${build.docs}" token="http://hack.hack" value="api/index.html">
  -          <include name="*.html"/>
  -        </replace> 
  -
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>    
  -
  -    </target>
  -
  -  <target name="site" depends="docs" description=" Places Docs ready for hosting on website">  
  -  
  -    <mkdir dir="../site/docs/apps/${name}"/>
  -    <copy todir="../site/docs/apps/${name}">
  -      <fileset dir="${build.docs}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>        
     
  -  </target>  
  -
     <!-- Completely build all dists -->
     <target name="dist" depends="sars" description="Generates the distribution">
   
  @@ -431,7 +324,7 @@
       <copy todir="${src.dist.src}">
         <fileset dir="${src.dir}"/>
       </copy>
  -    
  +
       <zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
            basedir="${build.xdoclet}"/>
       
  @@ -482,4 +375,46 @@
       <delete dir="${dist.base}" />
     </target>
   
  +<!-- ==========================================================================================
  +	DOCUMENTATION GENERATION
  +========================================================================================== -->
  +
  +	<!-- Creates all docs -->
  +	<target name="docs" depends="html-docs, javadocs" description="generates all the 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>
  +	</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>
  +	</target>
  +
  +	<target name="html-docs" description="generates the xdocs-based documentation">
  +		<!-- we call the build.xml target common to all of avalon-apps. This builds our html site -->
  +		<ant antfile="${basedir}/../cocoonbuild.xml"/>
  +	</target>
   </project>
  
  
  
  1.1                  jakarta-avalon-apps/simpleserver/default.properties
  
  Index: default.properties
  ===================================================================
  # ============================================================================
  # Standard Build Properties for SimpleServer
  # ============================================================================
  # Overrides the incorrect values in ../default.properties.
  
  # ----------------------------------------------------------------------------
  #           DOC GENERATION CONFIGURATION
  # ----------------------------------------------------------------------------
  
  name				= simpleserver
  Name				= Avalon Apps SimpleServer
  dir-name			= simpleserver
  version				= 0.7
  package-version			= 1.0
  year				= 2000-2002
  
  
  
  
  1.9       +55 -121   jakarta-avalon-apps/sevak/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/sevak/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	24 Jul 2002 03:14:49 -0000	1.8
  +++ build.xml	26 Jul 2002 14:21:58 -0000	1.9
  @@ -2,21 +2,19 @@
   
   <project default="main" basedir=".">
   
  -  <!--
  -    Give user a chance to override without editing this file
  -    (and without typing -D each time they compile it)
  -  -->
  -  <property file="ant.properties"/>
  -  <property file="${user.home}/ant.properties"/>
  -
  -  <property name="name" value="sevak"/>
  -  <property name="Name" value="Sevak"/>
  -  <property name="version" value="0.6"/>
  -  <property name="year" value="2002"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="off"/>
  +<!-- ==========================================================================================
  +	PROPERTY 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 the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  @@ -408,112 +406,6 @@
     <target name="check" depends="compile" description="Perform any built in tests">
     </target>
   
  -  <!-- Create the API documentation -->
  -  <target name="javadocs" description="Generates the Java Docs">
  -
  -    <delete dir="${build.docs}/api"/>
  -    <mkdir dir="${build.docs}/api"/>
  -
  -    <javadoc packagenames="org.apache.*"
  -             sourcepath="${java.dir}"
  -             destdir="${build.docs}/api">
  -      <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="-bottom"
  -              value="&quot;Copyright &#169; 2001 Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -      </doclet>
  -    </javadoc>
  -  </target>
  -
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  -
  -  
  -    <target name="html-docs" depends="setup-filters" description="generates the xdocs-based documentation">
  -
  -      <property name="use.skin"              value="avalon-site"/>
  -
  -      <!-- 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="avalon"/>
  -      <filter token="link3.href"        value="http://jakarta.apache.org/avalon/"/>
  -      <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"/>  
  -    
  -        <mkdir dir="${build.context}"/>
  -        <mkdir dir="${build.docs}"/>
  -        <mkdir dir="${build.xdocs}"/>
  -        <mkdir dir="${build.dir}/work"/>       
  -
  -        <copy todir="${build.context}" overwrite="true" filtering="on">
  -            <fileset dir="${context.dir}">
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${build.context}" filtering="off">
  -            <fileset dir="${context.dir}">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${build.xdocs}" filtering="on" overwrite="true">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
  -        
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Building docs, please stand by ..."/>
  -        
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${build.context}/"/>
  -            <arg value="-d${build.docs}"/>
  -            <arg value="-w${build.dir}/work"/>
  -            <arg value="-l${build.dir}/work/cocoon.log"/>
  -            <arg value="-uWARN"/>
  -            <arg value="index.html"/>
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -
  -        <!-- hack for stupid transport on api link -->
  -        <replace dir="${build.docs}" token="http://hack.hack" value="api/index.html">
  -          <include name="*.html"/>
  -        </replace> 
  -        
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>    
  -
  -    </target>
  -
  -  <target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  -
  -    <mkdir dir="../site/docs/apps/${name}"/>
  -    <copy todir="../site/docs/apps/${name}">
  -      <fileset dir="${build.docs}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
  -
     <!-- Completely build all dists -->
     <target name="dist" depends="sars" description="Generates the distribution">
   
  @@ -757,4 +649,46 @@
       <copy file="${build.lib}/avalon-sevak-demo.sar" todir="${install.dir}" />
     </target>
   
  +<!-- ==========================================================================================
  +	DOCUMENTATION GENERATION
  +========================================================================================== -->
  +
  +	<!-- Creates all docs -->
  +	<target name="docs" depends="html-docs, javadocs" description="generates all the 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>
  +	</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>
  +	</target>
  +
  +	<target name="html-docs" description="generates the xdocs-based documentation">
  +		<!-- we call the build.xml target common to all of avalon-apps. This builds our html site -->
  +		<ant antfile="${basedir}/../cocoonbuild.xml"/>
  +	</target>
   </project>
  
  
  
  1.1                  jakarta-avalon-apps/sevak/default.properties
  
  Index: default.properties
  ===================================================================
  # ============================================================================
  # Standard Build Properties for Sevak
  # ============================================================================
  # Overrides the incorrect values in ../default.properties.
  
  # ----------------------------------------------------------------------------
  #           DOC GENERATION CONFIGURATION
  # ----------------------------------------------------------------------------
  
  name				= sevak
  Name				= Avalon Apps Sevak
  dir-name			= sevak
  version				= 0.6
  package-version			= 1.0
  year				= 2000-2002
  
  
  
  
  1.15      +55 -120   jakarta-avalon-apps/overlord/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/overlord/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	6 Jun 2002 20:48:40 -0000	1.14
  +++ build.xml	26 Jul 2002 14:21:59 -0000	1.15
  @@ -2,21 +2,19 @@
   
   <project name="Overlord" default="main" basedir=".">
   
  -  <!--
  -    Give user a chance to override without editing this file
  -    (and without typing -D each time they compile it)
  -  -->
  -  <property file=".ant.properties"/>
  -  <property file="${user.home}/.ant.properties"/>
  -
  -  <property name="name" value="overlord"/>
  -  <property name="Name" value="Overlord"/>
  -  <property name="version" value="0.1"/>
  -  <property name="year" value="2001"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="on"/>
  +<!-- ==========================================================================================
  +	PROPERTY 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 the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  @@ -211,112 +209,7 @@
     <!-- Performs unit tests -->
     <target name="check" depends="compile" description="Perform any built in tests">
     </target>
  -
  -  <!-- Create the API documentation -->
  -  <target name="javadocs" description="Generates the Java Docs">
  -
  -    <delete dir="${build.docs}/api"/>
  -    <mkdir dir="${build.docs}/api"/>
  -
  -    <javadoc packagenames="org.apache.*"
  -             sourcepath="${java.dir}"
  -             destdir="${build.docs}/api">
  -      <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="-bottom"
  -              value="&quot;Copyright &#169; 2001 Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -      </doclet>
  -    </javadoc>
  -  </target>
  -
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  -
     
  -    <target name="html-docs" depends="setup-filters" description="generates the xdocs-based documentation">
  -
  -      <property name="use.skin"              value="avalon-site"/>
  -
  -      <!-- 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="avalon"/>
  -      <filter token="link3.href"        value="http://jakarta.apache.org/avalon/"/>
  -      <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"/>  
  -    
  -        <mkdir dir="${build.context}"/>
  -        <mkdir dir="${build.docs}"/>
  -        <mkdir dir="${build.xdocs}"/>
  -        <mkdir dir="${build.dir}/work"/>       
  -
  -        <copy todir="${build.context}" overwrite="true" filtering="on">
  -            <fileset dir="${context.dir}">
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${build.context}" filtering="off">
  -            <fileset dir="${context.dir}">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${build.xdocs}" filtering="on" overwrite="true">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
  -        
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Building docs, please stand by ..."/>
  -        
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${build.context}/"/>
  -            <arg value="-d${build.docs}"/>
  -            <arg value="-w${build.dir}/work"/>
  -            <arg value="-l${build.dir}/work/cocoon.log"/>
  -            <arg value="-uWARN"/>
  -            <arg value="index.html"/>
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -
  -        <!-- hack for stupid transport on api link -->
  -        <replace dir="${build.docs}" token="http://hack.hack" value="api/index.html">
  -          <include name="*.html"/>
  -        </replace> 
  -
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>    
  -
  -    </target>
  -
  -  <target name="site" depends="docs" description=" Places Docs ready for hosting on website">  
  -  
  -    <mkdir dir="../site/docs/apps/${name}"/>
  -    <copy todir="../site/docs/apps/${name}">
  -      <fileset dir="${build.docs}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>        
  -  
  -  </target>  
  -
     <!-- Completely build all dists -->
     <target name="dist" depends="sars" description="Generates the distribution">
   
  @@ -463,4 +356,46 @@
       <delete dir="${dist.base}" />
     </target>
   
  +<!-- ==========================================================================================
  +	DOCUMENTATION GENERATION
  +========================================================================================== -->
  +
  +	<!-- Creates all docs -->
  +	<target name="docs" depends="html-docs, javadocs" description="generates all the 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>
  +	</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>
  +	</target>
  +
  +	<target name="html-docs" description="generates the xdocs-based documentation">
  +		<!-- we call the build.xml target common to all of avalon-apps. This builds our html site -->
  +		<ant antfile="${basedir}/../cocoonbuild.xml"/>
  +	</target>
   </project>
  
  
  
  1.1                  jakarta-avalon-apps/overlord/default.properties
  
  Index: default.properties
  ===================================================================
  # ============================================================================
  # Standard Build Properties for Overlord
  # ============================================================================
  # Overrides the incorrect values in ../default.properties.
  
  # ----------------------------------------------------------------------------
  #           DOC GENERATION CONFIGURATION
  # ----------------------------------------------------------------------------
  
  name				= overlord
  Name				= Avalon Apps Overlord
  dir-name			= overlord
  version				= 0.1
  package-version			= 1.0
  year				= 2000-2002
  
  
  
  
  1.19      +55 -120   jakarta-avalon-apps/httpproxy/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	6 Jun 2002 20:48:39 -0000	1.18
  +++ build.xml	26 Jul 2002 14:21:59 -0000	1.19
  @@ -2,21 +2,19 @@
   
   <project name="HTTP Proxy Server" default="main" basedir=".">
   
  -  <!--
  -    Give user a chance to override without editing this file
  -    (and without typing -D each time they compile it)
  -  -->
  -  <property file=".ant.properties"/>
  -  <property file="${user.home}/.ant.properties"/>
  -
  -  <property name="name" value="httpproxy"/>
  -  <property name="Name" value="HTTPProxy"/>
  -  <property name="version" value="0.7"/>
  -  <property name="year" value="1999-2001"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="off"/>
  +<!-- ==========================================================================================
  +	PROPERTY 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 the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  @@ -208,111 +206,6 @@
     <target name="check" depends="compile" description="Perform any built in tests">
     </target>
   
  -  <!-- Create the API documentation -->
  -  <target name="javadocs" description="Generates the Java Docs">
  -
  -    <delete dir="${build.docs}/api"/>
  -    <mkdir dir="${build.docs}/api"/>
  -
  -    <javadoc packagenames="org.apache.*"
  -             sourcepath="${java.dir}"
  -             destdir="${build.docs}/api">
  -      <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="-bottom"
  -              value="&quot;Copyright &#169; 2001 Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -      </doclet>
  -    </javadoc>
  -  </target>
  -
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  -
  -  
  -    <target name="html-docs" depends="setup-filters" description="generates the xdocs-based documentation">
  -
  -      <property name="use.skin"              value="avalon-site"/>
  -
  -      <!-- 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="avalon"/>
  -      <filter token="link3.href"        value="http://jakarta.apache.org/avalon/"/>
  -      <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"/>  
  -    
  -        <mkdir dir="${build.context}"/>
  -        <mkdir dir="${build.docs}"/>
  -        <mkdir dir="${build.xdocs}"/>
  -        <mkdir dir="${build.dir}/work"/>       
  -
  -        <copy todir="${build.context}" overwrite="true" filtering="on">
  -            <fileset dir="${context.dir}">
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${build.context}" filtering="off">
  -            <fileset dir="${context.dir}">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${build.xdocs}" filtering="on" overwrite="true">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
  -        
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Building docs, please stand by ..."/>
  -        
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${build.context}/"/>
  -            <arg value="-d${build.docs}"/>
  -            <arg value="-w${build.dir}/work"/>
  -            <arg value="-l${build.dir}/work/cocoon.log"/>
  -            <arg value="-uWARN"/>
  -            <arg value="index.html"/>
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -
  -        <!-- hack for stupid transport on api link -->
  -        <replace dir="${build.docs}" token="http://hack.hack" value="api/index.html">
  -          <include name="*.html"/>
  -        </replace> 
  -        
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>    
  -
  -    </target>
  -
  -  <target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  -
  -    <mkdir dir="../site/docs/apps/${name}"/>
  -    <copy todir="../site/docs/apps/${name}">
  -      <fileset dir="${build.docs}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
     <!-- Completely build all dists -->
     <target name="dist" depends="sars" description="Generates the distribution">
   
  @@ -460,4 +353,46 @@
       <delete dir="${dist.base}" />
     </target>
   
  +<!-- ==========================================================================================
  +	DOCUMENTATION GENERATION
  +========================================================================================== -->
  +
  +	<!-- Creates all docs -->
  +	<target name="docs" depends="html-docs, javadocs" description="generates all the 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>
  +	</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>
  +	</target>
  +
  +	<target name="html-docs" description="generates the xdocs-based documentation">
  +		<!-- we call the build.xml target common to all of avalon-apps. This builds our html site -->
  +		<ant antfile="${basedir}/../cocoonbuild.xml"/>
  +	</target>
   </project>
  
  
  
  1.1                  jakarta-avalon-apps/httpproxy/default.properties
  
  Index: default.properties
  ===================================================================
  # ============================================================================
  # Standard Build Properties for HTTP Proxy
  # ============================================================================
  # Overrides the incorrect values in ../default.properties.
  
  # ----------------------------------------------------------------------------
  #           DOC GENERATION CONFIGURATION
  # ----------------------------------------------------------------------------
  
  name				= httpproxy
  Name				= Avalon Apps HTTP Proxy
  dir-name			= httpproxy
  version				= 0.7
  package-version			= 1.0
  year				= 2000-2002
  
  
  
  
  1.26      +61 -128   jakarta-avalon-apps/hsql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	6 Jun 2002 20:48:39 -0000	1.25
  +++ build.xml	26 Jul 2002 14:21:59 -0000	1.26
  @@ -2,21 +2,19 @@
   
   <project name="HypersonicSQL" default="main" basedir=".">
   
  -  <!--
  -    Give user a chance to override without editing this file
  -    (and without typing -D each time they compile it)
  -  -->
  -  <property file=".ant.properties"/>
  -  <property file="${user.home}/.ant.properties"/>
  -
  -  <property name="name" value="hsql"/>
  -  <property name="Name" value="Hsql"/>
  -  <property name="version" value="0.7"/>
  -  <property name="year" value="1999-2001"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="off"/>
  +<!-- ==========================================================================================
  +	PROPERTY 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 the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  @@ -188,138 +186,31 @@
         <lib dir="${build.lib}/">
           <include name="*.jar"/>
         </lib>
  -      
  +
         <lib dir="lib/">
           <include name="hsqldb.jar"/>
  -      </lib>       
  +      </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>    
  +    </copy>
   
     </target>
  -  
  +
     <!-- Performs unit tests -->
     <target name="check" depends="compile" description="Perform any built in tests">
     </target>
   
  -  <!-- Create the API documentation -->
  -  <target name="javadocs" description="Generates the Java Docs">
  -
  -    <delete dir="${build.docs}/api"/>
  -    <mkdir dir="${build.docs}/api"/>
  -
  -    <javadoc packagenames="org.apache.*"
  -             sourcepath="${java.dir}"
  -             destdir="${build.docs}/api">
  -      <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="-bottom"
  -              value="&quot;Copyright &#169; 2001 Apache Jakarta Project. All Rights Reserved.&quot;"/>
  -      </doclet>
  -    </javadoc>
  -  </target>
  -
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  -
  -  
  -    <target name="html-docs" depends="setup-filters" description="generates the xdocs-based documentation">
  -
  -      <property name="use.skin"              value="avalon-site"/>
  -
  -      <!-- 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="avalon"/>
  -      <filter token="link3.href"        value="http://jakarta.apache.org/avalon/"/>
  -      <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"/>  
  -    
  -        <mkdir dir="${build.context}"/>
  -        <mkdir dir="${build.docs}"/>
  -        <mkdir dir="${build.xdocs}"/>
  -        <mkdir dir="${build.dir}/work"/>       
  -
  -        <copy todir="${build.context}" overwrite="true" filtering="on">
  -            <fileset dir="${context.dir}">
  -                <exclude name="**/*.gif"/>
  -                <exclude name="**/*.jpg"/>
  -                <exclude name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -
  -        <copy todir="${build.context}" filtering="off">
  -            <fileset dir="${context.dir}">
  -                <include name="**/*.gif"/>
  -                <include name="**/*.jpg"/>
  -                <include name="**/*.png"/>
  -            </fileset>
  -        </copy>
  -        <copy todir="${build.xdocs}" filtering="on" overwrite="true">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
  -        
  -        <echo message="-------------------------------------------------------------"/>
  -        <echo message="  Building docs, please stand by ..."/>
  -        
  -        <java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
  -            <arg value="-c${build.context}/"/>
  -            <arg value="-d${build.docs}"/>
  -            <arg value="-w${build.dir}/work"/>
  -            <arg value="-l${build.dir}/work/cocoon.log"/>
  -            <arg value="-uWARN"/>
  -            <arg value="index.html"/>
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -
  -        <!-- hack for stupid transport on api link -->
  -        <replace dir="${build.docs}" token="http://hack.hack" value="api/index.html">
  -          <include name="*.html"/>
  -        </replace> 
  -
  -       <echo message="  ...docs generated succesfully in ./build/docs dir."/>
  -       <echo message="-------------------------------------------------------------"/>    
  -
  -    </target>
  -
  -  
  -  <target name="site" depends="docs" description=" Places Docs ready for hosting on website">  
  -  
  -    <mkdir dir="../site/docs/apps/${name}"/>     
  -    <copy todir="../site/docs/apps/${name}">
  -      <fileset dir="${build.docs}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>        
  -  
  -  </target>  
  -
  -
     <!-- Completely build all dists -->
     <target name="dist" depends="sars" description="Generates the distribution">
   
  @@ -464,4 +355,46 @@
       <delete dir="${dist.base}" />
     </target>
   
  +<!-- ==========================================================================================
  +	DOCUMENTATION GENERATION
  +========================================================================================== -->
  +
  +	<!-- Creates all docs -->
  +	<target name="docs" depends="html-docs, javadocs" description="generates all the 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>
  +	</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>
  +	</target>
  +
  +	<target name="html-docs" description="generates the xdocs-based documentation">
  +		<!-- we call the build.xml target common to all of avalon-apps. This builds our html site -->
  +		<ant antfile="${basedir}/../cocoonbuild.xml"/>
  +	</target>
   </project>
  
  
  
  1.1                  jakarta-avalon-apps/hsql/default.properties
  
  Index: default.properties
  ===================================================================
  # ============================================================================
  # Standard Build Properties for HyperSQL
  # ============================================================================
  # Overrides the incorrect values in ../default.properties.
  
  # ----------------------------------------------------------------------------
  #           DOC GENERATION CONFIGURATION
  # ----------------------------------------------------------------------------
  
  name				= hsql
  Name				= Avalon Apps HyperSQL
  dir-name			= hsql
  version				= 0.7
  package-version			= 1.0
  year				= 2000-2002
  
  
  
  
  1.40      +7 -5      jakarta-avalon-apps/ftpserver/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- build.xml	14 Jul 2002 16:43:31 -0000	1.39
  +++ build.xml	26 Jul 2002 14:21:59 -0000	1.40
  @@ -6,13 +6,15 @@
   	PROPERTY SETUP
        ========================================================================================== -->
   
  -	<!-- give user chance to override properties -->
  +	<!-- set up 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}/ant.properties"/>
  +	<property file="${basedir}/../ant.properties"/>
   	<property file="${basedir}/default.properties"/>
  +	<property file="${basedir}/../default.properties"/>
  +	<property file="${basedir}/../cocoon.properties"/>
  +
   
     <!-- Set the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  @@ -163,7 +165,7 @@
         <fileset dir="${build.classes}" excludes="**/gui/*"/>
         <fileset dir="${build.xdoclet}">
           <include name="**/*.xinfo"/>
  -      </fileset>       
  +      </fileset>
       </jar>
       
     </target>
  
  
  
  1.2       +8 -63     jakarta-avalon-apps/ftpserver/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/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	26 Jul 2002 14:21:59 -0000	1.2
  @@ -1,70 +1,15 @@
  -# -------------------------------------------------------------------
  -# 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 Demos
  +# ============================================================================
  +# Overrides the incorrect values in ../default.properties.
   
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   #           DOC GENERATION CONFIGURATION
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   
   name=ftp-server
   Name=Avalon Apps FtpServer
  -dir-name=xcommander
  +dir-name=ftpserver
   version=1.0
   package-version=1.0
  -year=2001-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=.
  +year=2001-2002
  \ No newline at end of file
  
  
  
  1.59      +14 -8     jakarta-avalon-apps/demo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/build.xml,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- build.xml	14 Jul 2002 16:43:31 -0000	1.58
  +++ build.xml	26 Jul 2002 14:21:59 -0000	1.59
  @@ -1,14 +1,20 @@
   <?xml version="1.0"?>
   
   <project name="Demo Apps" default="main" basedir=".">
  -	<!-- give user chance to override properties -->
  +
  +<!-- ==========================================================================================
  +	PROPERTY SETUP
  +     ========================================================================================== -->
  +
  +	<!-- set up 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}/ant.properties"/>
  +	<property file="${basedir}/../ant.properties"/>
   	<property file="${basedir}/default.properties"/>
  -  
  +	<property file="${basedir}/../default.properties"/>
  +	<property file="${basedir}/../cocoon.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"/>
  @@ -563,10 +569,10 @@
   ========================================================================================== -->
   
   	<!-- Creates all docs -->
  -	<target name="docs" depends="html-docs, javadocs" description="generates all the Avalon documentation"/>
  +	<target name="docs" depends="html-docs, javadocs" description="generates all the documentation"/>
   
   	<!-- copy docs to site dir -->
  -	<target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  +	<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}">
  @@ -597,7 +603,7 @@
   	</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 -->
  +		<!-- we call the build.xml target common to all of avalon-apps. This builds our html site -->
   		<ant antfile="${basedir}/../cocoonbuild.xml"/>
   	</target>
   </project>
  
  
  
  1.2       +18 -66    jakarta-avalon-apps/demo/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/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	26 Jul 2002 14:21:59 -0000	1.2
  @@ -1,70 +1,22 @@
  -# -------------------------------------------------------------------
  -# 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 Demos
  +# ============================================================================
  +# Overrides the incorrect values in ../default.properties.
   
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   #           DOC GENERATION CONFIGURATION
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   
  -name=demo
  -Name=Demo
  -dir-name=demo
  -version=0.7
  -package-version=1.0
  -year=2000-2002
  +name				= demo
  +Name				= Avalon Apps Demos
  +dir-name			= demo
  +version				= 0.7
  +package-version			= 1.0
  +year				= 2000-2002
  +
  +# ----------------------------------------------------------------------------
  +#           OVERRIDE SOME STANDARD TARGETS
  +# ----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#                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=.
  +override.compile		= true
  +override.sar			= true
  \ No newline at end of file
  
  
  
  1.1                  jakarta-avalon-apps/demo/newbuild.xml
  
  Index: newbuild.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!--
  ==============================================================================
   Avalon Applications Demos build file
  
  This buildfile doesn't work as it should (yet) because Demo apps has special
  requirments: it creates several sar files so generally works differently. The
  common script should be expanded to take this into account.
  
  Type 'ant' to build. The flag '-projecthelp' will list normal targets. If
  combined with '-verbose', all targets are printed.
  
  This buildfile delegates all of the actual functionality to the main
  avalon-apps buildfile using the <ant/> task, calling targets that are named
  module:{xxx}.
  
  Authors:
  	Leo Simons <lsimons@multimia.com>
  
  Legal:
  	Copyright (c) 2002 The Apache Software Foundation. All Rights Reserved.
  ==============================================================================
  -->
  <project name="Demo Apps" default="main" basedir=".">
  
  <!-- ==========================================================================================
  	DEFAULT TARGETS
       ========================================================================================== -->
  
  	<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"/>
  
  <!-- ==========================================================================================
  	CUSTOM TARGETS
       ========================================================================================== -->
  
  	<!-- Custom setup because of custom compile -->
  	<target name="custom: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="altrmiproxies" classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
  			<classpath refid="project.class.path" />
  		</taskdef>
  
  	</target>
  
    <!-- Custom compile target because of check for glue -->
    <target name="custom:compile" depends="custom:setup">
  
      <available classname="electric.registry.Registry"
          classpathref="project.class.path"
          property="glue.present"/>
  
      <mkdir dir="${build.classes}"/>
      <mkdir dir="${build.dir}/genjava"/>
      <mkdir dir="${build.dir}/genclasses"/>
      <mkdir dir="${build.dir}/genjava2"/>
      <mkdir dir="${build.dir}/genclasses2"/>
  
      <javac srcdir="${java.dir}"
             destdir="${build.classes}"
             debug="${build.debug}"
             optimize="${build.optimize}"
             deprecation="${build.deprecation}">
        <classpath refid="project.class.path" />
  
        <exclude name="org/apache/avalon/apps/demos/soaphelloworldserver/**.java"
                 unless="glue.present" />
  
      </javac>
  
      <rmic base="${build.classes}"
            classname="org.apache.avalon.apps.demos.rmihelloworldserver.RMIHelloWorldServerImpl"
            stubVersion="1.2">
        <classpath refid="project.class.path"/>
      </rmic>
  
      <altrmiproxies genname="helloworld" srcgendir="build/genjava"
          interfaces="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
          classgendir="build/genclasses">
        <classpath>
          <pathelement location="../common/lib/excalibur-altrmi-client-interfaces.jar"/>
          <pathelement location="../common/lib/excalibur-altrmi-client-impl.jar"/>
          <pathelement location="../common/lib/excalibur-altrmi-common.jar"/>
          <pathelement location="../common/lib/excalibur-altrmi-generator.jar"/>
          <pathelement path="${build.classes}"/>
        </classpath>
      </altrmiproxies>
  
      <copy todir="${build.classes}">
        <fileset dir="${java.dir}">
          <exclude name="**/test/**"/>
          <exclude name="**/*.java"/>
        </fileset>
      </copy>
  
    </target>
  
    <!-- Custom jar target because project is split up -->
    <target name="custom:jar" depends="custom:compile, phoenix-xdoclet, no-phoenix-xdoclet">
  
      <mkdir dir="${build.lib}"/>
  
      <jar jarfile="${build.lib}/demo-helloworld.jar"
           basedir="${build.classes}"
           manifest="${build.xdoclet}/helloworld-demo.mf">
        <include name="org/apache/avalon/apps/demos/helloworldserver/*"/>
        <fileset dir="${build.xdoclet}">
          <include name="org/apache/avalon/apps/demos/helloworldserver/*.xinfo"/>
        </fileset>   
      </jar>
  
      <jar jarfile="${build.lib}/demo-soaphelloworld.jar"
           basedir="${build.classes}"
           manifest="${build.xdoclet}/soaphelloworld-demo.mf">
        <include name="org/apache/avalon/apps/demos/soaphelloworldserver/*"/>
        <fileset dir="${build.xdoclet}">
          <include name="org/apache/avalon/apps/demos/soaphelloworldserver/*.xinfo"/>
        </fileset>
      </jar>
  
      <jar jarfile="${build.lib}/demo-rmihelloworld.jar"
           basedir="${build.classes}"
           manifest="${build.xdoclet}/rmihelloworld-demo.mf">
        <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*"/>
        <fileset dir="${build.xdoclet}">
          <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*.xinfo"/>
        </fileset>      
  
      </jar>
  
      <jar jarfile="${build.lib}/demo-altrmihelloworld.jar"
           manifest="${build.xdoclet}/altrmihelloworld-demo.mf">      
        <fileset dir="${build.classes}">
          <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*"/>
        </fileset>
        <fileset dir="${build.xdoclet}">
          <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.xinfo"/>
        </fileset>      
  
      </jar>
  
      <jar jarfile="${build.lib}/HelloWorldAltrmiProxy.jar" compress="false">
        <fileset dir="build/genclasses">
          <include name="**"/>
        </fileset>
      </jar>
  
      <mkdir dir="build/temp"/>
      <unzip src="../common/lib/excalibur-altrmi-common.jar" dest="build/temp" />
      <unzip src="../common/lib/excalibur-altrmi-client-interfaces.jar" dest="build/temp" />
      <unzip src="../common/lib/excalibur-altrmi-client-impl.jar" dest="build/temp" />
  
      <jar jarfile="${build.lib}/avalon-altrmidemo-tester.jar" compress="false" manifest="${manifest.dir}/AltrmiHelloWorldTest.mf">
        <fileset dir="build/genclasses">
          <include name="**"/>
        </fileset>
        <fileset dir="build/temp">
          <include name="org/apache/commons/**"/>
        </fileset>
        <fileset dir="build/classes">
          <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServer.class"/>
          <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerTester.class"/>
          <include name="org/apache/avalon/apps/demos/helloworldserver/HelloWorldServer.class"/>
        </fileset>
      </jar>
  
      <delete    dir="build/temp"/>
  
  
    </target>
  
    <target name="custom:sar" depends="jar, custom:soapdemo-sar, custom:rmidemo-sar, custom:altrmidemo-sar">
  
      <sar sarfile="${build.lib}/avalon-demo.sar"
           config="${conf.dir}/avalon-demo-config.xml"
           environment="${conf.dir}/avalon-demo-environment.xml"
           assembly="${conf.dir}/avalon-demo-assembly.xml" >
  
        <lib dir="${build.lib}/">
          <include name="demo-helloworld.jar"/>
        </lib>
  
        <lib dir="../common/lib">
          <include name="cornerstone.jar"/>
        </lib>
  
      </sar>
  
      <mkdir dir="dist"/>
  
      <copy todir="dist">
        <fileset dir="${build.lib}">
          <include name="*.sar"/>
        </fileset>
      </copy>
  
    </target>
  
    <target name="custom:soapdemo-sar" depends="custom:jar" if="glue.present">
  
      <sar sarfile="${build.lib}/avalon-soapdemo.sar"
           config="${conf.dir}/avalon-gluedemo-config.xml"
           environment="${conf.dir}/avalon-gluedemo-environment.xml"
           assembly="${conf.dir}/avalon-gluedemo-assembly.xml" >
  
        <lib dir="${build.lib}/">
          <include name="demo-helloworld.jar"/>
          <include name="demo-soaphelloworld.jar"/>
        </lib>
  
        <lib dir="../common/lib">
          <include name="cornerstone.jar"/>
        </lib>
  
        <lib dir="lib">
          <include name="GLUE-STD.jar"/>
          <include name="jndi.jar"/>
          <include name="ejb.jar"/>
          <include name="servlet.jar"/>
          <include name="jcert.jar"/>
          <include name="jnet.jar"/>
          <include name="jsse.jar"/>
        </lib>
      </sar>
  
    </target>
  
    <target name="custom:rmidemo-sar" depends="custom:jar">
  
      <sar sarfile="${build.lib}/avalon-rmidemo.sar"
           config="${conf.dir}/avalon-rmidemo-config.xml"
           environment="${conf.dir}/avalon-rmidemo-environment.xml"
           assembly="${conf.dir}/avalon-rmidemo-assembly.xml" >
  
        <lib dir="${build.lib}/">
          <include name="demo-rmihelloworld.jar"/>
        </lib>
  
        <lib dir="../common/lib">
          <include name="cornerstone.jar"/>
        </lib>
  
      </sar>
  
    </target>
  
    <target name="custom:altrmidemo-sar" depends="custom:jar">
  
      <sar sarfile="${build.lib}/avalon-altrmidemo.sar"
           config="${conf.dir}/avalon-altrmidemo-config.xml"
           environment="${conf.dir}/avalon-altrmidemo-environment.xml"
           assembly="${conf.dir}/avalon-altrmidemo-assembly.xml" >
  
        <lib dir="${build.lib}/">
          <include name="demo-helloworld.jar"/>
          <include name="demo-altrmihelloworld.jar"/>
        </lib>
  
        <lib dir="../common/lib">
          <include name="cornerstone.jar"/>
        </lib>
  
        <lib dir="../common/lib">
          <include name="excalibur-altrmi-common.jar"/>
          <include name="excalibur-altrmi-server-interfaces.jar"/>
          <include name="excalibur-altrmi-server-impl.jar"/>
          <include name="excalibur-altrmi-generator.jar"/>
        </lib>
  
        <fileset dir="${build.lib}">
          <include name="HelloWorldAltrmiProxy.jar"/>
        </fileset>
  
      </sar>
  
    </target>
  
  <!-- ==========================================================================================
  	COMPILE TARGETS
       ========================================================================================== -->
  
  	<target name="compile">
  		<antcall target="custom:compile"/>
  	</target>
  
  	<target name="phoenix-xdoclet" depends="compile">
  		<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>
  
  	<target name="no-phoenix-xdoclet" depends="compile">
  		<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>
  
  	<target name="check" depends="compile">
  		<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" depends="compile"
  			description="Run unit tests to verify the application works corretly.">
  		<ant antfile="${basedir}/../build.xml" target="module:test"/>
  	</target>
  
  
  <!-- ==========================================================================================
  	DISTRIBUTION TARGETS
       ========================================================================================== -->
  
  	<target name="jars">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="WARNING: Deprecated. Use the jar target instead" />
  		<echo message="-------------------------------------------------------------" />
  		<antcall target ="custom:jar"/>
  	</target>
  	<target name="jar">
  		<antcall target ="custom:jar"/>
  	</target>
  
  	<target name="sars">
  		<echo message="-------------------------------------------------------------" />
  		<echo message="WARNING: Deprecated. Use the jar target instead" />
  		<echo message="-------------------------------------------------------------" />
  		<antcall target ="custom:sar"/>
  	</target>
  	<target name="sar">
  		<ant antfile="${basedir}/../build.xml" target="module:sar"/>
  		<antcall target ="custom:sar"/>
  	</target>
  
  	<target name="dist" depends="compile">
  		<ant antfile="${basedir}/../build.xml" target="module:dist"/>
  	</target>
  
  	<target name="bin-dist" depends="compile">
  		<ant antfile="${basedir}/../build.xml" target="module:bin-dist"/>
  	</target>
  
  	<target name="src-dist" depends="compile">
  		<ant antfile="${basedir}/../build.xml" target="module:src-dist"/>
  	</target>
  
  	<target name="install" depends="compile" description="Installs into Phoenix">
  		<ant antfile="${basedir}/../build.xml" target="module:install"/>
  	</target>
  
  	<target name="uninstall" description="Uninstalls from Phoenix">
  		<ant antfile="${basedir}/../build.xml" target="module:uninstall"/>
  	</target>
  
  	<target name="clean" description="Cleans up artifacts from build process">
  		<ant antfile="${basedir}/../build.xml" target="module:clean"/>
  	</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
  ========================================================================================== -->
  
  	<!-- copy docs to site dir -->
  	<target name="site" depends="docs" description=" Places Docs ready for hosting on website">
  		<ant antfile="${basedir}/../build.xml" target="module:site"/>
  	</target>
  
  	<!-- Creates javadocs -->
  	<target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  		<ant antfile="${basedir}/../build.xml" target="module:javadocs"/>
  	</target>
  
  	<target name="html-docs" description="generates the xdocs-based documentation">
  		<ant antfile="${basedir}/../build.xml" target="module:html-docs"/>
  	</target>
  </project>
  
  
  
  1.56      +5 -8      jakarta-avalon-apps/db/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- build.xml	14 Jul 2002 16:43:31 -0000	1.55
  +++ build.xml	26 Jul 2002 14:21:59 -0000	1.56
  @@ -6,17 +6,14 @@
   	PROPERTY SETUP
        ========================================================================================== -->
   
  -	<!-- give user chance to override properties -->
  +	<!-- set up 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}/ant.properties"/>
  +	<property file="${basedir}/../ant.properties"/>
   	<property file="${basedir}/default.properties"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="on"/>
  +	<property file="${basedir}/../default.properties"/>
  +	<property file="${basedir}/../cocoon.properties"/>
   
     <!-- Set the installation variables for Cornerstone/Phoenix -->
     <property name="phoenix.home" value="../../jakarta-avalon-phoenix/dist"/>
  
  
  
  1.2       +12 -66    jakarta-avalon-apps/db/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/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	26 Jul 2002 14:21:59 -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 AvalonDB
  +# ============================================================================
  +# Overrides the incorrect values in ../default.properties.
   
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   #           DOC GENERATION CONFIGURATION
  -# --------------------------------------------------
  +# ----------------------------------------------------------------------------
   
  -name=avalon-db
  -Name=AvalonDB
  -dir-name=db
  -version=0.3
  -package-version=1.0
  -year=2000-2002
  +name				= avalondb
  +Name				= Avalon Apps AvalonDB
  +dir-name			= db
  +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