inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
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
This commit is contained in:
Mark Rogers
2014-07-23 10:28:14 +00:00
parent 8514941a50
commit e57e0a0188
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/web/WEB-INF/web.xml
View File

@@ -99,7 +99,7 @@
<param-value>false</param-value> <param-value>false</param-value>
</context-param> </context-param>
<!-- Activiti context param placeholder --> <!-- Enterprise context-param placeholder -->
<filter> <filter>
<description>Cleans security context before authentication via the CMIS services or filters. Mapped only for CMIS</description> <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-class>org.alfresco.repo.web.filter.beans.SessionSynchronizedFilter</filter-class>
</filter> </filter>
<!-- Enterprise filter placeholder -->
<filter-mapping> <filter-mapping>
<filter-name>Global Localization Filter</filter-name> <filter-name>Global Localization Filter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
@@ -241,7 +243,7 @@
<!-- Activiti Global Authentication Filter mapping placeholder --> <!-- 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-mapping>
<filter-name>WebScript Cookie Authentication Filter</filter-name> <filter-name>WebScript Cookie Authentication Filter</filter-name>
<url-pattern>/wcservice/*</url-pattern> <url-pattern>/wcservice/*</url-pattern>
@@ -337,23 +339,29 @@
<filter-name>CacheExpiresFilter</filter-name> <filter-name>CacheExpiresFilter</filter-name>
<url-pattern>*.jpg</url-pattern> <url-pattern>*.jpg</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping> <filter-mapping>
<filter-name>CacheExpiresFilter</filter-name> <filter-name>CacheExpiresFilter</filter-name>
<url-pattern>*.png</url-pattern> <url-pattern>*.png</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping> <filter-mapping>
<filter-name>CacheExpiresFilter</filter-name> <filter-name>CacheExpiresFilter</filter-name>
<url-pattern>*.gif</url-pattern> <url-pattern>*.gif</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping> <filter-mapping>
<filter-name>CacheExpiresFilter</filter-name> <filter-name>CacheExpiresFilter</filter-name>
<url-pattern>*.css</url-pattern> <url-pattern>*.css</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping> <filter-mapping>
<filter-name>CacheExpiresFilter</filter-name> <filter-name>CacheExpiresFilter</filter-name>
<url-pattern>*.js</url-pattern> <url-pattern>*.js</url-pattern>
</filter-mapping> </filter-mapping>
<!-- Enterprise filter-mapping placeholder -->
<listener> <listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener> </listener>
@@ -382,8 +390,7 @@
<listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class> <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
</listener> </listener>
<!-- Activiti listener placeholder --> <!-- Enterprise listener placeholder -->
<!-- Faces Servlet --> <!-- Faces Servlet -->
<servlet> <servlet>
@@ -604,7 +611,7 @@
</init-param> </init-param>
</servlet> </servlet>
<!-- Activiti servlet placeholder --> <!-- Enterprise servlet placeholder -->
<servlet-mapping> <servlet-mapping>
<servlet-name>Faces Servlet</servlet-name> <servlet-name>Faces Servlet</servlet-name>
@@ -774,7 +781,7 @@
</servlet-mapping> </servlet-mapping>
CMISTCK --> CMISTCK -->
<!-- Activiti servlet mapping placeholder --> <!-- Enterprise servlet-mapping placeholder -->
<session-config> <session-config>
<session-timeout>60</session-timeout> <session-timeout>60</session-timeout>

2
source/web/index.jsp
View File

@@ -36,6 +36,8 @@
<%@ page import="org.alfresco.web.bean.repository.PreferencesService" %> <%@ page import="org.alfresco.web.bean.repository.PreferencesService" %>
<%@ page import="org.alfresco.web.config.ClientConfigElement" %> <%@ page import="org.alfresco.web.config.ClientConfigElement" %>
<!-- Enterprise index-jsp placeholder -->
<%-- redirect to the web application's appropriate start page --%> <%-- redirect to the web application's appropriate start page --%>
<% <%
// get the start location as configured by the web-client config // get the start location as configured by the web-client config