From e57e0a01884a1d5997a5ae40c121a037aa6cb78c Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 23 Jul 2014 10:28:14 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    76908:
 Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       66846:
 ACE-639: Added AOS based implementation to enterprise remote-api, extended
 config, adopted build

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/web/WEB-INF/web.xml | 29 ++++++++++++++++++-----------
 source/web/index.jsp       |  2 ++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index aa42747f02..6268dd04c5 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -98,8 +98,8 @@
       <param-name>org.apache.myfaces.ERROR_HANDLING</param-name>
       <param-value>false</param-value>
    </context-param>
-   
-   <!-- Activiti context param placeholder -->
+
+   <!-- Enterprise context-param placeholder -->
 
    <filter>
       <description>Cleans security context before authentication via the CMIS services or filters. Mapped only for CMIS</description>
@@ -183,6 +183,8 @@
       <filter-class>org.alfresco.repo.web.filter.beans.SessionSynchronizedFilter</filter-class>
    </filter>
 
+   <!-- Enterprise filter placeholder -->
+
    <filter-mapping>
       <filter-name>Global Localization Filter</filter-name>
       <url-pattern>/*</url-pattern>
@@ -238,10 +240,10 @@
       <filter-name>Global Authentication Filter</filter-name>
       <url-pattern>/d/*</url-pattern>
    </filter-mapping>
- 
+
    <!-- Activiti Global Authentication Filter mapping placeholder -->
 
-    <!-- The Cookie WebScript Authentication filter sits in front of web service URLs in addition to the global authentication filter -->  
+   <!-- The Cookie WebScript Authentication filter sits in front of web service URLs in addition to the global authentication filter -->  
    <filter-mapping>
       <filter-name>WebScript Cookie Authentication Filter</filter-name>
       <url-pattern>/wcservice/*</url-pattern>
@@ -337,23 +339,29 @@
       <filter-name>CacheExpiresFilter</filter-name>
       <url-pattern>*.jpg</url-pattern>
    </filter-mapping>
+
    <filter-mapping>
       <filter-name>CacheExpiresFilter</filter-name>
       <url-pattern>*.png</url-pattern>
    </filter-mapping>
+
    <filter-mapping>
       <filter-name>CacheExpiresFilter</filter-name>
       <url-pattern>*.gif</url-pattern>
    </filter-mapping>
+
    <filter-mapping>
       <filter-name>CacheExpiresFilter</filter-name>
       <url-pattern>*.css</url-pattern>
    </filter-mapping>
+
    <filter-mapping>
       <filter-name>CacheExpiresFilter</filter-name>
       <url-pattern>*.js</url-pattern>
    </filter-mapping>
 
+   <!-- Enterprise filter-mapping placeholder -->
+
    <listener>
       <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
    </listener>
@@ -381,9 +389,8 @@
    <listener>
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
    </listener> 
-   
-   <!-- Activiti listener placeholder -->
 
+   <!-- Enterprise listener placeholder -->
 
    <!-- Faces Servlet -->
    <servlet>
@@ -603,9 +610,9 @@
          <param-value>publicapi.authenticator</param-value>
       </init-param>
    </servlet>
-   
-   <!-- Activiti servlet placeholder -->
-	
+
+   <!-- Enterprise servlet placeholder -->
+
    <servlet-mapping>
       <servlet-name>Faces Servlet</servlet-name>
       <url-pattern>/faces/*</url-pattern>
@@ -773,8 +780,8 @@
       <url-pattern>/cmistck</url-pattern>
    </servlet-mapping>
    CMISTCK -->
-   
-   <!-- Activiti servlet mapping placeholder -->
+
+   <!-- Enterprise servlet-mapping placeholder -->
 
    <session-config>
       <session-timeout>60</session-timeout>
diff --git a/source/web/index.jsp b/source/web/index.jsp
index 76f848a41d..701efbbf4a 100644
--- a/source/web/index.jsp
+++ b/source/web/index.jsp
@@ -36,6 +36,8 @@
 <%@ page import="org.alfresco.web.bean.repository.PreferencesService" %>
 <%@ page import="org.alfresco.web.config.ClientConfigElement" %>
 
+<!-- Enterprise index-jsp placeholder -->
+
 <%-- redirect to the web application's appropriate start page --%>
 <%
 // get the start location as configured by the web-client config