From 0d96ad055d1efd714b6482ee95966a5a27e94585 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 15 Mar 2016 13:00:39 +0000
Subject: [PATCH] Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)    123492 mrogers:
 Package the correct README for the all in one installer.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@124071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 enterprise-update/assemblies/updateTool.xml | 10 ++++++-
 enterprise-update/pom.xml                   | 31 ++++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/enterprise-update/assemblies/updateTool.xml b/enterprise-update/assemblies/updateTool.xml
index 241dec6cb8..12eebca3e5 100644
--- a/enterprise-update/assemblies/updateTool.xml
+++ b/enterprise-update/assemblies/updateTool.xml
@@ -38,12 +38,20 @@
             <directory>${unpacked.alfresco.platform.distribution}</directory>
             <outputDirectory>resources/distribution/platform</outputDirectory>
             <includes>
-                <include>README.txt</include>
                 <include>package.properties</include>
             </includes>
             <lineEnding>keep</lineEnding>
         </fileSet>
 		
+		<fileSet>
+            <directory>${unpacked.alfresco.one.distribution}</directory>
+            <outputDirectory>resources/distribution/platform</outputDirectory>
+            <includes>
+                <include>README.txt</include>
+            </includes>
+            <lineEnding>keep</lineEnding>
+        </fileSet>
+		
 		<!-- Platform Only distribution - currently the same as full platform -->
 		<fileSet>
             <directory>${unpacked.alfresco.platform.distribution}</directory>
diff --git a/enterprise-update/pom.xml b/enterprise-update/pom.xml
index d792936804..2ba337446c 100644
--- a/enterprise-update/pom.xml
+++ b/enterprise-update/pom.xml
@@ -17,6 +17,7 @@
 		<unpacked.alfresco.share.distribution>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</unpacked.alfresco.share.distribution>
 		<unpacked.alfresco.wcmqs.distribution>${project.build.directory}/dependency/wcmqs-${project.version}</unpacked.alfresco.wcmqs.distribution>
 		<unpacked.org.alfresco.aos.distribution>${project.build.directory}/dependency/aos-${alfresco.aos-module.version}</unpacked.org.alfresco.aos.distribution>
+		<unpacked.alfresco.one.distribution>${project.build.directory}/dependency/alfresco-one-distribution-${project.version}</unpacked.alfresco.one.distribution>
 
 		<!-- e.g. pull the update scripts from src/main/resources/script/5.0 -->
 		<unpacked.update.script>${project.build.directory}/classes/script/${version.major}.${version.minor}</unpacked.update.script>
@@ -102,6 +103,14 @@
             <type>zip</type>
         </dependency>
 		
+		<!-- Full Installer dependencies -->
+	    <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-one-distribution</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
+		
         <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>
@@ -226,7 +235,27 @@
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
-                    </execution>					
+                    </execution>	
+
+					<execution>
+                        <id>unpack-one-distribution</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+								    <groupId>org.alfresco</groupId>
+									<artifactId>alfresco-one-distribution</artifactId>
+									<version>${project.version}</version>
+                                    <overWrite>true</overWrite>
+                                    <type>jar</type>
+									<outputDirectory>${unpacked.alfresco.one.distribution}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>						
                 </executions>
             </plugin>