From 62d44d4e661acf49243bfc4b1e5c8a7ccaf012cc Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Wed, 11 Nov 2015 10:23:16 +0000
Subject: [PATCH] ACE-4561 Fix Alfresco One Distribution missing alfresco.war
 after name change

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@117190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 distribution/pom.xml                            |  1 -
 distribution/src/assembly/full-distribution.xml | 10 ++++++++--
 enterprise-distribution/pom.xml                 |  1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index a4e4529c80..13cc319172 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -13,7 +13,6 @@
     <!-- To replace in share-config-custom.xml -->
     <properties>
         <BITROCK_TOMCAT_PORT>8080</BITROCK_TOMCAT_PORT>
-        <alfresco.platform.edition>community</alfresco.platform.edition>
     </properties>
 
     <dependencies>
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index c9bf92d680..a432329af8 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -12,9 +12,15 @@
             <outputDirectory></outputDirectory>
         </fileSet>
 
-        <!-- Platform Distribution -->
+        <!-- Platform Community Distribution -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-platform-${alfresco.platform.edition}-distributionzip-${alfresco.platform.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-platform-community-distributionzip-${alfresco.platform.version}</directory>
+            <outputDirectory/>
+        </fileSet>
+
+        <!-- Platform Enterprise Distribution -->
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}</directory>
             <outputDirectory/>
         </fileSet>
 
diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml
index b9a3d28c25..6aa0bfe346 100644
--- a/enterprise-distribution/pom.xml
+++ b/enterprise-distribution/pom.xml
@@ -13,7 +13,6 @@
     <!-- To replace in share-config-custom.xml -->
     <properties>
         <BITROCK_TOMCAT_PORT>8080</BITROCK_TOMCAT_PORT>
-        <alfresco.platform.edition>enterprise</alfresco.platform.edition>
     </properties>
 
     <dependencies>