From 7286b41cb9cfa3ad629c54dbc013502d58c335f7 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Mon, 4 Apr 2016 08:57:26 +0000
Subject: [PATCH] Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)    124406 jphuynh:
 ACE-5135: Pre-apply share-services AMP in alfresco.war packaged in EAR

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.N@124767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/pom.xml                    |  6 ++--
 enterprise-war-for-ear/pom.xml | 57 ++++++++++++++++++++++++++++++++++
 pom.xml                        |  1 +
 3 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 enterprise-war-for-ear/pom.xml

diff --git a/ear/pom.xml b/ear/pom.xml
index adea94403c..9faca79a39 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -26,8 +26,8 @@
         <!-- WARs to include in the EAR -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-platform-enterprise</artifactId>
-            <version>${alfresco.platform.version}</version>
+            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
+            <version>${project.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
@@ -184,7 +184,7 @@
                     <modules>
                         <webModule>
                             <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-platform-enterprise</artifactId>
+                            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
                             <bundleFileName>alfresco.war</bundleFileName>
                         </webModule>
                         <webModule>
diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
new file mode 100644
index 0000000000..1db7e2b636
--- /dev/null
+++ b/enterprise-war-for-ear/pom.xml
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-enterprise-war-for-ear</artifactId>
+    <name>Alfresco Enterprise WAR for inclusion in EAR</name>
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-full-installation</artifactId>
+        <version>2015-SNAPSHOT</version>
+    </parent>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-platform-enterprise</artifactId>
+            <version>${alfresco.platform.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-share-services</artifactId>
+            <version>${alfresco.share.version}</version>
+            <type>amp</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>alfresco</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <!-- Add dependency to alfresco-maven-plugin, to allow AMP overlays -->
+                <dependencies>
+                    <dependency>
+                        <groupId>org.alfresco.maven.plugin</groupId>
+                        <artifactId>alfresco-maven-plugin</artifactId>
+                        <version>2.1.1</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-platform-enterprise</artifactId>
+                            <type>war</type>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-share-services</artifactId>
+                            <type>amp</type>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 2aabf97986..575359a2c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
         <profile>
             <id>enterprise</id>
             <modules>
+                <module>enterprise-war-for-ear</module>
                 <module>ear</module>
                 <module>enterprise-distribution</module>
                 <module>enterprise-update</module>