From 95db965cc5f60921172f3fa18efb8d931eeae37b Mon Sep 17 00:00:00 2001
From: Sasha Sherstnev <a.sherstnev@dundee.ac.uk>
Date: Fri, 29 Nov 2013 16:51:53 +0000
Subject: [PATCH] Modify ant build process for the new project structure

---
 build.xml |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index e913296..c70dbef 100644
--- a/build.xml
+++ b/build.xml
@@ -107,7 +107,7 @@
 		</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}">
@@ -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">
@@ -136,9 +136,11 @@
 				<include name="lib/*"/>
 			</zipfileset>
 			<zipfileset dir="." includes="${proteocache-jar}" fullpath="WEB-INF/lib/proteocache.jar"/>
-			<zipfileset dir="conf" prefix="conf" />
+			<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>
-- 
1.7.10.2