jon 01/05/16 09:43:01
Modified: build build.xml
Log:
starting to fix up the war building and paths to things
Revision Changes Path
1.4 +45 -23 jakarta-turbine-jyve/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-jyve/build/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2001/05/15 22:44:36 1.3
+++ build.xml 2001/05/16 16:42:56 1.4
@@ -29,6 +29,10 @@
<property name="optimize" value="off"/>
<property name="deprecation" value="off"/>
+ <property name="turbine.home" value="../../jakarta-turbine"/>
+ <property name="turbine.lib" value="${turbine.home}/lib"/>
+ <property name="turbine.bin" value="${turbine.home}/bin"/>
+
<property name="targetPackage" value="org.apache.jyve.om"/>
<property name="database" value="mysql"/>
@@ -37,10 +41,18 @@
<!-- Build classpath -->
<path id="classpath">
- <fileset dir="../../jakarta-turbine/lib">
- <include name="**/*.jar"/>
+ <fileset dir="${turbine.lib}">
+ <include name="velocity*.jar"/>
+ <include name="log4j*.jar"/>
+ <include name="mysql*.jar"/>
+ <include name="ecs*.jar"/>
+ <include name="jdbc*.jar"/>
+ <include name="village*.jar"/>
+ <include name="mail*.jar"/>
+ <include name="activation*.jar"/>
+ <include name="servlet*.jar"/>
</fileset>
- <fileset dir="../../jakarta-turbine/bin">
+ <fileset dir="${turbine.bin}">
<include name="**/turbine*.jar"/>
</fileset>
</path>
@@ -71,7 +83,7 @@
classname="org.apache.turbine.torque.TorqueObjectModelTask">
<classpath refid="classpath"/>
</taskdef>
- </target>
+ </target>
<!-- ================================================================== -->
<!-- Check to see what optional dependencies are available -->
@@ -157,18 +169,28 @@
description="--> generates jyve.war file">
<mkdir dir="${war.dir}"/>
<mkdir dir="${war.dir}/WEB-INF"/>
- <mkdir dir="${war.dir}/WEB-INF/config"/>
+ <mkdir dir="${war.dir}/WEB-INF/conf"/>
<mkdir dir="${war.dir}/WEB-INF/lib"/>
+ <copy file="${conf.dir}/Jyve.properties" todir="${war.dir}/WEB-INF/lib"/>
<copy file="${conf.dir}/web.xml" todir="${war.dir}/WEB-INF"/>
<copy todir="${war.dir}/WEB-INF/lib">
- <fileset dir="../../jakarta-turbine/lib/">
+ <fileset dir="${turbine.lib}">
<include name="velocity*.jar"/>
<include name="log4j*.jar"/>
+ <include name="mysql*.jar"/>
+ <include name="ecs*.jar"/>
+ <include name="jdbc*.jar"/>
+ <include name="village*.jar"/>
+ <include name="mail*.jar"/>
+ <include name="activation*.jar"/>
+ </fileset>
+ <fileset dir="${turbine.bin}">
+ <include name="turbine*.jar"/>
</fileset>
</copy>
- <jar jarfile="${build.dir}/${project}.war"
- basedir="${war.dir}"/>
+ <!-- <jar jarfile="${build.dir}/${project}.war"
+ basedir="${war.dir}"/> -->
</target>
<!-- ================================================================== -->
@@ -239,8 +261,8 @@
<target name="package-zip"
depends="package"
description="--> generates the Jyve distribution as .zip">
- <delete file="../${Name}-${version}.zip"/>
- <zip zipfile="../${Name}-${version}.zip" basedir="../"
includes="**/${final.name}/**"/>
+ <delete file="../${final.name}.zip"/>
+ <zip zipfile="../${final.name}.zip" basedir="../"
includes="**/${final.name}/**"/>
</target>
<!-- ================================================================== -->
@@ -249,10 +271,10 @@
<target name="package-tgz"
depends="package"
description="--> generates the Jyve distribution as .tar.gz">
- <delete file="../${Name}-${version}.tar"/>
- <delete file="../${Name}-${version}.tar.gz"/>
- <tar tarfile="../${Name}-${version}.tar" basedir="../"
includes="**/${final.name}/**"/>
- <gzip zipfile="../${Name}-${version}.tar.gz"
src="../${Name}-${version}.tar"/>
+ <delete file="../${final.name}.tar"/>
+ <delete file="../${final.name}.tar.gz"/>
+ <tar tarfile="../${final.name}.tar" basedir="../"
includes="**/${final.name}/**"/>
+ <gzip zipfile="../${final.name}.tar.gz" src="../${Name}-${version}.tar"/>
</target>
<!-- ================================================================== -->
@@ -341,9 +363,9 @@
<torque-sql
controlTemplate="sql/base/Control.vm"
outputDirectory="${src.sql.dir}"
- templatePath="../../jakarta-turbine/conf/torque/templates"
+ templatePath="${turbine.home}/conf/torque/templates"
outputFile="jyve-schema.sql"
- xmlFile="../conf/jyve-schema.xml"
+ xmlFile="${conf.dir}/jyve-schema.xml"
targetDatabase="${database}"
/>
</target>
@@ -367,10 +389,10 @@
<torque-om
controlTemplate="om/Control.vm"
outputDirectory="${src.java.dir}"
- templatePath="../../jakarta-turbine/conf/torque/templates"
+ templatePath="${turbine.home}/conf/torque/templates"
outputFile="report.${project}.om.generation"
targetPackage="org.apache.jyve.om"
- xmlFile="../conf/jyve-schema.xml"
+ xmlFile="${conf.dir}/jyve-schema.xml"
/>
</target>
@@ -381,16 +403,16 @@
<target name="generate-rights">
<java classname="org.apache.jyve.tools.GenerateRights" >
<arg value="-headerFile"/>
- <arg value="../conf/header_jyve_access_rights"/>
+ <arg value="${conf.dir}/header_jyve_access_rights"/>
<arg value="-permissionsFile"/>
- <arg value="../conf/jyve_permissions_roles"/>
+ <arg value="${conf.dir}/jyve_permissions_roles"/>
<arg value="-usersFile"/>
- <arg value="../conf/jyve_users_roles"/>
+ <arg value="${conf.dir}/jyve_users_roles"/>
<arg value="-outputFile"/>
- <arg value="../src/sql/jyve-rights.sql/"/>
+ <arg value="${src.sql.dir}/jyve-rights.sql/"/>
<classpath>
<pathelement path="${java.class.path}"/>
- <pathelement location="../bin/classes"/>
+ <pathelement location="${build.dest}"/>
</classpath>
</java>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
