From 84692a84ea4f1b8bbfd7269a0b9ea331e3dd3d6c Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Thu, 13 Aug 2015 15:10:22 +0000
Subject: [PATCH] UTF-154 - Some renaming of folders.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@110061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 enterprise-update/assemblies/updateTool.xml | 6 +++---
 enterprise-update/pom.xml                   | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/enterprise-update/assemblies/updateTool.xml b/enterprise-update/assemblies/updateTool.xml
index 0269281979..ef7af2d596 100644
--- a/enterprise-update/assemblies/updateTool.xml
+++ b/enterprise-update/assemblies/updateTool.xml
@@ -8,13 +8,13 @@
     <formats>
         <format>zip</format>
     </formats>
-
+	
     <includeBaseDirectory>false</includeBaseDirectory>
 	
 	<files>
 	    <file>
-			<source>${project.basedir}/target/updatePackage.zip</source>
-			<outputDirectory>updates</outputDirectory>
+			<source>${project.basedir}/target/update-contents-${version}.zip</source>
+			<outputDirectory>update</outputDirectory>
 		</file>
 	</files>
 	
diff --git a/enterprise-update/pom.xml b/enterprise-update/pom.xml
index 6cb518f80f..46d8bd3fae 100644
--- a/enterprise-update/pom.xml
+++ b/enterprise-update/pom.xml
@@ -63,7 +63,7 @@
                             <descriptors>
                                 <descriptor>assemblies/update.xml</descriptor>
                             </descriptors>
-							<finalName>updatePackage</finalName>
+							<finalName>update-contents-${version}</finalName>
                         </configuration>
                     </execution>
 					<execution>
@@ -73,6 +73,10 @@
                             <goal>single</goal>
                         </goals>
                         <configuration>
+						    <!-- Does not seem to work suppressing the META-INF folder -->
+							<archive>
+							   <addMavenDescriptor>false</addMavenDescriptor>
+							</archive>	
                             <appendAssemblyId>false</appendAssemblyId>
                             <descriptors>
 								<descriptor>assemblies/updateTool.xml</descriptor>