X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=7b08aa6201479b19f06f6e701895d95965550a4e;hb=e42146b41c41299311fdcf556b465c3eefc6025c;hp=e381cfc0932056d0769212a53af601b7bd413c7d;hpb=808275f7712732177ad1973ef3be7d0ec46ccd88;p=proteocache.git

diff --git a/build.xml b/build.xml
index e381cfc..7b08aa6 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,9 @@
 <?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"/>
@@ -107,11 +107,11 @@
 		</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 -->
@@ -126,7 +126,7 @@
 		</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">
@@ -135,9 +135,12 @@
 				<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>