From 19efb3b7bb3415098ecee6bb30aa22edf10c41fd Mon Sep 17 00:00:00 2001
From: Jean-Pierre Huynh <jean-pierre.huynh@alfresco.com>
Date: Tue, 29 Sep 2015 15:02:55 +0000
Subject: [PATCH] ACE-4312: Fixed missing web-extension folder in the EAR
 Distribution + Removed unnecessary modules/platform folder.

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

diff --git a/ear/pom.xml b/ear/pom.xml
index 296e667959..78d2d03abf 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -65,6 +65,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-share-distribution</artifactId>
+            <version>${alfresco.share.version}</version>
+            <type>zip</type>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- jar to be packaged in myfaces websphere zip -->
         <dependency>
@@ -198,7 +211,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-distribution</id>
+                        <id>unpack-platform-distribution</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>unpack-dependencies</goal>
@@ -206,7 +219,21 @@
                         <configuration>
                             <includeArtifactIds>alfresco-platform-enterprise-distributionzip</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
-                            <excludes>alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}/solr4/,alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}/web-server/webapps/</excludes>
+                            <excludes>alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}/solr4/,alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}/modules/</excludes>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>unpack-share-distribution</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeArtifactIds>alfresco-share-distribution</includeArtifactIds>
+                            <excludeTransitive>true</excludeTransitive>
+                            <excludes>*</excludes>
+                            <includes>alfresco-share-distribution-${alfresco.share.version}/web-extension-samples/</includes>
                         </configuration>
                     </execution>
 
diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml
index 549f26a600..5e5e9ead3f 100644
--- a/ear/src/assembly/ear-distribution.xml
+++ b/ear/src/assembly/ear-distribution.xml
@@ -18,6 +18,10 @@
             <directory>${project.build.directory}/dependency/alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}/web-server/shared/classes</directory>
             <outputDirectory>web-server/classpath</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <outputDirectory>web-server/classpath/alfresco/web-extension</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>