From d0ba492e3f3274839d9a56acb9be175a5881c720 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 3 Jun 2016 13:11:22 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to trunk (5.2)    125451 amorarasu:
 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)       125344 rneamtu: Merged 5.1.1
 (5.1.1) to 5.1.N (5.1.2)          125267 slanglois: MNT-16094 Remove ROOT.war
 from the Alfresco One EAR

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@127630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ear/pom.xml                                       | 11 -----------
 ear/src/main/application/META-INF/application.xml |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/ear/pom.xml b/ear/pom.xml
index e42a6dbb00..79dc0a58ab 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -36,12 +36,6 @@
             <version>${alfresco.share.version}</version>
             <type>war</type>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <version>${alfresco.platform.version}</version>
-            <type>war</type>
-        </dependency>
 
         <!-- Provided dependencies, unpacked -->
         <!-- Distribution zip -->
@@ -192,11 +186,6 @@
                             <artifactId>share</artifactId>
                             <bundleFileName>share.war</bundleFileName>
                         </webModule>
-                        <webModule>
-                            <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-server-root</artifactId>
-                            <bundleFileName>ROOT.war</bundleFileName>
-                        </webModule>
                     </modules>
                 </configuration>
             </plugin>
diff --git a/ear/src/main/application/META-INF/application.xml b/ear/src/main/application/META-INF/application.xml
index 426a2d396c..badc540b66 100644
--- a/ear/src/main/application/META-INF/application.xml
+++ b/ear/src/main/application/META-INF/application.xml
@@ -14,10 +14,4 @@
          <context-root>/share</context-root>
      </web>
    </module>
-   <module>
-     <web>
-         <web-uri>ROOT.war</web-uri>
-         <context-root>/</context-root>
-     </web>
-   </module>
 </application>