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 V3.1 to HEAD

Browse Source 
12896: Merged DEV/LIVECYCLE-3.1 to V3.1
      12859: Merged V2.1-A to DEV/LIVECYCLE-3.1
         9040: Fixed WebService client code to take dynamic webapp name
      12865: Merged V2.1-A to DEV/LIVECYCLE-3.1
         9040 integration: Added 'repository.webapp' (defaults to 'alfresco') for Webservice clients
      12868: JAWS-142: Adobe LC JGroups Clustering
             - JGroups communications and factories remain in 'repository' project
             - JGroups EHCache integration moved to 'enterpriserepository' project
             - Default factory for EHCache cluster config is aware of open-enterprise split
             - Default EHCache config still works as normal
             - JGroups EHCache config still enabled by setting 'alfresco.cluster.name' property
      12887: Merged V2.1-A to DEV\LIVECYCLE-31
         8619: Hard-coded "admin" usage in non-test classes only
   12906: Re-deleted files after merge mix-up
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r12896,12906


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-10 14:22:22 +00:00
parent e4bc8650d8
commit 5b8f58494e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/web-services-application-context.xml
View File

@@ -218,6 +218,9 @@
<property name="authenticationService"> <property name="authenticationService">
<ref bean="AuthenticationService"/> <ref bean="AuthenticationService"/>
</property> </property>
<property name="authorityService">
<ref bean="AuthorityService"/>
</property>
<property name="personService"> <property name="personService">
<ref bean="PersonService"/> <ref bean="PersonService"/>
</property> </property>

15
source/java/org/alfresco/repo/webservice/administration/AdministrationWebService.java
View File

@@ -46,6 +46,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
@@ -77,6 +78,8 @@ public class AdministrationWebService extends AbstractWebService implements
/** The authentication service */ /** The authentication service */
private AuthenticationService authenticationService = null; private AuthenticationService authenticationService = null;
private AuthorityService authorityService;
/** The transaction service */ /** The transaction service */
private TransactionService transactionService = null; private TransactionService transactionService = null;
@@ -135,6 +138,16 @@ public class AdministrationWebService extends AbstractWebService implements
this.authenticationService = authenticationService; this.authenticationService = authenticationService;
} }
/**
* Set the authority service used to determine admin rights.
*
* @param authorityService the service implementation
*/
public void setAuthorityService(AuthorityService authorityService)
{
this.authorityService = authorityService;
}
/** /**
* @see org.alfresco.repo.webservice.administration.AdministrationServiceSoapPort#queryUsers(org.alfresco.repo.webservice.administration.UserFilter) * @see org.alfresco.repo.webservice.administration.AdministrationServiceSoapPort#queryUsers(org.alfresco.repo.webservice.administration.UserFilter)
*/ */
@@ -534,7 +547,7 @@ public class AdministrationWebService extends AbstractWebService implements
if (this.manageAuthenticationDetails == true) if (this.manageAuthenticationDetails == true)
{ {
// Update the authentication details // Update the authentication details
if (this.authenticationService.getCurrentUserName().equals("admin") == true) if (this.authorityService.hasAdminAuthority() == true)
{ {
this.authenticationService.setAuthentication(userName, newPassword.toCharArray()); this.authenticationService.setAuthentication(userName, newPassword.toCharArray());
} }