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

Merged V2.0 to HEAD

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/authentication-services-context.xml
View File

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

2
config/alfresco/authority-services-context.xml
View File

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

2
config/alfresco/extension/jaas-authentication-context.xml.sample
View File

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

2
config/alfresco/extension/ntlm-authentication-context.xml.sample
View File

@@ -17,7 +17,7 @@
<!-- servers comma delimted list of server addresses or --> <!-- servers comma delimted list of server addresses or -->
<!-- names --> <!-- 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"> <property name="useLocalServer">
<value>true</value> <value>true</value>
</property> </property>

2
config/alfresco/index-recovery-context.xml
View File

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

2
config/alfresco/public-services-security-context.xml
View File

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

2
source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
View File

@@ -76,7 +76,7 @@ public class FreeMarkerModelLuceneFunctionTest extends TestCase
public void setUp() throws Exception public void setUp() throws Exception
{ {
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry"); serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry");
this.authenticationComponent.setSystemUserAsCurrentUser(); this.authenticationComponent.setSystemUserAsCurrentUser();

2
source/java/org/alfresco/repo/node/index/IndexRemoteTransactionTrackerTest.java
View File

@@ -75,7 +75,7 @@ public class IndexRemoteTransactionTrackerTest extends TestCase
searchService = serviceRegistry.getSearchService(); searchService = serviceRegistry.getSearchService();
nodeService = serviceRegistry.getNodeService(); nodeService = serviceRegistry.getNodeService();
fileFolderService = serviceRegistry.getFileFolderService(); fileFolderService = serviceRegistry.getFileFolderService();
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
contentStore = (ContentStore) ctx.getBean("fileContentStore"); contentStore = (ContentStore) ctx.getBean("fileContentStore");
ftsIndexer = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer"); ftsIndexer = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer");

2
source/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
View File

@@ -75,7 +75,7 @@ public class MissingContentReindexComponentTest extends TestCase
searchService = serviceRegistry.getSearchService(); searchService = serviceRegistry.getSearchService();
nodeService = serviceRegistry.getNodeService(); nodeService = serviceRegistry.getNodeService();
fileFolderService = serviceRegistry.getFileFolderService(); fileFolderService = serviceRegistry.getFileFolderService();
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
contentStore = (ContentStore) ctx.getBean("fileContentStore"); contentStore = (ContentStore) ctx.getBean("fileContentStore");
ftsIndexer = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer"); ftsIndexer = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer");

2
source/java/org/alfresco/repo/search/SearchServiceTest.java
View File

@@ -96,7 +96,7 @@ public class SearchServiceTest extends TestCase
public void setUp() throws Exception public void setUp() throws Exception
{ {
nodeService = (NodeService) ctx.getBean("dbNodeService"); nodeService = (NodeService) ctx.getBean("dbNodeService");
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
authenticationService = (AuthenticationService) ctx.getBean("authenticationService"); authenticationService = (AuthenticationService) ctx.getBean("authenticationService");
authenticationDAO = (MutableAuthenticationDao) ctx.getBean("alfDaoImpl"); authenticationDAO = (MutableAuthenticationDao) ctx.getBean("alfDaoImpl");
pubSearchService = (SearchService) ctx.getBean("SearchService"); pubSearchService = (SearchService) ctx.getBean("SearchService");

2
source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
View File

@@ -126,7 +126,7 @@ public class AuthenticationTest extends TestCase
authenticationService = (AuthenticationService) ctx.getBean("authenticationService"); authenticationService = (AuthenticationService) ctx.getBean("authenticationService");
pubAuthenticationService = (AuthenticationService) ctx.getBean("AuthenticationService"); pubAuthenticationService = (AuthenticationService) ctx.getBean("AuthenticationService");
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl"); authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponent");
// permissionServiceSPI = (PermissionServiceSPI) // permissionServiceSPI = (PermissionServiceSPI)
// ctx.getBean("permissionService"); // ctx.getBean("permissionService");
ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache"); ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache");

2
source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
View File

@@ -69,7 +69,7 @@ public class AuthorityServiceTest extends TestCase
public void setUp() throws Exception public void setUp() throws Exception
{ {
authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent"); authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl"); authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponent");
authenticationService = (AuthenticationService) ctx.getBean("authenticationService"); authenticationService = (AuthenticationService) ctx.getBean("authenticationService");
authorityService = (AuthorityService) ctx.getBean("authorityService"); authorityService = (AuthorityService) ctx.getBean("authorityService");
pubAuthorityService = (AuthorityService) ctx.getBean("AuthorityService"); pubAuthorityService = (AuthorityService) ctx.getBean("AuthorityService");