From 67c9641b7c92c01cd16c0ec3fa75126aea81c5c3 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Tue, 15 Mar 2016 12:12:00 +0000
Subject: [PATCH] Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)    123256 mrogers:
 rollback 123243

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

diff --git a/ear/pom.xml b/ear/pom.xml
index 6306175607..3cbe834c96 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-enterprise-war-for-ear</artifactId>
-            <version>${project.version}</version>
+            <artifactId>alfresco-platform-enterprise</artifactId>
+            <version>${alfresco.platform.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
@@ -172,7 +172,7 @@
                     <modules>
                         <webModule>
                             <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-enterprise-war-for-ear</artifactId>
+                            <artifactId>alfresco-platform-enterprise</artifactId>
                             <bundleFileName>alfresco.war</bundleFileName>
                         </webModule>
                         <webModule>
diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml
deleted file mode 100644
index 1db7e2b636..0000000000
--- a/enterprise-war-for-ear/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<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 4fee219cf1..db61c1276a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,6 @@
         <profile>
             <id>enterprise</id>
             <modules>
-                <module>enterprise-war-for-ear</module>
                 <module>ear</module>
                 <module>enterprise-distribution</module>
                 <module>enterprise-update</module>