<?xml version="1.0" encoding="UTF-8"?>
-<project default="proteocache" name="Build ProteoCache - Caching framework for the Dundee Resource" basedir=".">
+<project default="all" name="Build ProteoCache - Caching framework for the Dundee Resource" basedir=".">
<!-- projects details -->
- <property name="proteocache_version" value="0.1.0"/>
+ <property name="proteocache_version" value="0.4.99"/>
<property name="project.url" value="http://www.compbio.dundee.ac.uk/proteocache"/>
<property name="product" value="ProteoCache"/>
<property name="author" value="Alexander Sherstnev"/>
</jar>
</target>
- <target name="build-proteocache-jar" depends="compile" description="Pack all compiled codes, configuration, ...">
+ <target name="proteocache-jar" depends="compile" description="Pack all compiled codes, configuration, ...">
<echo>Build full jar</echo>
<delete file="${proteocache-jar}"></delete>
<jar jarfile="${proteocache-jar}">
- <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" ></zipgroupfileset>
+<!-- <zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" ></zipgroupfileset>-->
<fileset refid="allcodes"></fileset>
<fileset dir="${basedir}/WEB-INF/classes/"></fileset>
<!-- Set compbio.server.MainTester as main to help user to test their deployments -->
</jar>
</target>
- <target name="proteocache-server" depends="build-proteocache-jar" description="Prepare ProteoCache war file">
+ <target name="proteocache-server" depends="proteocache-jar" description="Prepare ProteoCache war file">
<echo>Prepare ProteoCache war file</echo>
<delete file="${proteocache-war}"></delete>
<zip destfile="${proteocache-war}" whenempty="create">
<include name="web.xml"/>
<include name="lib/*"/>
</zipfileset>
- <zipfileset dir="conf" prefix="conf" />
+ <zipfileset dir="." includes="${proteocache-jar}" fullpath="WEB-INF/lib/proteocache.jar"/>
+ <zipfileset dir="${basedir}/conf" prefix="conf" />
+ <!-- <zipfileset dir="${basedir}/META-INF" prefix="META-INF" />-->
<!-- Add ProteoCache static web site pages apart from the binary archive -->
- <zipfileset dir="${basedir}/website" excludes="tests/**, template.html"/>
+ <zipfileset dir="${basedir}/webapp/resources"/>
+ <zipfileset dir="${basedir}/webapp/view" prefix="WEB-INF/view"/>
<!-- Put a copy of log4j configuration file where it can be used -->
<zipfileset dir="log" includes="log4j.properties" prefix="WEB-INF/classes"/>
</zip>