From 0d4b34b23915a8c09017a64acd54e21d6cb84f31 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 7 Aug 2017 17:09:00 +0200
Subject: [PATCH] revert tomcat deployment and module

---
 build.xml             | 9 +++++++--
 src/zall/Zallery.java | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 457be59..164a2a2 100755
--- a/build.xml
+++ b/build.xml
@@ -11,13 +11,13 @@
     <property name="outputRoot" value="${gitRoot}/build" />
     <property name="buildDir" value="${outputRoot}/production" />
     <property name="releaseDir" value="${outputRoot}/release" />
-    <property name="deployPath" value="/var/lib/tomcat7/webapps/Zallery.war" />
 
     <!-- Deployment properties -->
     <property name="tomcat.url" value="http://localhost:8080/manager/text" />
     <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,14 +70,19 @@
     </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" />
+         -->
     </target>
 
 </project>
diff --git a/src/zall/Zallery.java b/src/zall/Zallery.java
index 9205dac..8fec668 100755
--- a/src/zall/Zallery.java
+++ b/src/zall/Zallery.java
@@ -32,7 +32,7 @@ import zutil.log.LogUtil;
 public class Zallery extends HttpServlet{
 	private static Logger logger = LogUtil.getLogger();
 
-	public static final String VERSION = "1.0.0";
+	public static final String VERSION = "1.0.1";
 
 	public static String WEBSITE_NAME = "Example.com";
 	public static String WEBSITE_URL = "http://example.com";