From 6d007c61d35aa3e164b4635cfd44199646e759e7 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 21 Jun 2016 11:08:14 +0000
Subject: [PATCH] Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)    128205 amukha:
 MNT-16334: AOSM is not working on any web server except Tomcat       - Added
 placeholders for AOSM configuration for building full ear file.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/web/WEB-INF/web.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index ac39ed85e8..368930fc27 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -97,7 +97,9 @@
       </init-param>
       -->
    </filter>
-   
+
+   <!-- AOSM filter placeholder -->
+
    <!-- CORS Filter Begin -->
    <!--<filter>
       <filter-name>CORS</filter-name>
@@ -230,6 +232,7 @@
       <url-pattern>/wcs/api/solr/*</url-pattern>
    </filter-mapping>
 
+   <!-- AOSM filter-mapping placeholder -->
 
    <!-- Enterprise filter-mapping placeholder -->
 
@@ -417,6 +420,8 @@
       </init-param>
    </servlet>
 
+   <!-- AOSM servlet placeholder -->
+
    <!-- Enterprise servlet placeholder -->
 
    <servlet-mapping>
@@ -512,6 +517,8 @@
    </servlet-mapping>
    CMISTCK -->
 
+   <!-- AOSM servlet-mapping placeholder -->
+
    <!-- Enterprise servlet-mapping placeholder -->
 
    <session-config>