From 94e7c5291532b72b18c6f9c026be9261c5fd6e6c Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 15 Mar 2016 11:31:44 +0000
Subject: [PATCH] Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)    122179 mrogers:
 UTF-380 Try again.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 enterprise-update-test/pom.xml | 35 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/enterprise-update-test/pom.xml b/enterprise-update-test/pom.xml
index 91c1c1d13b..278d469fe8 100644
--- a/enterprise-update-test/pom.xml
+++ b/enterprise-update-test/pom.xml
@@ -10,15 +10,15 @@
     <packaging>pom</packaging>
 
   <properties>
+  
+    <!--  Two installers The base installer and this installer -->
     <!--Todo calculate this -->
     <!--Todo this should be 5.1.0 but that does not exist yet -->
     <update.base.version>5.1.0</update.base.version>
-    <unpacked.update.package>${project.build.directory}/dependency/alfresco-enterprise-update-package-${project.version}</unpacked.update.package>
-
-    <unpacked.alfresco.platform.distribution>${project.build.directory}/dependency/alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}</unpacked.alfresco.platform.distribution>
     
-    <!-- This is a temp guess at a temp fix -->
-    <enterprise.build.plan>ALF-EPACK3-106</enterprise.build.plan>
+    <!-- https://nightlybuilds.alfresco.com/Enterprise-5.1/5.1/LATEST/ALL/ -->
+    
+    <unpacked.update.package>${project.build.directory}/dependency/alfresco-enterprise-update-package-${project.version}</unpacked.update.package>   
   </properties>
 
   <dependencies>
@@ -78,27 +78,24 @@
 
                 <if>
                   <not>
-                    <isset property="installer.location" />
+                    <isset property="base.installer.location" />
                   </not>
                   <then>
-                    <property name="installer.location"
-                      location="${basedir}/target/alf-installer.bin" />
-                    <echo>Downloading Alfresco installer to
-                      ${installer.location}...</echo>
-                    <sshexec username="tomcat" host="pbam01.alfresco.com"
-                      keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath"
-                      command="ls -rt /data/bamboo/artifacts/${enterprise.build.plan}/ALL/alfresco-enterprise-*-installer-linux-x64.??? | tail -1 | tr ' ' '?' " />
-                    <scp file="tomcat@pbam01.alfresco.com:${installerPath}"
-                      localTofile="${installer.location}" keyfile="${user.home}/.ssh/id_rsa" />
+                    <property name="base.installer.location"
+                      location="${basedir}/target/base-alf-installer.bin" />
+                    <echo>Downloading Base Alfresco installer to
+                      ${base.installer.location}...</echo>
+                    <get src="https://nightlybuilds.alfresco.com/Enterprise-5.1/5.1/LATEST/ALL/alfresco-one-installer-20160203-SNAPSHOT-664-linux-x64.bin" 
+                        dest="${base.installer.location}"/>
                   </then>
                 </if>
-                <chmod file="${installer.location}" perm="a+x"
+                <chmod file="${base.installer.location}" perm="a+x"
                   verbose="true" />
-                <echo>Installing Alfresco...</echo>
-                <exec executable="${installer.location}" dir="target"
+                <echo>Installing The Base Versoion of Alfresco...</echo>
+                <exec executable="${base.installer.location}" dir="target"
                   failonerror="true">
                   <arg
-                    line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation --tomcat_server_domain ${HOSTNAME}" />
+                    line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/base-alf-installation --tomcat_server_domain ${HOSTNAME}" />
                 </exec>
               </target>
             </configuration>