Merged V3.3-BUG-FIX to HEAD

20895: Merged V3.3 to V3.3-BUG-FIX
      20894: Merged PATCHES/V3.2.1 to V3.3
         20893: ALF-3737: Fix passthru subsystem SSO config, broken by ALF-2265
            - Expanded unit tests to ensure passthru and kerberos subsystems always initialize


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-07-01 13:22:13 +00:00
parent 335f9a97ff
commit bcff9b3596

View File

@@ -38,13 +38,10 @@
</property>
</bean>
<bean id="webscriptAuthenticationFilter" class="org.alfresco.web.app.servlet.WebScriptNTLMAuthenticationFilter">
<bean id="webscriptAuthenticationFilter" class="org.alfresco.web.app.servlet.WebScriptSSOAuthenticationFilter">
<property name="active">
<value>${ntlm.authentication.sso.enabled}</value>
</property>
<property name="serverConfiguration">
<ref bean="fileServerConfiguration" />
</property>
<property name="authenticationService">
<ref bean="AuthenticationService" />
</property>
@@ -60,12 +57,6 @@
<property name="transactionService">
<ref bean="TransactionService" />
</property>
<property name="mapUnknownUserToGuest">
<value>${ntlm.authentication.mapUnknownUserToGuest}</value>
</property>
<property name="configService">
<ref bean="webClientConfigService" />
</property>
<property name="container">
<ref bean="webscripts.container" />
</property>