From f07bad0d9015072e138f5b3194cd550e6d6517fa Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 7 Aug 2017 16:11:41 +0200
Subject: [PATCH] Changed deployment type

---
 Jenkinsfile |  9 +++++++--
 build.xml   | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 03e3c24..ea3793b 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,9 +27,14 @@ node {
 }
 
 stage('Deploy') {
-    input message: 'Deploy?', submitter: 'ziver'
+    timeout(time:2, unit:'HOURS') {
+        input message: 'Deploy?', submitter: 'ziver'
+    }
     node {
-        sh 'ant deploy'
+        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: '46f1d99b-2037-47b9-a7b7-57a1066337fc',
+                                      usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
+            sh 'ant -Dtomcat.user=${USERNAME} -Dtomcat.pass=${PASSWORD} deploy'
+        }
     }
 }
 
diff --git a/build.xml b/build.xml
index 450401b..189bcb0 100755
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,12 @@
     <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/shared/tomcat7"/>
+
     <!--define standard arguments for javac-->
     <presetdef name="javac">
         <javac includeantruntime="false" />
@@ -64,10 +70,13 @@
     </target>
 
     <target name="deploy" depends="package">
-        <delete file="${deployPath}" quiet="true" />
-        <copy
-            file="${releaseDir}/Zallery.war"
-            toFile="${deployPath}" />
+        <import file="${catalina.home}/bin/catalina-tasks.xml"/>
+        <deploy url="${tomcat.url}"
+                username="${tomcat.user}"
+                password="${tomcat.pass}"
+                path="/zallery"
+                update="true"
+                war="file:${releaseDir}/Zallery.war" />
     </target>
 
 </project>