From 76206ffa0887fa1c4f4ee84def9a93da490e1039 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 7 Aug 2017 17:26:42 +0200
Subject: [PATCH] rolback of rollback

---
 build.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 164a2a2..d033c56 100755
--- a/build.xml
+++ b/build.xml
@@ -17,7 +17,6 @@
     <property name="tomcat.user" value="" />
     <property name="tomcat.pass" value="" />
     <property name="catalina.home" value="/usr/share/tomcat7"/>
-    <property name="deployPath" value="/var/lib/tomcat7/webapps/Zallery.war" />
 
     <!--define standard arguments for javac-->
     <presetdef name="javac">
@@ -70,19 +69,18 @@
     </target>
 
 
-    <!--<import file="${catalina.home}/bin/catalina-tasks.xml" optional="true"/>-->
+    <import file="${catalina.home}/bin/catalina-tasks.xml" optional="true"/>
     <target name="deploy" depends="package">
-        <delete file="${deployPath}" quiet="true" />
-        <copy   file="${releaseDir}/Zallery.war"
-                toFile="${deployPath}" />
-        <!--
         <deploy url="${tomcat.url}"
                 username="${tomcat.user}"
                 password="${tomcat.pass}"
                 path="/Zallery"
                 update="true"
                 war="file:${releaseDir}/Zallery.war" />
-         -->
+
+        <!-- Workaround as tomcat deletes the webapp context file from conf dir -->
+        <copy file="/var/lib/tomcat7/conf/Catalina/localhost/Zallery.xml_orig"
+              toFile="/var/lib/tomcat7/conf/Catalina/localhost/Zallery.xml" />
     </target>
 
 </project>