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/04/11 01:55:01 UTC

cvs commit: avalon-apps/httpproxy build.xml default.properties

donaldp     2003/04/10 16:55:01

  Modified:    httpproxy build.xml
  Removed:     httpproxy default.properties
  Log:
  Cleanup build file
  
  Revision  Changes    Path
  1.27      +131 -159  avalon-apps/httpproxy/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-apps/httpproxy/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	10 Apr 2003 23:46:37 -0000	1.26
  +++ build.xml	10 Apr 2003 23:55:01 -0000	1.27
  @@ -2,164 +2,136 @@
   
   <project name="HTTP Proxy Server" 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}/default.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"/>
  -
  -  <!-- 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="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="*.jar" />
  -    </fileset>
  -  </path>
  -
  -  <property name="avalon-site.dir" value="../../avalon-site"/>
  -  <path id="tools.class.path">
  -    <fileset dir="${avalon-site.dir}/lib"/>
  -  </path>
  -
  -  <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  -    <classpath refid="project.class.path" />
  -  </taskdef>
  -
  -  <!-- Help on usage -->
  -  <target name="help" depends="usage"/>
  -  <target name="usage">
  -    <echo message="Run ant -projecthelp to get a list of targets to run"/>
  -  </target>
  -
  -  <!-- Compiles project -->
  -  <target name="compile">
  -
  -    <mkdir dir="${build.classes}"/>
  -
  -    <javac srcdir="${java.dir}"
  -           destdir="${build.classes}"
  -           debug="${build.debug}"
  -           optimize="${build.optimize}"
  -           deprecation="${build.deprecation}">
  -      <classpath refid="project.class.path" />
  -    </javac>
  -
  -      <mkdir dir="${build.metagenerate}"/>
  -
  -      <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  -          <classpath refid="project.class.path"/>
  -      </taskdef>
  -
  -      <generatemeta dest="${build.metagenerate}">
  -          <fileset dir="${java.dir}">
  -              <include name="**/*.java"/>
  -          </fileset>
  -      </generatemeta>
  -
  -    <copy todir="${build.classes}">
  -      <fileset dir="${java.dir}">
  -        <exclude name="**/test/**"/>
  -        <exclude name="**/*.java"/>
  -      </fileset>
  -    </copy>
  -
  -  </target>
  -
  -  <!-- Jars up project -->
  -  <target name="jars" depends="compile">
  -
  -    <mkdir dir="${build.lib}"/>
  -
  -    <jar jarfile="${build.lib}/${name}.jar">
  -      <fileset dir="${build.classes}">
  -        <include name="org/apache/avalon/httpproxy/**"/>
  -      </fileset>
  -      <fileset dir="${build.metagenerate}">
  -        <include name="**/*.xinfo"/>
  -      </fileset>
  -    </jar>
  -
  -  </target>
  -
  -  <target name="main" depends="sars" description="Generate build products"/>
  -
  -  <target name="sars" depends="jars">
  -
  -    <sar sarfile="${build.lib}/avalon-${name}.sar"
  -         config="${conf.dir}/${name}-config.xml"
  -         environment="${conf.dir}/${name}-environment.xml"
  -         assembly="${conf.dir}/${name}-assembly.xml" >
  -
  -      <lib dir="${build.lib}/">
  -        <include name="*.jar"/>
  -      </lib>
  -
  -      <lib dir="../common/lib">
  -        <include name="cornerstone.jar"/>
  -      </lib>
  -
  -    </sar>
  -
  -    <mkdir dir="dist"/>
  -
  -    <copy todir="dist">
  -      <fileset dir="${build.lib}">
  -        <include name="**"/>
  -      </fileset>
  -    </copy>
  -  </target>
  -
  -  <target name="install" depends="main" description="Installs into Phoenix">
  -    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  -    <echo message="Installing to ${install.dir}" />
  -    <delete dir="${install.dir}/${name}" />
  -    <copy file="${build.lib}/avalon-${name}.sar" todir="${install.dir}" />
  -  </target>
  -
  -  <target name="uninstall" description="Uninstalls from Phoenix">
  -
  -    <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  -    <delete dir="${install.dir}/${name}/" />
  -    <delete file="avalon-${name}.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>
  +    <!-- set up properties -->
  +    <property file="${user.home}/build.properties"/>
  +    <property file="${user.home}/.ant.properties"/>
  +    <property file="${basedir}/ant.properties"/>
  +
  +    <property name="name" value="httpproxy"/>
  +    
  +    <!-- 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.lib" value="build/lib"/>
  +    <property name="build.metagenerate" value="build/metagenerate"/>
  +    <property name="build.src" value="build/src"/>
  +    <property name="build.classes" value="build/classes"/>
  +
  +    <!-- Set the properties for source directories -->
  +    <property name="java.dir" value="src/java"/>
  +    <property name="conf.dir" value="src/conf"/>
  +
  +    <path id="project.class.path">
  +        <pathelement path="${java.class.path}"/>
  +        <pathelement path="${build.classes}"/>
  +        <fileset dir="lib">
  +            <include name="*.jar"/>
  +        </fileset>
  +    </path>
  +
  +    <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
  +        <classpath refid="project.class.path"/>
  +    </taskdef>
  +
  +    <!-- Compiles project -->
  +    <target name="compile">
  +
  +        <mkdir dir="${build.classes}"/>
  +
  +        <javac srcdir="${java.dir}"
  +            destdir="${build.classes}"
  +            debug="${build.debug}"
  +            optimize="${build.optimize}"
  +            deprecation="${build.deprecation}">
  +            <classpath refid="project.class.path"/>
  +        </javac>
  +
  +        <mkdir dir="${build.metagenerate}"/>
  +
  +        <taskdef name="generatemeta" classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
  +            <classpath refid="project.class.path"/>
  +        </taskdef>
  +
  +        <generatemeta dest="${build.metagenerate}">
  +            <fileset dir="${java.dir}">
  +                <include name="**/*.java"/>
  +            </fileset>
  +        </generatemeta>
  +
  +        <copy todir="${build.classes}">
  +            <fileset dir="${java.dir}">
  +                <exclude name="**/test/**"/>
  +                <exclude name="**/*.java"/>
  +            </fileset>
  +        </copy>
  +
  +    </target>
  +
  +    <!-- Jars up project -->
  +    <target name="jars" depends="compile">
  +
  +        <mkdir dir="${build.lib}"/>
  +
  +        <jar jarfile="${build.lib}/${name}.jar">
  +            <fileset dir="${build.classes}">
  +                <include name="org/apache/avalon/httpproxy/**"/>
  +            </fileset>
  +            <fileset dir="${build.metagenerate}">
  +                <include name="**/*.xinfo"/>
  +            </fileset>
  +        </jar>
  +
  +    </target>
  +
  +    <target name="main" depends="sars" description="Generate build products"/>
  +
  +    <target name="sars" depends="jars">
  +
  +        <sar sarfile="${build.lib}/avalon-${name}.sar"
  +            config="${conf.dir}/${name}-config.xml"
  +            environment="${conf.dir}/${name}-environment.xml"
  +            assembly="${conf.dir}/${name}-assembly.xml">
  +
  +            <lib dir="${build.lib}/">
  +                <include name="*.jar"/>
  +            </lib>
  +
  +            <lib dir="../common/lib">
  +                <include name="cornerstone.jar"/>
  +            </lib>
  +
  +        </sar>
  +
  +        <mkdir dir="dist"/>
  +
  +        <copy todir="dist">
  +            <fileset dir="${build.lib}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +    </target>
  +
  +    <target name="install" depends="main" description="Installs into Phoenix">
  +        <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  +        <echo message="Installing to ${install.dir}"/>
  +        <delete dir="${install.dir}/${name}"/>
  +        <copy file="${build.lib}/avalon-${name}.sar" todir="${install.dir}"/>
  +    </target>
  +
  +    <target name="uninstall" description="Uninstalls from Phoenix">
  +
  +        <!-- <fail message="install.dir not specified." unless="install.dir"/> -->
  +        <delete dir="${install.dir}/${name}/"/>
  +        <delete file="avalon-${name}.sar" dir="${install.dir}"/>
  +    </target>
  +
  +    <target name="clean" description="Cleans up artifacts from build process">
  +        <delete dir="build"/>
  +        <delete>
  +            <fileset dir="." includes="**/*~" defaultexcludes="no"/>
  +        </delete>
  +    </target>
   
   </project>
  
  
  

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