Merged V2.0 to HEAD

5135: AR-1240 (AuthenticationComponent bean naming)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-03-07 09:59:47 +00:00
parent 80ce950335
commit 4a44e4d3a2
12 changed files with 13 additions and 14 deletions

View File

@@ -124,7 +124,7 @@
<ref bean="ticketComponent" />
</property>
<property name="authenticationComponent">
<ref bean="authenticationComponentImpl" />
<ref bean="authenticationComponent" />
</property>
</bean>
@@ -147,7 +147,6 @@
</property>
</bean>
<alias name="authenticationComponent" alias="authenticationComponentImpl"/> <!-- TODO: Remove -->
<bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl">
<property name="authenticationDao">
<ref bean="authenticationDao" />
@@ -166,7 +165,7 @@
<!-- It should never go to the login screen so this is not required -->
<!--
<bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl">
<bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl">
<property name="accept">
<value>true</value>
</property>

View File

@@ -14,7 +14,7 @@
<bean id="authorityService" class="org.alfresco.repo.security.authority.AuthorityServiceImpl">
<property name="authenticationComponent">
<ref bean="authenticationComponentImpl" />
<ref bean="authenticationComponent" />
</property>
<property name="personService">
<ref bean="personService" />

View File

@@ -6,7 +6,7 @@
<!-- Jass authentication - most of the config goes somewhere else -->
<bean id="authenticationComponentImpl"
<bean id="authenticationComponent"
class="org.alfresco.repo.security.authentication.jaas.JAASAuthenticationComponent">
<property name="realm">
<value>DEFAULT.REALM</value>

View File

@@ -17,7 +17,7 @@
<!-- servers comma delimted list of server addresses or -->
<!-- names -->
<bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.ntlm.NTLMAuthenticationComponentImpl">
<bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.ntlm.NTLMAuthenticationComponentImpl">
<property name="useLocalServer">
<value>true</value>
</property>

View File

@@ -5,7 +5,7 @@
<bean id="indexRecoveryComponentBase" abstract="true" >
<property name="authenticationComponent">
<ref bean="authenticationComponentImpl" />
<ref bean="authenticationComponent" />
</property>
<property name="transactionComponent">
<ref bean="transactionComponent" />

View File

@@ -57,7 +57,7 @@
<ref bean="permissionsModelDAO" />
</property>
<property name="authenticationComponent">
<ref bean="authenticationComponentImpl" />
<ref bean="authenticationComponent" />
</property>
<property name="authorityService">
<ref bean="authorityService" />