You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/03/01 06:00:31 UTC

cvs commit: avalon-apps/demo build.xml

donaldp     2003/02/28 21:00:31

  Modified:    demo     build.xml
  Log:
  style
  
  Revision  Changes    Path
  1.78      +531 -533  avalon-apps/demo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/demo/build.xml,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- build.xml	17 Feb 2003 22:37:58 -0000	1.77
  +++ build.xml	1 Mar 2003 05:00:31 -0000	1.78
  @@ -2,542 +2,540 @@
   
   <project name="Demo Apps" default="main" basedir=".">
   
  -<!-- ==========================================================================================
  -	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="../../avalon-phoenix/dist"/>
  -  <property name="install.dir" value="${phoenix.home}/apps"/>
  -
  -  <!-- Set the properties for intermediate directory -->
  -  <property name="build.dir" value="build"/>
  -  <property name="build.lib" value="${build.dir}/lib"/>
  -  <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
  -  <property name="build.src" value="${build.dir}/src"/>
  -  <property name="build.classes" value="${build.dir}/classes"/>
  -  <property name="build.javadocs" value="${build.dir}/javadocs"/>
  -  <property name="build.docs" value="${build.dir}/docs"/>
  -  <property name="build.context" value="${build.dir}/documentation"/>
  -  <property name="build.xdocs" value="${build.context}/content/xdocs"/>
  -
  -  <!-- Set the properties for source directories -->
  -  <property name="src.dir" value="src"/>
  -  <property name="java.dir" value="${src.dir}/java"/>
  -  <property name="manifest.dir" value="${src.dir}/manifest"/>
  -  <property name="conf.dir" value="${src.dir}/conf"/>
  -  <property name="context.dir" value="../../avalon/src/documentation"/>
  -  <property name="xdocs.dir" value="${src.dir}/xdocs"/>
  -  <property name="tools.dir" location="../../avalon/tools"/>
  -
  -  <property name="dist.base" value="distributions"/>
  -
  -  <path id="project.class.path">
  -    <pathelement path="${java.class.path}" />
  -    <pathelement path="${build.classes}" />
  -    <fileset dir="../common/lib">
  -      <include name="**/*.jar" />
  -    </fileset>
  -    <fileset dir="lib">
  -      <include name="readme.txt" />
  -    </fileset>
  -  </path>
  -
  -
  -  <path id="tools.class.path">
  -    <path refid="project.class.path"/>
  -    <pathelement location="${xerces.jar}"/>
  -    <pathelement location="${xalan.jar}"/>
  -    <pathelement location="${tools.jar}"/>
  -    <fileset dir="${tools.dir}/lib">
  -      <exclude name="ant.jar" />
  -    </fileset>
  -  </path>
  -
  -  <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  -    <classpath refid="project.class.path" />
  -  </taskdef>
  -  
  -  <taskdef name="altrmiproxies" classname="org.apache.altrmi.generator.ant.ProxyGenerationTask">
  -    <classpath refid="project.class.path" />
  -  </taskdef>
  -
  -  <!-- Compiles project -->
  -  <target name="compile">
  -
  -    <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" />
  -
  -    </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.dir}/genjava" 
  -        interfaces="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
  -        classgendir="${build.dir}/genclasses">
  -      <classpath>
  -        <pathelement location="../common/lib/altrmi-client-interfaces-0.9.1.jar"/>
  -        <pathelement location="../common/lib/altrmi-client-impl-0.9.1.jar"/>
  -        <pathelement location="../common/lib/altrmi-common-0.9.1.jar"/>
  -        <pathelement location="../common/lib/altrmi-generator-0.9.1.jar"/>
  +    <!-- ==========================================================================================
  +        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="../../avalon-phoenix/dist"/>
  +    <property name="install.dir" value="${phoenix.home}/apps"/>
  +
  +    <!-- Set the properties for intermediate directory -->
  +    <property name="build.dir" value="build"/>
  +    <property name="build.lib" value="${build.dir}/lib"/>
  +    <property name="build.metagenerate" value="${build.dir}/metagenerate"/>
  +    <property name="build.src" value="${build.dir}/src"/>
  +    <property name="build.classes" value="${build.dir}/classes"/>
  +    <property name="build.javadocs" value="${build.dir}/javadocs"/>
  +    <property name="build.docs" value="${build.dir}/docs"/>
  +    <property name="build.context" value="${build.dir}/documentation"/>
  +    <property name="build.xdocs" value="${build.context}/content/xdocs"/>
  +
  +    <!-- Set the properties for source directories -->
  +    <property name="src.dir" value="src"/>
  +    <property name="java.dir" value="${src.dir}/java"/>
  +    <property name="manifest.dir" value="${src.dir}/manifest"/>
  +    <property name="conf.dir" value="${src.dir}/conf"/>
  +    <property name="context.dir" value="../../avalon/src/documentation"/>
  +    <property name="xdocs.dir" value="${src.dir}/xdocs"/>
  +    <property name="tools.dir" location="../../avalon/tools"/>
  +
  +    <property name="dist.base" value="distributions"/>
  +
  +    <path id="project.class.path">
  +        <pathelement path="${java.class.path}"/>
           <pathelement path="${build.classes}"/>
  -      </classpath>        
  -    </altrmiproxies>
  +        <fileset dir="../common/lib">
  +            <include name="**/*.jar"/>
  +        </fileset>
  +        <fileset dir="lib">
  +            <include name="readme.txt"/>
  +        </fileset>
  +    </path>
  +
  +    <path id="tools.class.path">
  +        <path refid="project.class.path"/>
  +        <pathelement location="${xerces.jar}"/>
  +        <pathelement location="${xalan.jar}"/>
  +        <pathelement location="${tools.jar}"/>
  +        <fileset dir="${tools.dir}/lib">
  +            <exclude name="ant.jar"/>
  +        </fileset>
  +    </path>
  +
  +    <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  +        <classpath refid="project.class.path"/>
  +    </taskdef>
   
  -    <copy todir="${build.classes}">
  -      <fileset dir="${java.dir}">
  -        <exclude name="**/test/**"/>
  -        <exclude name="**/*.java"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
  -  <!-- Make .xinfo and manifest automatically for blocks -->
  -  <target name="phoenix-metagenerate" depends="compile">
  -  
  -    <mkdir dir="${build.metagenerate}"/>
  -  
  -    <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  -      <classpath refid="project.class.path" />
  +    <taskdef name="altrmiproxies" classname="org.apache.altrmi.generator.ant.ProxyGenerationTask">
  +        <classpath refid="project.class.path"/>
       </taskdef>
   
  -    <mkdir dir="${build.metagenerate}"/>
  +    <!-- Compiles project -->
  +    <target name="compile">
   
  -    <generatemeta dest="${build.metagenerate}">
  -      <fileset dir="${java.dir}">
  -        <include name="**/*.java" />
  -      </fileset>
  -    </generatemeta>
  -    
  -  </target>
  -
  -  <!-- Jars up project -->
  -  <target name="jars" depends="phoenix-metagenerate">
  -
  -    <mkdir dir="${build.lib}"/>
  -
  -    <jar jarfile="${build.lib}/demo-helloworld.jar"
  -         basedir="${build.classes}">
  -
  -      <include name="org/apache/avalon/apps/demos/helloworldserver/*"/>
  -      <fileset dir="${build.metagenerate}">
  -        <include name="org/apache/avalon/apps/demos/helloworldserver/*.xinfo"/>
  -        <include name="org/apache/avalon/apps/demos/helloworldserver/*.mxinfo"/>
  -      </fileset>
  -    </jar>
  -
  -    <jar jarfile="${build.lib}/demo-rmihelloworld.jar"
  -         basedir="${build.classes}">
  -      <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*"/>
  -      <fileset dir="${build.metagenerate}">
  -        <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*.xinfo"/>
  -        <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*.mxinfo"/>
  -      </fileset>
  -
  -    </jar>
  -
  -    <jar jarfile="${build.lib}/demo-altrmihelloworld.jar">      
  -      <fileset dir="${build.classes}">
  -        <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*"/>
  -      </fileset>
  -      <fileset dir="${build.metagenerate}">
  -        <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.xinfo"/>
  -        <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.mxinfo"/>
  -      </fileset>
  -
  -    </jar>
  -
  -    <jar jarfile="${build.lib}/HelloWorldAltrmiProxy.jar" compress="false">
  -      <fileset dir="${build.dir}/genclasses">
  -        <include name="**"/>
  -      </fileset>
  -    </jar>
  -
  -    <jar jarfile="${build.lib}/demo-lifecycle.jar"
  -         basedir="${build.classes}">
  -
  -      <include name="org/apache/avalon/apps/demos/lifecycledemo/*"/>
  -      <fileset dir="${build.metagenerate}">
  -        <include name="org/apache/avalon/apps/demos/lifecycledemo/*.xinfo"/>
  -        <include name="org/apache/avalon/apps/demos/lifecycledemo/*.mxinfo"/>
  -      </fileset>
  -    </jar>
  -
  -    <mkdir dir="${build.dir}/temp"/>
  -    <unzip src="../common/lib/altrmi-common-0.9.1.jar" dest="${build.dir}/temp" />
  -    <unzip src="../common/lib/altrmi-client-interfaces-0.9.1.jar" dest="${build.dir}/temp" />
  -    <unzip src="../common/lib/altrmi-client-impl-0.9.1.jar" dest="${build.dir}/temp" />
  -
  -    <jar jarfile="${build.lib}/avalon-altrmidemo-tester.jar" compress="false" manifest="${manifest.dir}/AltrmiHelloWorldTest.mf">
  -      <fileset dir="${build.dir}/genclasses">
  -        <include name="**"/>
  -      </fileset>
  -      <fileset dir="${build.dir}/temp">
  -        <include name="org/apache/altrmi/**"/>
  -      </fileset>
  -      <fileset dir="${build.dir}/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.dir}/temp"/>
  -
  -
  -  </target>
  -
  -  <target name="main" depends="sars" description="Default target to generate build products minus docs"/>
  -  <target name="all" depends="main,docs" description="Generate build products including docs"/>
  -
  -  <target name="sars" depends="jars, demo-sar, rmidemo-sar, altrmidemo-sar, lifecycledemo-sar" description="Create SARs">
  -
  -    <mkdir dir="dist"/>
  -
  -    <copy todir="dist">
  -      <fileset dir="${build.lib}">
  -        <include name="*.sar"/>
  -        <include name="*-tester.jar"/>
  -      </fileset>
  -    </copy>
  -  
  -  </target>
  -
  -  <target name="demo-sar" depends="jars" description="Create the demo 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>
  -
  -  </target>
  -
  -  <target name="rmidemo-sar" depends="jars" description="Create the RMI demo SAR">
  -
  -    <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="altrmidemo-sar" depends="jars" description="Create the AltRMI demo SAR">
  -
  -    <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="altrmi-common-0.9.1.jar"/>
  -        <include name="altrmi-server-interfaces-0.9.1.jar"/>
  -        <include name="altrmi-server-impl-0.9.1.jar"/>
  -        <include name="altrmi-generator-0.9.1.jar"/>        
  -        <include name="altrmi-blocks-0.9.1.jar"/>
  -        <include name="altrmi-registry-0.9.1.jar"/>
  -      </lib>
  -      
  -      <fileset dir="${build.lib}">
  -        <include name="HelloWorldAltrmiProxy.jar"/>
  -      </fileset>      
  -      
  -    </sar>
  -
  -  </target>
  -
  -  <target name="lifecycledemo-sar" depends="jars" description="Create the lifecycle SAR">
  -
  -    <sar sarfile="${build.lib}/avalon-lifecycledemo.sar"
  -         config="${conf.dir}/avalon-lifecycledemo-config.xml"
  -         environment="${conf.dir}/avalon-lifecycledemo-environment.xml"
  -         assembly="${conf.dir}/avalon-lifecycledemo-assembly.xml" >
  -
  -      <lib dir="${build.lib}/">
  -        <include name="demo-lifecycle.jar"/>
  -      </lib>
  -
  -    </sar>
  -
  -  </target>
  -
  -
  -  <!-- Performs unit tests -->
  -  <target name="check" depends="compile" description="Perform any built in tests">
  -  </target>
  -
  -  <!-- Performs rmi related unit tests -->
  -  <target name="check-rmi" depends="compile">
  -    <java classname="org.apache.avalon.apps.demos.rmihelloworldserver.RMIHelloWorldClient">
  -      <classpath refid="project.class.path" />
  -      <arg value="localhost" />
  -      <arg value="1099" />
  -      <arg value="RMIfication Tester" />
  -    </java>
  -  </target>
  -  
  -  <!-- Performs Altrmi related unit tests -->
  -  <target name="test-altrmi" depends="compile">
  -    <java classname="org.apache.avalon.apps.demos.altrmihelloworldserver.AltrmiHelloWorldServerTester">
  -      <classpath>
  -        <pathelement location="${build.dir}/lib/avalon-altrmidemo-tester.jar"/>
  -      </classpath>
  -    </java>
  -  </target>
  -
  -
  -  <!-- Performs unit tests -->
  -  <target name="rmi-demo-test" depends="check-rmi" description="Change the HelloWorld message via the RMI API (a test aid)"/>
  -
  -  <!-- Completely build all dists -->
  -  <target name="dist" description="Generates the distribution">
  -
  -    <property name="dist.name" value="${Name}-${version}"/>
  -
  -    <mkdir dir="${dist.base}"/>
  -
  -    <antcall target="bin-dist" inheritAll="false">
  -      <param name="bin.dist.dir" value="${dist.name}" />
  -    </antcall>
  -
  -    <zip zipfile="${dist.base}/${dist.name}-bin.zip"
  -         basedir="${dist.name}/.."
  -         includes="${dist.name}/**"/>
  -
  -    <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  -      <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  -        <include name="${dist.name}/**"/>
  -      </tarfileset>
  -    </tar>
  -
  -    <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  -          src="${dist.base}/${dist.name}-bin.tar"/>
  -
  -    <delete file="${dist.base}/${dist.name}-bin.tar"/>
  -    <delete dir="${dist.name}" />
  -
  -    <antcall target="src-dist" inheritAll="false">
  -      <param name="src.dist.dir" value="${dist.name}" />
  -    </antcall>
  -
  -    <zip zipfile="${dist.base}/${dist.name}-src.zip"
  -         basedir="${dist.name}/.."
  -         includes="${dist.name}/**">
  -      <fileset dir="..">
  -        <include name="common/lib/altrmi*"/>
  -        <include name="common/lib/avalon-*"/>
  -        <include name="common/lib/cornerstone.jar"/>
  -        <include name="common/lib/phoenix-*"/>
  -        <include name="common/lib/qdox-*"/>
  -      </fileset>
  -    </zip>
  -
  -    <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
  -      <tarfileset dir="${dist.name}/.." mode="755" username="avalon" group="avalon">
  -        <include name="${dist.name}/build.sh"/>
  -      </tarfileset>
  -      <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  -        <include name="${dist.name}/**"/>
  -        <exclude name="${dist.name}/build.sh"/>
  -      </tarfileset>
  -      <tarfileset dir=".." username="avalon" group="avalon">
  -        <include name="common/lib/altrmi*"/>
  -        <include name="common/lib/avalon-*"/>
  -        <include name="common/lib/cornerstone.jar"/>
  -        <include name="common/lib/phoenix-*"/>
  -        <include name="common/lib/qdox-*"/>
  -
  -      </tarfileset>
  -      
  -    </tar>
  -
  -    <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
  -          src="${dist.base}/${dist.name}-src.tar"/>
  -    <delete file="${dist.base}/${dist.name}-src.tar"/>
  -    <delete dir="${dist.name}" />
  -
  -  </target>
  -
  -  <!-- Creates all the .sar files -->
  -  <target name="bin-dist" depends="all">
  -
  -    <!-- bin.dist.dir usually set before this target is called -->
  -    <property name="bin.dist.dir" value="dist"/>
  -    <property name="bin.dist.lib" value="${bin.dist.dir}/lib"/>
  -    <property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
  -
  -    <mkdir dir="${bin.dist.docs}"/>
  -    <copy todir="${bin.dist.docs}">
  -      <fileset dir="${build.docs}"/> 
  -    </copy>
  -
  -    <copy file="${build.lib}/avalon-demo.sar" tofile="${bin.dist.dir}/avalon-demo-${version}.sar"/>
  -    <copy file="${build.lib}/avalon-lifecycledemo.sar" tofile="${bin.dist.dir}/avalon-lifecycledemo-${version}.sar"/>
  -    <copy file="${build.lib}/avalon-altrmidemo.sar" tofile="${bin.dist.dir}/avalon-altrmidemo-${version}.sar"/>
  -    <copy file="${build.lib}/avalon-altrmidemo-tester.jar" tofile="${bin.dist.dir}/avalon-altrmidemo-tester-${version}.jar"/>
  -
  -    <chmod dir="${bin.dist.dir}" perm="go-rwx" />
  -  </target>
  -
  -  <target name="src-dist" depends="docs">
  -    <!-- src.dist.dir has usually already been set -->
  -    <property name="src.dist.dir" value="dist-src"/>
  -    <property name="src.dist.src" value="${src.dist.dir}/src"/>
  -    <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
  -
  -    <mkdir dir="${src.dist.docs}"/>
  -
  -    <copy todir="${src.dist.docs}">
  -      <fileset dir="${build.docs}"/> 
  -    </copy>
  -
  -    <copy todir="${src.dist.src}">
  -      <fileset dir="${src.dir}"/>
  -    </copy>
  -
  -    <zip zipfile="${src.dist.src}/generated-by-metagenerate.zip"
  -         basedir="${build.metagenerate}"/>
  -
  -    <copy todir="${src.dist.dir}">
  -      <fileset dir=".">
  -        <include name="build.xml"/>
  -      </fileset>
  -    </copy>
  -    
  -    <mkdir dir="${src.dist.dir}/lib"/>
  -    <copy todir="${src.dist.dir}/lib">
  -      <fileset dir="lib">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>
  -    
  -    <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
  -
  -    <chmod dir="${src.dist.dir}" perm="go-rwx" />
  -  </target>
  -
  -  <target name="install" depends="main" description="Installs into Phoenix">
  -    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  -    <echo message="Installing to ${install.dir}" />
  -    <copy todir="${install.dir}">
  -      <fileset dir="${build.lib}">
  -        <include name="avalon-*demo.sar"/>
  -      </fileset>
  -    </copy>
  -    <delete dir="${install.dir}/avalon-*demo/**" />    
  -  </target>
  -
  -  <target name="uninstall" description="Uninstalls from Phoenix">
  -
  -    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  -    <delete dir="${install.dir}/avalon-demo/" />
  -    <delete file="avalon-demo.sar" dir="${install.dir}"/>
  -  </target>
  -
  -  <target name="clean" description="Cleans up artifacts from build process">
  -    <delete dir="${build.dir}" />
  -    <delete>
  -      <fileset dir="." includes="**/*~" defaultexcludes="no"/>
  -    </delete>
  -  </target>
  -
  -  <target name="distclean" depends="clean" description="Cleans up all generated files and directories">
  -    <delete dir="${bin.dist.dir}" />
  -    <delete dir="${dist.base}" />
  -  </target>
  -
  -<!-- ==========================================================================================
  -	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>
  +        <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"/>
  +
  +        </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.dir}/genjava"
  +            interfaces="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
  +            classgendir="${build.dir}/genclasses">
  +            <classpath>
  +                <pathelement location="../common/lib/altrmi-client-interfaces-0.9.1.jar"/>
  +                <pathelement location="../common/lib/altrmi-client-impl-0.9.1.jar"/>
  +                <pathelement location="../common/lib/altrmi-common-0.9.1.jar"/>
  +                <pathelement location="../common/lib/altrmi-generator-0.9.1.jar"/>
  +                <pathelement path="${build.classes}"/>
  +            </classpath>
  +        </altrmiproxies>
  +
  +        <copy todir="${build.classes}">
  +            <fileset dir="${java.dir}">
  +                <exclude name="**/test/**"/>
  +                <exclude name="**/*.java"/>
  +            </fileset>
  +        </copy>
  +
  +    </target>
  +
  +    <!-- Make .xinfo and manifest automatically for blocks -->
  +    <target name="phoenix-metagenerate" depends="compile">
  +
  +        <mkdir dir="${build.metagenerate}"/>
  +
  +        <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +
  +        <mkdir dir="${build.metagenerate}"/>
  +
  +        <generatemeta dest="${build.metagenerate}">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
  +        </generatemeta>
  +
  +    </target>
  +
  +    <!-- Jars up project -->
  +    <target name="jars" depends="phoenix-metagenerate">
  +
  +        <mkdir dir="${build.lib}"/>
  +
  +        <jar jarfile="${build.lib}/demo-helloworld.jar"
  +            basedir="${build.classes}">
  +
  +            <include name="org/apache/avalon/apps/demos/helloworldserver/*"/>
  +            <fileset dir="${build.metagenerate}">
  +                <include name="org/apache/avalon/apps/demos/helloworldserver/*.xinfo"/>
  +                <include name="org/apache/avalon/apps/demos/helloworldserver/*.mxinfo"/>
  +            </fileset>
  +        </jar>
  +
  +        <jar jarfile="${build.lib}/demo-rmihelloworld.jar"
  +            basedir="${build.classes}">
  +            <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*"/>
  +            <fileset dir="${build.metagenerate}">
  +                <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*.xinfo"/>
  +                <include name="org/apache/avalon/apps/demos/rmihelloworldserver/*.mxinfo"/>
  +            </fileset>
  +
  +        </jar>
  +
  +        <jar jarfile="${build.lib}/demo-altrmihelloworld.jar">
  +            <fileset dir="${build.classes}">
  +                <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*"/>
  +            </fileset>
  +            <fileset dir="${build.metagenerate}">
  +                <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.xinfo"/>
  +                <include name="org/apache/avalon/apps/demos/altrmihelloworldserver/*.mxinfo"/>
  +            </fileset>
  +
  +        </jar>
  +
  +        <jar jarfile="${build.lib}/HelloWorldAltrmiProxy.jar" compress="false">
  +            <fileset dir="${build.dir}/genclasses">
  +                <include name="**"/>
  +            </fileset>
  +        </jar>
  +
  +        <jar jarfile="${build.lib}/demo-lifecycle.jar"
  +            basedir="${build.classes}">
  +
  +            <include name="org/apache/avalon/apps/demos/lifecycledemo/*"/>
  +            <fileset dir="${build.metagenerate}">
  +                <include name="org/apache/avalon/apps/demos/lifecycledemo/*.xinfo"/>
  +                <include name="org/apache/avalon/apps/demos/lifecycledemo/*.mxinfo"/>
  +            </fileset>
  +        </jar>
  +
  +        <mkdir dir="${build.dir}/temp"/>
  +        <unzip src="../common/lib/altrmi-common-0.9.1.jar" dest="${build.dir}/temp"/>
  +        <unzip src="../common/lib/altrmi-client-interfaces-0.9.1.jar" dest="${build.dir}/temp"/>
  +        <unzip src="../common/lib/altrmi-client-impl-0.9.1.jar" dest="${build.dir}/temp"/>
  +
  +        <jar jarfile="${build.lib}/avalon-altrmidemo-tester.jar" compress="false" manifest="${manifest.dir}/AltrmiHelloWorldTest.mf">
  +            <fileset dir="${build.dir}/genclasses">
  +                <include name="**"/>
  +            </fileset>
  +            <fileset dir="${build.dir}/temp">
  +                <include name="org/apache/altrmi/**"/>
  +            </fileset>
  +            <fileset dir="${build.dir}/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.dir}/temp"/>
  +
  +    </target>
  +
  +    <target name="main" depends="sars" description="Default target to generate build products minus docs"/>
  +    <target name="all" depends="main,docs" description="Generate build products including docs"/>
  +
  +    <target name="sars" depends="jars, demo-sar, rmidemo-sar, altrmidemo-sar, lifecycledemo-sar" description="Create SARs">
  +
  +        <mkdir dir="dist"/>
  +
  +        <copy todir="dist">
  +            <fileset dir="${build.lib}">
  +                <include name="*.sar"/>
  +                <include name="*-tester.jar"/>
  +            </fileset>
  +        </copy>
  +
  +    </target>
  +
  +    <target name="demo-sar" depends="jars" description="Create the demo 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>
  +
  +    </target>
  +
  +    <target name="rmidemo-sar" depends="jars" description="Create the RMI demo SAR">
  +
  +        <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="altrmidemo-sar" depends="jars" description="Create the AltRMI demo SAR">
  +
  +        <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="altrmi-common-0.9.1.jar"/>
  +                <include name="altrmi-server-interfaces-0.9.1.jar"/>
  +                <include name="altrmi-server-impl-0.9.1.jar"/>
  +                <include name="altrmi-generator-0.9.1.jar"/>
  +                <include name="altrmi-blocks-0.9.1.jar"/>
  +                <include name="altrmi-registry-0.9.1.jar"/>
  +            </lib>
  +
  +            <fileset dir="${build.lib}">
  +                <include name="HelloWorldAltrmiProxy.jar"/>
  +            </fileset>
  +
  +        </sar>
  +
  +    </target>
  +
  +    <target name="lifecycledemo-sar" depends="jars" description="Create the lifecycle SAR">
  +
  +        <sar sarfile="${build.lib}/avalon-lifecycledemo.sar"
  +            config="${conf.dir}/avalon-lifecycledemo-config.xml"
  +            environment="${conf.dir}/avalon-lifecycledemo-environment.xml"
  +            assembly="${conf.dir}/avalon-lifecycledemo-assembly.xml">
  +
  +            <lib dir="${build.lib}/">
  +                <include name="demo-lifecycle.jar"/>
  +            </lib>
  +
  +        </sar>
  +
  +    </target>
  +
  +
  +    <!-- Performs unit tests -->
  +    <target name="check" depends="compile" description="Perform any built in tests">
  +    </target>
  +
  +    <!-- Performs rmi related unit tests -->
  +    <target name="check-rmi" depends="compile">
  +        <java classname="org.apache.avalon.apps.demos.rmihelloworldserver.RMIHelloWorldClient">
  +            <classpath refid="project.class.path"/>
  +            <arg value="localhost"/>
  +            <arg value="1099"/>
  +            <arg value="RMIfication Tester"/>
  +        </java>
  +    </target>
  +
  +    <!-- Performs Altrmi related unit tests -->
  +    <target name="test-altrmi" depends="compile">
  +        <java classname="org.apache.avalon.apps.demos.altrmihelloworldserver.AltrmiHelloWorldServerTester">
  +            <classpath>
  +                <pathelement location="${build.dir}/lib/avalon-altrmidemo-tester.jar"/>
  +            </classpath>
  +        </java>
  +    </target>
  +
  +
  +    <!-- Performs unit tests -->
  +    <target name="rmi-demo-test" depends="check-rmi" description="Change the HelloWorld message via the RMI API (a test aid)"/>
  +
  +    <!-- Completely build all dists -->
  +    <target name="dist" description="Generates the distribution">
  +
  +        <property name="dist.name" value="${Name}-${version}"/>
  +
  +        <mkdir dir="${dist.base}"/>
  +
  +        <antcall target="bin-dist" inheritAll="false">
  +            <param name="bin.dist.dir" value="${dist.name}"/>
  +        </antcall>
  +
  +        <zip zipfile="${dist.base}/${dist.name}-bin.zip"
  +            basedir="${dist.name}/.."
  +            includes="${dist.name}/**"/>
  +
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +            <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  +                <include name="${dist.name}/**"/>
  +            </tarfileset>
  +        </tar>
  +
  +        <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +            src="${dist.base}/${dist.name}-bin.tar"/>
  +
  +        <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +        <delete dir="${dist.name}"/>
  +
  +        <antcall target="src-dist" inheritAll="false">
  +            <param name="src.dist.dir" value="${dist.name}"/>
  +        </antcall>
  +
  +        <zip zipfile="${dist.base}/${dist.name}-src.zip"
  +            basedir="${dist.name}/.."
  +            includes="${dist.name}/**">
  +            <fileset dir="..">
  +                <include name="common/lib/altrmi*"/>
  +                <include name="common/lib/avalon-*"/>
  +                <include name="common/lib/cornerstone.jar"/>
  +                <include name="common/lib/phoenix-*"/>
  +                <include name="common/lib/qdox-*"/>
  +            </fileset>
  +        </zip>
  +
  +        <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar">
  +            <tarfileset dir="${dist.name}/.." mode="755" username="avalon" group="avalon">
  +                <include name="${dist.name}/build.sh"/>
  +            </tarfileset>
  +            <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  +                <include name="${dist.name}/**"/>
  +                <exclude name="${dist.name}/build.sh"/>
  +            </tarfileset>
  +            <tarfileset dir=".." username="avalon" group="avalon">
  +                <include name="common/lib/altrmi*"/>
  +                <include name="common/lib/avalon-*"/>
  +                <include name="common/lib/cornerstone.jar"/>
  +                <include name="common/lib/phoenix-*"/>
  +                <include name="common/lib/qdox-*"/>
  +
  +            </tarfileset>
  +
  +        </tar>
  +
  +        <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
  +            src="${dist.base}/${dist.name}-src.tar"/>
  +        <delete file="${dist.base}/${dist.name}-src.tar"/>
  +        <delete dir="${dist.name}"/>
  +
  +    </target>
  +
  +    <!-- Creates all the .sar files -->
  +    <target name="bin-dist" depends="all">
  +
  +        <!-- bin.dist.dir usually set before this target is called -->
  +        <property name="bin.dist.dir" value="dist"/>
  +        <property name="bin.dist.lib" value="${bin.dist.dir}/lib"/>
  +        <property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
  +
  +        <mkdir dir="${bin.dist.docs}"/>
  +        <copy todir="${bin.dist.docs}">
  +            <fileset dir="${build.docs}"/>
  +        </copy>
  +
  +        <copy file="${build.lib}/avalon-demo.sar" tofile="${bin.dist.dir}/avalon-demo-${version}.sar"/>
  +        <copy file="${build.lib}/avalon-lifecycledemo.sar" tofile="${bin.dist.dir}/avalon-lifecycledemo-${version}.sar"/>
  +        <copy file="${build.lib}/avalon-altrmidemo.sar" tofile="${bin.dist.dir}/avalon-altrmidemo-${version}.sar"/>
  +        <copy file="${build.lib}/avalon-altrmidemo-tester.jar" tofile="${bin.dist.dir}/avalon-altrmidemo-tester-${version}.jar"/>
  +
  +        <chmod dir="${bin.dist.dir}" perm="go-rwx"/>
  +    </target>
  +
  +    <target name="src-dist" depends="docs">
  +        <!-- src.dist.dir has usually already been set -->
  +        <property name="src.dist.dir" value="dist-src"/>
  +        <property name="src.dist.src" value="${src.dist.dir}/src"/>
  +        <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
  +
  +        <mkdir dir="${src.dist.docs}"/>
  +
  +        <copy todir="${src.dist.docs}">
  +            <fileset dir="${build.docs}"/>
  +        </copy>
  +
  +        <copy todir="${src.dist.src}">
  +            <fileset dir="${src.dir}"/>
  +        </copy>
  +
  +        <zip zipfile="${src.dist.src}/generated-by-metagenerate.zip"
  +            basedir="${build.metagenerate}"/>
  +
  +        <copy todir="${src.dist.dir}">
  +            <fileset dir=".">
  +                <include name="build.xml"/>
  +            </fileset>
  +        </copy>
  +
  +        <mkdir dir="${src.dist.dir}/lib"/>
  +        <copy todir="${src.dist.dir}/lib">
  +            <fileset dir="lib">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +
  +        <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
  +
  +        <chmod dir="${src.dist.dir}" perm="go-rwx"/>
  +    </target>
  +
  +    <target name="install" depends="main" description="Installs into Phoenix">
  +        <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  +        <echo message="Installing to ${install.dir}"/>
  +        <copy todir="${install.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="avalon-*demo.sar"/>
  +            </fileset>
  +        </copy>
  +        <delete dir="${install.dir}/avalon-*demo/**"/>
  +    </target>
  +
  +    <target name="uninstall" description="Uninstalls from Phoenix">
  +
  +        <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  +        <delete dir="${install.dir}/avalon-demo/"/>
  +        <delete file="avalon-demo.sar" dir="${install.dir}"/>
  +    </target>
  +
  +    <target name="clean" description="Cleans up artifacts from build process">
  +        <delete dir="${build.dir}"/>
  +        <delete>
  +            <fileset dir="." includes="**/*~" defaultexcludes="no"/>
  +        </delete>
  +    </target>
  +
  +    <target name="distclean" depends="clean" description="Cleans up all generated files and directories">
  +        <delete dir="${bin.dist.dir}"/>
  +        <delete dir="${dist.base}"/>
  +    </target>
  +
  +    <!-- ==========================================================================================
  +        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>
  
  
  

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