From 29289fbd2ed7d173a32ef19bd07519cf24afbbfb Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sun, 8 Sep 2013 07:39:28 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX to HEAD (4.2)    54935: Merged
 V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)       54755: Merged V4.1.6 (4.1.6)
 to V4.1-BUG-FIX (4.1.7)          54620: Merged DEV to PATCHES/V4.1.6 (4.1.6) 
            54599: ALF-19801 (MNT-9534) : OpenCMIS endpoint HTTP 302 redirect
 to Explorer login page!             Switched /cmisatom context to use WebDAV
 authentication filter.             Injected remoteUserMapper to the
 AlfrescoNtlm WebDAV filter implementation to support external together with  
           NTLM.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../Authentication/alfrescoNtlm/ntlm-filter-context.xml    | 3 +++
 source/web/WEB-INF/web.xml                                 | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml b/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
index be8320d530..0e9d4090f9 100644
--- a/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
+++ b/config/alfresco/subsystems/Authentication/alfrescoNtlm/ntlm-filter-context.xml
@@ -102,6 +102,9 @@
       <property name="mapUnknownUserToGuest">
          <value>${ntlm.authentication.mapUnknownUserToGuest}</value>
       </property>
+      <property name="remoteUserMapper">
+         <ref bean="RemoteUserMapper" />
+      </property>
    </bean>
 
    <bean id="sharepointAuthenticationHandler" class="org.alfresco.web.sharepoint.auth.ntlm.NtlmAuthenticationHandler">
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 83689caf7b..04209ba9b9 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -327,12 +327,7 @@
    </filter-mapping>
 
    <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/cmisatom/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Authentication Filter</filter-name>
+      <filter-name>WebDAV Authentication Filter</filter-name>
       <url-pattern>/cmisatom/*</url-pattern>
    </filter-mapping>