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 02:27:20 UTC
cvs commit: avalon-apps/sevak jetty.xml catalina.xml jo.xml
donaldp 2003/04/10 17:27:20
Modified: sevak jetty.xml catalina.xml jo.xml
Log:
cleanup build files
Revision Changes Path
1.15 +160 -206 avalon-apps/sevak/jetty.xml
Index: jetty.xml
===================================================================
RCS file: /home/cvs/avalon-apps/sevak/jetty.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jetty.xml 23 Feb 2003 20:34:14 -0000 1.14
+++ jetty.xml 11 Apr 2003 00:27:20 -0000 1.15
@@ -1,211 +1,165 @@
<?xml version="1.0"?>
-<project default="main" basedir=".">
+<project default="sar" 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 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"/>
-
- <!-- Sevak specific properties for building -->
- <property name="build.reports" value="${build.dir}/reports"/>
- <property name="build.demoClasses" value="${build.dir}/demoClasses"/>
- <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
-
-
- <!-- 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="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
- <property name="dist.base" value="dist"/>
- <property name="do.checkstyle" value="true"/>
-
- <property name="lib.dir" value="lib"/>
- <property name="test.dir" value="${src.dir}/test"/>
- <property name="demo.dir" value="${src.dir}/demo"/>
- <property name="java.demo.dir" value="${demo.dir}/java"/>
- <property name="conf.demo.dir" value="${demo.dir}/conf"/>
-
-
-
- <!-- Jetty stuff -->
- <property name ="jetty.rel" value="4.2.8"/>
-
- <property name="jetty.jars.dir" value="${lib.dir}/jetty-jars"/>
-
- <path id="project.class.path">
- <pathelement path="${java.class.path}" />
- <pathelement path="${build.classes}" />
- <fileset dir="../common/lib">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${jetty.jars.dir}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <path id="tools.class.path">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
- </path>
-
- <path id="test.class.path">
- <fileset dir="../common/lib">
- <include name="**/*.jar" />
- </fileset>
- <pathelement path="${build.lib}/sevak-api.jar"/>
- </path>
-
- <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
- <classpath refid="project.class.path" />
- </taskdef>
-
- <target name="checkJettyJars">
- <condition property="jetty.present">
- <available file="jetty-download/Jetty-${jetty.rel}.zip"/>
- </condition>
-
- </target>
-
- <target name="checkNeccesaryJars" depends="checkJettyJars" unless="jetty.present">
- <echo>****************************</echo>
- <echo>* Please execute target *</echo>
- <echo>* 'get-jetty' in *</echo>
- <echo>* jetty.xml build file *</echo>
- <echo>* to download six mega- *</echo>
- <echo>* bytes of Jetty from *</echo>
- <echo>* Sourceforge *</echo>
- <echo>****************************</echo>
-
- <fail message="Jetty needed. See above."/>
-
- </target>
-
-
- <target name="get-jetty">
-
- <mkdir dir="jetty-download"/>
-
-
- <get src="http://unc.dl.sourceforge.net/sourceforge/jetty/Jetty-${jetty.rel}.zip"
- dest="jetty-download/Jetty-${jetty.rel}.zip"
- verbose="true"
- usetimestamp="true"/>
-
- <unzip src="jetty-download/Jetty-${jetty.rel}.zip" dest="jetty-download/Jetty-${jetty.rel}" />
-
- <delete file="${jetty.jars.dir}/*.jar"/>
-
- <copy todir="${jetty.jars.dir}" flatten="true">
- <fileset dir="jetty-download/Jetty-${jetty.rel}">
- <include name="**/lib/*.jar"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- prepare -->
- <target name="prepare" depends="checkNeccesaryJars" >
- </target>
-
-
-
- <!--- Build Test SAR Archive -->
- <target name="sar" depends="prepare" description="Builds a Demo block which uses Sevak Service">
-
-
- <ant antfile="build.xml" target="jars"/>
- <ant antfile="build.xml" target="demo-jar"/>
-
- <sar sarfile="${build.lib}/sevak-jetty-demo.sar"
- config="${conf.demo.dir}/jetty-config.xml"
- environment="${conf.demo.dir}/jetty-environment.xml"
- assembly="${conf.demo.dir}/jetty-assembly.xml" >
-
- <lib dir="${build.lib}/">
- <include name="sevak-jetty.jar"/>
- <include name="sevak-demo.jar"/>
- <include name="sevak-api.jar"/>
- </lib>
-
- <lib dir="${jetty.jars.dir}">
- <include name="javax.servlet.jar"/>
- <include name="org.apache.jasper.jar"/>
- <include name="org.mortbay.jetty-jdk1.2.jar"/>
- <include name="org.mortbay.jmx.jar"/>
- </lib>
-
- <lib dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/ext">
- <include name="jasper-compiler.jar"/>
- <include name="jasper-runtime.jar"/>
- </lib>
-
- <lib dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/ext">
- <include name="ant.jar"/>
- </lib>
-
- <zipfileset dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/ext" prefix="jsplibs">
- <include name="jasper-compiler.jar"/>
- <include name="jasper-runtime.jar"/>
- </zipfileset>
-
- <zipfileset dir="${jetty.jars.dir}" prefix="jsplibs">
- <include name="javax.servlet.jar"/>
- </zipfileset>
-
- <zipfileset dir="${build.lib}">
- <include name="sevak-demo.war"/>
- </zipfileset>
-
- </sar>
-
- <!-- Copy build/lib contents to dist/ folder -->
-
- <copy todir="${dist.base}">
- <fileset dir="${build.lib}">
- <include name="**"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="install" depends="sar" description="Installs Demo SAR into Phoenix" >
- <echo message="Installing to ${install.dir}" />
- <delete dir="${install.dir}/sevak-jetty-demo-demo" />
- <copy file="${build.lib}/sevak-jetty-demo.sar" todir="${install.dir}" />
- </target>
+ <!-- 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 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.demoClasses" value="${build.dir}/demoClasses"/>
+ <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
+
+ <!-- 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="dist"/>
+
+ <property name="lib.dir" value="lib"/>
+ <property name="test.dir" value="${src.dir}/test"/>
+ <property name="demo.dir" value="${src.dir}/demo"/>
+ <property name="java.demo.dir" value="${demo.dir}/java"/>
+ <property name="conf.demo.dir" value="${demo.dir}/conf"/>
+
+ <!-- Jetty stuff -->
+ <property name="jetty.rel" value="4.2.8"/>
+
+ <property name="jetty.jars.dir" value="${lib.dir}/jetty-jars"/>
+
+ <path id="project.class.path">
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${build.classes}"/>
+ <fileset dir="../common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${jetty.jars.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
+ <classpath refid="project.class.path"/>
+ </taskdef>
+
+ <target name="checkJettyJars">
+ <condition property="jetty.present">
+ <available file="jetty-download/Jetty-${jetty.rel}.zip"/>
+ </condition>
+
+ </target>
+
+ <target name="checkNeccesaryJars" depends="checkJettyJars" unless="jetty.present">
+ <echo>****************************</echo>
+ <echo>* Please execute target *</echo>
+ <echo>* 'get-jetty' in *</echo>
+ <echo>* jetty.xml build file *</echo>
+ <echo>* to download six mega- *</echo>
+ <echo>* bytes of Jetty from *</echo>
+ <echo>* Sourceforge *</echo>
+ <echo>****************************</echo>
+
+ <fail message="Jetty needed. See above."/>
+
+ </target>
+
+ <target name="get-jetty">
+
+ <mkdir dir="jetty-download"/>
+
+ <get src="http://unc.dl.sourceforge.net/sourceforge/jetty/Jetty-${jetty.rel}.zip"
+ dest="jetty-download/Jetty-${jetty.rel}.zip"
+ verbose="true"
+ usetimestamp="true"/>
+
+ <unzip src="jetty-download/Jetty-${jetty.rel}.zip" dest="jetty-download/Jetty-${jetty.rel}"/>
+
+ <delete file="${jetty.jars.dir}/*.jar"/>
+
+ <copy todir="${jetty.jars.dir}" flatten="true">
+ <fileset dir="jetty-download/Jetty-${jetty.rel}">
+ <include name="**/lib/*.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!--- Build Test SAR Archive -->
+ <target name="sar" depends="checkNeccesaryJars" description="Builds a Demo block which uses Sevak Service">
+
+ <ant antfile="build.xml" target="jars"/>
+ <ant antfile="build.xml" target="demo-jar"/>
+
+ <sar sarfile="${build.lib}/sevak-jetty-demo.sar"
+ config="${conf.demo.dir}/jetty-config.xml"
+ environment="${conf.demo.dir}/jetty-environment.xml"
+ assembly="${conf.demo.dir}/jetty-assembly.xml">
+
+ <lib dir="${build.lib}/">
+ <include name="sevak-jetty.jar"/>
+ <include name="sevak-demo.jar"/>
+ <include name="sevak-api.jar"/>
+ </lib>
+
+ <lib dir="${jetty.jars.dir}">
+ <include name="javax.servlet.jar"/>
+ <include name="org.apache.jasper.jar"/>
+ <include name="org.mortbay.jetty-jdk1.2.jar"/>
+ <include name="org.mortbay.jmx.jar"/>
+ </lib>
+
+ <lib dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/ext">
+ <include name="jasper-compiler.jar"/>
+ <include name="jasper-runtime.jar"/>
+ </lib>
+
+ <lib dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/ext">
+ <include name="ant.jar"/>
+ </lib>
+
+ <zipfileset dir="jetty-download/Jetty-${jetty.rel}/Jetty-${jetty.rel}/ext" prefix="jsplibs">
+ <include name="jasper-compiler.jar"/>
+ <include name="jasper-runtime.jar"/>
+ </zipfileset>
+
+ <zipfileset dir="${jetty.jars.dir}" prefix="jsplibs">
+ <include name="javax.servlet.jar"/>
+ </zipfileset>
+
+ <zipfileset dir="${build.lib}">
+ <include name="sevak-demo.war"/>
+ </zipfileset>
+
+ </sar>
+
+ <!-- Copy build/lib contents to dist/ folder -->
+
+ <copy todir="${dist.base}">
+ <fileset dir="${build.lib}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="install" depends="sar" description="Installs Demo SAR into Phoenix">
+ <echo message="Installing to ${install.dir}"/>
+ <delete dir="${install.dir}/sevak-jetty-demo-demo"/>
+ <copy file="${build.lib}/sevak-jetty-demo.sar" todir="${install.dir}"/>
+ </target>
</project>
1.12 +176 -216 avalon-apps/sevak/catalina.xml
Index: catalina.xml
===================================================================
RCS file: /home/cvs/avalon-apps/sevak/catalina.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- catalina.xml 6 Feb 2003 16:40:14 -0000 1.11
+++ catalina.xml 11 Apr 2003 00:27:20 -0000 1.12
@@ -2,221 +2,181 @@
<project 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 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"/>
-
- <!-- Sevak specific properties for building -->
- <property name="build.reports" value="${build.dir}/reports"/>
- <property name="build.demoClasses" value="${build.dir}/demoClasses"/>
- <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
-
-
- <!-- 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="demo.conf.dir" location="${demo.dir}/conf"/>
-
- <property name="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
- <property name="dist.base" value="dist"/>
- <property name="do.checkstyle" value="true"/>
-
- <property name="lib.dir" value="lib"/>
- <property name="test.dir" value="${src.dir}/test"/>
- <property name="demo.dir" value="${src.dir}/demo"/>
- <property name="java.demo.dir" value="${demo.dir}/java"/>
- <property name="conf.demo.dir" value="${demo.dir}/conf"/>
-
- <!-- Tomcat Stuff -->
- <property name="catalina-version" value="4.1.12"/>
- <property name="catalina-zip-suffix" value=""/>
- <property name="catalina-dir-suffix" value=""/>
- <property name="catalina.download" value="catalina-download/jakarta-tomcat-${catalina-version}${catalina-zip-suffix}"/>
- <property name="tomcat.jars.dir" value="${lib.dir}/tomcat-jars"/>
-
- <path id="project.class.path">
- <pathelement path="${java.class.path}" />
- <pathelement path="${build.classes}" />
- <fileset dir="../common/lib">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${tomcat.jars.dir}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <path id="tools.class.path">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
- </path>
-
- <path id="test.class.path">
- <fileset dir="../common/lib">
- <include name="**/*.jar" />
- </fileset>
- <pathelement path="${build.lib}/sevak-api.jar"/>
- </path>
-
- <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
- <classpath refid="project.class.path" />
- </taskdef>
-
- <!-- Check Presense Of Tomcat 4.0 jars -->
- <target name="checkCatalinaJars">
- <condition property="catalina.present">
- <available file="catalina-download/catalina-${catalina-version}${catalina-zip-suffix}.zip"/>
- </condition>
-
- </target>
-
- <target name="checkNeccesaryJars" depends="checkCatalinaJars" unless="catalina.present">
- <echo>**********************************</echo>
- <echo>***** Please execute target ******</echo>
- <echo>**** 'get-catalina ' ******</echo>
- <echo>**** to retrieve Tomcat4.0 ******</echo>
- <echo>**** jars or place the jars *****</echo>
- <echo>**** in ${tomcat.jars.dir} dir *****</echo>
- <echo>**********************************</echo>
-
- <fail message="Catalina needed. See above."/>
-
- </target>
-
- <!-- Get catalina jars from apache repository -->
- <target name="get-catalina">
- <mkdir dir="catalina-download"/>
- <mkdir dir="${lib.dir}"/>
- <mkdir dir="${tomcat.jars.dir}"/>
-
- <get src="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v${catalina-version}${catalina-dir-suffix}/bin/jakarta-tomcat-${catalina-version}${catalina-zip-suffix}.zip"
- dest="catalina-download/catalina-${catalina-version}${catalina-zip-suffix}.zip"
- verbose="true"
- usetimestamp="true"/>
-
- <!-- Get the Jakarta-COMMONS jar files which do NOT come along with the tomcat distribution -->
-
- <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/commons-logging.jar"
- dest="${tomcat.jars.dir}/commons-logging.jar"
- verbose="true"
- usetimestamp="true"
- />
-
- <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/tomcat-coyote.jar"
- dest="${tomcat.jars.dir}/tomcat-coyote.jar"
- verbose="true"
- usetimestamp="true"
- />
-
- <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/tomcat-http11.jar"
- dest="${tomcat.jars.dir}/tomcat-http11.jar"
- verbose="true"
- usetimestamp="true"
- />
-
- <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/tomcat-util.jar"
- dest="${tomcat.jars.dir}/tomcat-util.jar"
- verbose="true"
- usetimestamp="true"
- />
-
-
- <unzip src="catalina-download/catalina-${catalina-version}${catalina-zip-suffix}.zip" dest="catalina-download" />
-
- <delete file="${tomcat.jars.dir}/*.jar"/>
-
- <copy todir="${tomcat.jars.dir}" flatten="true">
- <fileset dir="catalina-download/jakarta-tomcat-${catalina-version}${catalina-zip-suffix}">
- <include name="**/bin/*.jar"/>
- <include name="**/lib/*.jar"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- prepare -->
- <target name="prepare" depends="checkNeccesaryJars" >
- </target>
-
-
-
- <!--- Build Test SAR Archive -->
- <target name="sar" depends="prepare" description="Builds a Demo block which uses Sevak Service">
- <ant antfile="build.xml" target="jars"/>
- <ant antfile="build.xml" target="demo-jar"/>
-
- <sar sarfile="${build.lib}/sevak-catalina-demo.sar"
- config="${conf.demo.dir}/catalina-config.xml"
- environment="${conf.demo.dir}/catalina-environment.xml"
- assembly="${conf.demo.dir}/catalina-assembly.xml" >
-
- <lib dir="${build.lib}/">
- <include name="sevak-catalina.jar"/>
- <include name="sevak-demo.jar"/>
- <include name="sevak-api.jar"/>
- <include name="sevak-demo.war"/>
- </lib>
- <zipfileset dir="${catalina.download}">
- <exclude name="**/bin/**"/>
- </zipfileset>
- <zipfileset dir="${catalina.download}/bin" prefix="common/lib">
- <include name="*.jar"/>
- </zipfileset>
- <zipfileset dir="${conf.demo.dir}" prefix="conf">
- <include name="tomcat-users.xml"/>
- </zipfileset>
- <zipfileset dir="${java.home}/../lib/" prefix="common/lib">
- <include name="tools.jar"/>
- </zipfileset>
-
- </sar>
-
- <!-- Copy build/lib contents to dist/ folder -->
-
- <copy todir="${dist.base}">
- <fileset dir="${build.lib}">
- <include name="**"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="install" depends="sar" description="Installs Demo SAR into Phoenix" >
- <echo message="Installing to ${install.dir}" />
- <delete dir="${install.dir}/sevak-catalina-demo" />
- <copy file="${build.lib}/sevak-catalina-demo.sar" todir="${install.dir}" />
- </target>
+ <!-- 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 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"/>
+
+ <!-- Sevak specific properties for building -->
+ <property name="build.demoClasses" value="${build.dir}/demoClasses"/>
+ <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
+
+
+ <!-- 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="tools.jar" value="${java.home}/../lib/tools.jar"/>
+ <property name="dist.base" value="dist"/>
+
+ <property name="lib.dir" value="lib"/>
+ <property name="test.dir" value="${src.dir}/test"/>
+ <property name="demo.dir" value="${src.dir}/demo"/>
+ <property name="java.demo.dir" value="${demo.dir}/java"/>
+ <property name="conf.demo.dir" value="${demo.dir}/conf"/>
+
+ <!-- Tomcat Stuff -->
+ <property name="catalina-version" value="4.1.12"/>
+ <property name="catalina-zip-suffix" value=""/>
+ <property name="catalina-dir-suffix" value=""/>
+ <property name="catalina.download" value="catalina-download/jakarta-tomcat-${catalina-version}${catalina-zip-suffix}"/>
+ <property name="tomcat.jars.dir" value="${lib.dir}/tomcat-jars"/>
+
+ <path id="project.class.path">
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${build.classes}"/>
+ <fileset dir="../common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${tomcat.jars.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
+ <classpath refid="project.class.path"/>
+ </taskdef>
+
+ <!-- Check Presense Of Tomcat 4.0 jars -->
+ <target name="checkCatalinaJars">
+ <condition property="catalina.present">
+ <available file="catalina-download/catalina-${catalina-version}${catalina-zip-suffix}.zip"/>
+ </condition>
+
+ </target>
+
+ <target name="checkNeccesaryJars" depends="checkCatalinaJars" unless="catalina.present">
+ <echo>**********************************</echo>
+ <echo>***** Please execute target ******</echo>
+ <echo>**** 'get-catalina ' ******</echo>
+ <echo>**** to retrieve Tomcat4.0 ******</echo>
+ <echo>**** jars or place the jars *****</echo>
+ <echo>**** in ${tomcat.jars.dir} dir *****</echo>
+ <echo>**********************************</echo>
+
+ <fail message="Catalina needed. See above."/>
+
+ </target>
+
+ <!-- Get catalina jars from apache repository -->
+ <target name="get-catalina">
+ <mkdir dir="catalina-download"/>
+ <mkdir dir="${lib.dir}"/>
+ <mkdir dir="${tomcat.jars.dir}"/>
+
+ <get src="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v${catalina-version}${catalina-dir-suffix}/bin/jakarta-tomcat-${catalina-version}${catalina-zip-suffix}.zip"
+ dest="catalina-download/catalina-${catalina-version}${catalina-zip-suffix}.zip"
+ verbose="true"
+ usetimestamp="true"/>
+
+ <!-- Get the Jakarta-COMMONS jar files which do NOT come along with the tomcat distribution -->
+
+ <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/commons-logging.jar"
+ dest="${tomcat.jars.dir}/commons-logging.jar"
+ verbose="true"
+ usetimestamp="true"
+ />
+
+ <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/tomcat-coyote.jar"
+ dest="${tomcat.jars.dir}/tomcat-coyote.jar"
+ verbose="true"
+ usetimestamp="true"
+ />
+
+ <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/tomcat-http11.jar"
+ dest="${tomcat.jars.dir}/tomcat-http11.jar"
+ verbose="true"
+ usetimestamp="true"
+ />
+
+ <get src="http://jakarta.apache.org/builds/jakarta-tomcat-connectors/coyote/release/v1.0-rc2/tomcat-util.jar"
+ dest="${tomcat.jars.dir}/tomcat-util.jar"
+ verbose="true"
+ usetimestamp="true"
+ />
+
+ <unzip src="catalina-download/catalina-${catalina-version}${catalina-zip-suffix}.zip" dest="catalina-download"/>
+
+ <delete file="${tomcat.jars.dir}/*.jar"/>
+
+ <copy todir="${tomcat.jars.dir}" flatten="true">
+ <fileset dir="catalina-download/jakarta-tomcat-${catalina-version}${catalina-zip-suffix}">
+ <include name="**/bin/*.jar"/>
+ <include name="**/lib/*.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!--- Build Test SAR Archive -->
+ <target name="sar" depends="checkNeccesaryJars" description="Builds a Demo block which uses Sevak Service">
+ <ant antfile="build.xml" target="jars"/>
+ <ant antfile="build.xml" target="demo-jar"/>
+
+ <sar sarfile="${build.lib}/sevak-catalina-demo.sar"
+ config="${conf.demo.dir}/catalina-config.xml"
+ environment="${conf.demo.dir}/catalina-environment.xml"
+ assembly="${conf.demo.dir}/catalina-assembly.xml">
+
+ <lib dir="${build.lib}/">
+ <include name="sevak-catalina.jar"/>
+ <include name="sevak-demo.jar"/>
+ <include name="sevak-api.jar"/>
+ <include name="sevak-demo.war"/>
+ </lib>
+ <zipfileset dir="${catalina.download}">
+ <exclude name="**/bin/**"/>
+ </zipfileset>
+ <zipfileset dir="${catalina.download}/bin" prefix="common/lib">
+ <include name="*.jar"/>
+ </zipfileset>
+ <zipfileset dir="${conf.demo.dir}" prefix="conf">
+ <include name="tomcat-users.xml"/>
+ </zipfileset>
+ <zipfileset dir="${java.home}/../lib/" prefix="common/lib">
+ <include name="tools.jar"/>
+ </zipfileset>
+
+ </sar>
+
+ <!-- Copy build/lib contents to dist/ folder -->
+
+ <copy todir="${dist.base}">
+ <fileset dir="${build.lib}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="install" depends="sar" description="Installs Demo SAR into Phoenix">
+ <echo message="Installing to ${install.dir}"/>
+ <delete dir="${install.dir}/sevak-catalina-demo"/>
+ <copy file="${build.lib}/sevak-catalina-demo.sar" todir="${install.dir}"/>
+ </target>
</project>
1.9 +144 -187 avalon-apps/sevak/jo.xml
Index: jo.xml
===================================================================
RCS file: /home/cvs/avalon-apps/sevak/jo.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jo.xml 6 Feb 2003 16:40:14 -0000 1.8
+++ jo.xml 11 Apr 2003 00:27:20 -0000 1.9
@@ -1,192 +1,149 @@
<?xml version="1.0"?>
-<project default="main" basedir=".">
+<project default="sar" 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 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"/>
-
- <!-- Sevak specific properties for building -->
- <property name="build.reports" value="${build.dir}/reports"/>
- <property name="build.demoClasses" value="${build.dir}/demoClasses"/>
- <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
-
-
- <!-- 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="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
- <property name="dist.base" value="dist"/>
- <property name="do.checkstyle" value="true"/>
-
- <property name="lib.dir" value="lib"/>
- <property name="test.dir" value="${src.dir}/test"/>
- <property name="demo.dir" value="${src.dir}/demo"/>
- <property name="java.demo.dir" value="${demo.dir}/java"/>
- <property name="conf.demo.dir" value="${demo.dir}/conf"/>
-
- <!-- Jo stuff -->
- <property name ="jo.rel" value="1.0"/>
-
- <property name="jo.jars.dir" value="${lib.dir}/jo-jars"/>
-
- <path id="project.class.path">
- <pathelement path="${java.class.path}" />
- <pathelement path="${build.classes}" />
- <fileset dir="../common/lib">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${jo.jars.dir}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <path id="tools.class.path">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
- </path>
-
- <path id="test.class.path">
- <fileset dir="../common/lib">
- <include name="**/*.jar" />
- </fileset>
- <pathelement path="${build.lib}/sevak-api.jar"/>
- </path>
-
- <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
- <classpath refid="project.class.path" />
- </taskdef>
-
- <target name="checkJoJars">
- <condition property="jo.present">
- <available file="jo-download/jo${jo.rel}.zip"/>
- </condition>
-
- </target>
-
- <target name="checkNeccesaryJars" depends="checkJoJars" unless="jo.present">
- <echo>*************************</echo>
- <echo>* Please execute target *</echo>
- <echo>* 'get-jo' in the *</echo>
- <echo>* jo.xml build file *</echo>
- <echo>* to download three and *</echo>
- <echo>* a half Mb of Jo! *</echo>
- <echo>*************************</echo>
-
- <fail message="Jo needed. See above."/>
-
- </target>
-
-
- <target name="get-jo">
-
- <mkdir dir="jo-download"/>
-
- <get src="http://unc.dl.sourceforge.net/sourceforge/tagtraum-jo/jo${jo.rel}.zip"
- dest="jo-download/jo${jo.rel}.zip"
- verbose="true"
- usetimestamp="true"/>
-
- <unzip src="jo-download/jo${jo.rel}.zip" dest="jo-download/jo-${jo.rel}" />
-
- <delete file="${jo.jars.dir}/*.jar"/>
-
- <copy todir="${jo.jars.dir}" flatten="true">
- <fileset dir="jo-download/jo-${jo.rel}">
- <include name="**/lib/*.jar"/>
- </fileset>
- </copy>
-
- </target>
-
- <!-- prepare -->
- <target name="prepare" depends="checkNeccesaryJars" >
- </target>
-
-
-
- <!--- Build Test SAR Archive -->
- <target name="sar" depends="prepare" description="Builds a Demo block which uses Sevak Service">
-
-
- <ant antfile="build.xml" target="jars"/>
- <ant antfile="build.xml" target="demo-jar"/>
-
- <sar sarfile="${build.lib}/sevak-jo-demo.sar"
- config="${conf.demo.dir}/jo-config.xml"
- environment="${conf.demo.dir}/jo-environment.xml"
- assembly="${conf.demo.dir}/jo-assembly.xml" >
-
- <lib dir="${build.lib}/">
- <include name="sevak-jo.jar"/>
- <include name="sevak-demo.jar"/>
- <include name="sevak-api.jar"/>
- </lib>
-
- <lib dir="${jo.jars.dir}">
- <include name="*.jar"/>
- </lib>
-
- <zipfileset dir="jo-download/jo-${jo.rel}/jo${jo.rel}/etc" prefix="etc">
- <include name="**/*"/>
- </zipfileset>
- <zipfileset dir="jo-download/jo-${jo.rel}/jo${jo.rel}/webapp" prefix="webapp">
- <include name="**/*"/>
- </zipfileset>
- <zipfileset dir="jo-download/jo-${jo.rel}/jo${jo.rel}/log" prefix="log">
- <include name="dummy.log"/>
- </zipfileset>
-
- </sar>
-
- <!-- Copy build/lib contents to dist/ folder -->
-
- <copy todir="${dist.base}">
- <fileset dir="${build.lib}">
- <include name="**"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="install" depends="sar" description="Installs Demo SAR into Phoenix" >
- <echo message="Installing to ${install.dir}" />
- <delete dir="${install.dir}/sevak-jo-demo-demo" />
- <copy file="${build.lib}/sevak-jo-demo.sar" todir="${install.dir}" />
- </target>
+ <!-- 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 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.demoClasses" value="${build.dir}/demoClasses"/>
+ <property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
+
+ <!-- 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="dist"/>
+
+ <property name="lib.dir" value="lib"/>
+ <property name="test.dir" value="${src.dir}/test"/>
+ <property name="demo.dir" value="${src.dir}/demo"/>
+ <property name="java.demo.dir" value="${demo.dir}/java"/>
+ <property name="conf.demo.dir" value="${demo.dir}/conf"/>
+
+ <!-- Jo stuff -->
+ <property name="jo.rel" value="1.0"/>
+
+ <property name="jo.jars.dir" value="${lib.dir}/jo-jars"/>
+
+ <path id="project.class.path">
+ <pathelement path="${java.class.path}"/>
+ <pathelement path="${build.classes}"/>
+ <fileset dir="../common/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${jo.jars.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
+ <classpath refid="project.class.path"/>
+ </taskdef>
+
+ <target name="checkJoJars">
+ <condition property="jo.present">
+ <available file="jo-download/jo${jo.rel}.zip"/>
+ </condition>
+
+ </target>
+
+ <target name="checkNeccesaryJars" depends="checkJoJars" unless="jo.present">
+ <echo>*************************</echo>
+ <echo>* Please execute target *</echo>
+ <echo>* 'get-jo' in the *</echo>
+ <echo>* jo.xml build file *</echo>
+ <echo>* to download three and *</echo>
+ <echo>* a half Mb of Jo! *</echo>
+ <echo>*************************</echo>
+
+ <fail message="Jo needed. See above."/>
+
+ </target>
+
+ <target name="get-jo">
+
+ <mkdir dir="jo-download"/>
+
+ <get src="http://unc.dl.sourceforge.net/sourceforge/tagtraum-jo/jo${jo.rel}.zip"
+ dest="jo-download/jo${jo.rel}.zip"
+ verbose="true"
+ usetimestamp="true"/>
+
+ <unzip src="jo-download/jo${jo.rel}.zip" dest="jo-download/jo-${jo.rel}"/>
+
+ <delete file="${jo.jars.dir}/*.jar"/>
+
+ <copy todir="${jo.jars.dir}" flatten="true">
+ <fileset dir="jo-download/jo-${jo.rel}">
+ <include name="**/lib/*.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!--- Build Test SAR Archive -->
+ <target name="sar" depends="checkNeccesaryJars" description="Builds a Demo block which uses Sevak Service">
+
+ <ant antfile="build.xml" target="jars"/>
+ <ant antfile="build.xml" target="demo-jar"/>
+
+ <sar sarfile="${build.lib}/sevak-jo-demo.sar"
+ config="${conf.demo.dir}/jo-config.xml"
+ environment="${conf.demo.dir}/jo-environment.xml"
+ assembly="${conf.demo.dir}/jo-assembly.xml">
+
+ <lib dir="${build.lib}/">
+ <include name="sevak-jo.jar"/>
+ <include name="sevak-demo.jar"/>
+ <include name="sevak-api.jar"/>
+ </lib>
+
+ <lib dir="${jo.jars.dir}">
+ <include name="*.jar"/>
+ </lib>
+
+ <zipfileset dir="jo-download/jo-${jo.rel}/jo${jo.rel}/etc" prefix="etc">
+ <include name="**/*"/>
+ </zipfileset>
+ <zipfileset dir="jo-download/jo-${jo.rel}/jo${jo.rel}/webapp" prefix="webapp">
+ <include name="**/*"/>
+ </zipfileset>
+ <zipfileset dir="jo-download/jo-${jo.rel}/jo${jo.rel}/log" prefix="log">
+ <include name="dummy.log"/>
+ </zipfileset>
+
+ </sar>
+
+ <!-- Copy build/lib contents to dist/ folder -->
+
+ <copy todir="${dist.base}">
+ <fileset dir="${build.lib}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="install" depends="sar" description="Installs Demo SAR into Phoenix">
+ <echo message="Installing to ${install.dir}"/>
+ <delete dir="${install.dir}/sevak-jo-demo-demo"/>
+ <copy file="${build.lib}/sevak-jo-demo.sar" todir="${install.dir}"/>
+ </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org