From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Wed, 20 Nov 2013 13:46:01 +0000 (+0000)
Subject: PROT-6 Fix problem with missing proteocache.jar in proteocache.war
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0c067708b917375dbf1cd96ff5a65496c6821f20;p=proteocache.git

PROT-6 Fix problem with missing proteocache.jar in proteocache.war
---

diff --git a/build.xml b/build.xml
index e381cfc..e913296 100644
--- a/build.xml
+++ b/build.xml
@@ -111,7 +111,7 @@
 		<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 -->
@@ -135,6 +135,7 @@
 				<include name="web.xml"/>
 				<include name="lib/*"/>
 			</zipfileset>
+			<zipfileset dir="." includes="${proteocache-jar}" fullpath="WEB-INF/lib/proteocache.jar"/>
 			<zipfileset dir="conf" prefix="conf" />
 			<!-- Add ProteoCache static web site pages apart from the binary archive -->
 			<zipfileset dir="${basedir}/website" excludes="tests/**, template.html"/>