inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2E to HEAD

Browse Source 
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
         - Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
         - Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
         - Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
         - Works with authentication chain containing mixture of internally and externally authenticated users
   17247: Fix failing unit tests
         - rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
   17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-18 15:32:57 +00:00
parent e356f22ac1
commit 050e279912
21 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.html.ftl
View File

@@ -48,36 +48,7 @@
,
"properties" :
{
<#assign first = true>
<#list object.properties?keys as key>
<#if object.properties[key]?exists>
<#assign val = object.properties[key]>
<#if isUser && object.isTemplateContent(val)>
<#if first == false>,</#if>
"${key}" : "${jsonUtils.encodeJSONString(val.content)}"
<#assign first = false>
<#elseif object.isTemplateNodeRef(val)>
<#if first == false>,</#if>
"${key}" : "${val.nodeRef}"
<#assign first = false>
<#elseif val?is_string == true>
<#if first == false>,</#if>
"${key}" : "${jsonUtils.encodeJSONString(val)}"
<#assign first = false>
<#elseif val?is_date == true>
<#if first == false>,</#if>
"${key}" : "${val?datetime}"
<#assign first = false>
<#elseif val?is_boolean == true>
<#if first == false>,</#if>
"${key}" : "${val?string}"
<#assign first = false>
</#if>
</#if>
</#list>
<#if isUser>
, "isAdmin" : "${isAdmin?string}"
</#if>
<@serializeHash hash=object.properties/>
}
</#if>
@@ -109,4 +80,44 @@
}
</#if>
<#if isUser>
,
"capabilities" :
{
<@serializeHash hash=capabilities/>
}
</#if>
</#macro>
<#macro serializeHash hash>
<#local first = true>
<#list hash?keys as key>
<#if hash[key]?exists>
<#local val = hash[key]>
<#if isUser && object.isTemplateContent(val)>
<#if first == false>,</#if>
"${key}" : "${jsonUtils.encodeJSONString(val.content)}"
<#local first = false>
<#elseif object.isTemplateNodeRef(val)>
<#if first == false>,</#if>
"${key}" : "${val.nodeRef}"
<#local first = false>
<#elseif val?is_string == true>
<#if first == false>,</#if>
"${key}" : "${jsonUtils.encodeJSONString(val)}"
<#local first = false>
<#elseif val?is_date == true>
<#if first == false>,</#if>
"${key}" : "${val?datetime}"
<#local first = false>
<#elseif val?is_boolean == true>
<#if first == false>,</#if>
"${key}" : "${val?string}"
<#local first = false>
</#if>
</#if>
</#list>
</#macro>

5
config/alfresco/templates/webscripts/org/alfresco/webframework/metadata.get.js
View File

@@ -18,10 +18,9 @@ else if (args["user"] != null)
{
var userId = args["user"];
object = people.getPerson(userId);
model.isAdmin = people.isAdmin(object);
model.isGuest = people.isGuest(object);
model.isUser = true;
model.isUser = true;
model.includeChildren = false;
model.capabilities = people.getCapabilities(object);
}
// load content by relative path

10
source/java/org/alfresco/repo/web/scripts/LoginTest.java
View File

@@ -27,15 +27,15 @@ package org.alfresco.repo.web.scripts;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.json.JSONObject;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
import org.json.JSONObject;
/**
* Junit test for login / logout and validate web scripts
@@ -44,7 +44,7 @@ import org.json.JSONObject;
*/
public class LoginTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -53,7 +53,7 @@ public class LoginTest extends BaseWebScriptTest
protected void setUp() throws Exception
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/RepositoryContainerTest.java
View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.web.scripts;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
@@ -39,7 +39,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*/
public class RepositoryContainerTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private PersonService personService;
private static final String USER_ONE = "RunAsOne";
@@ -51,7 +51,7 @@ public class RepositoryContainerTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService) getServer().getApplicationContext().getBean(
this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext().getBean(
"AuthenticationService");
this.personService = (PersonService) getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/activities/feed/control/FeedControlTest.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
@@ -49,7 +49,7 @@ public class FeedControlTest extends BaseWebScriptTest
{
private static Log logger = LogFactory.getLog(FeedControlTest.class);
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -67,7 +67,7 @@ public class FeedControlTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/blog/BlogServiceTest.java
View File

@@ -33,7 +33,7 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
@@ -59,7 +59,7 @@ public class BlogServiceTest extends BaseWebScriptTest
@SuppressWarnings("unused")
private static Log logger = LogFactory.getLog(BlogServiceTest.class);
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private SiteService siteService;
@@ -83,7 +83,7 @@ public class BlogServiceTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");

6
source/java/org/alfresco/repo/web/scripts/discussion/DiscussionServiceTest.java
View File

@@ -32,7 +32,7 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
@@ -55,7 +55,7 @@ public class DiscussionServiceTest extends BaseWebScriptTest
{
private static Log logger = LogFactory.getLog(DiscussionServiceTest.class);
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private SiteService siteService;
@@ -78,7 +78,7 @@ public class DiscussionServiceTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");

6
source/java/org/alfresco/repo/web/scripts/groups/GroupsTest.java
View File

@@ -32,9 +32,9 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.Status;
@@ -60,7 +60,7 @@ public class GroupsTest extends BaseWebScriptTest
{
private static final Log logger = LogFactory.getLog(BaseWebScriptTest.class);
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthorityService authorityService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -142,7 +142,7 @@ public class GroupsTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService");

20
source/java/org/alfresco/repo/web/scripts/invitation/InvitationTest.java
View File

@@ -24,37 +24,27 @@
*/
package org.alfresco.repo.web.scripts.invitation;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.Status;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
import org.json.JSONArray;
import org.json.JSONObject;
/**
* Unit test of Invitation REST API.
@@ -65,7 +55,7 @@ import org.json.JSONObject;
*/
public class InvitationTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private SiteService siteService;
@@ -98,7 +88,7 @@ public class InvitationTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");

6
source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
View File

@@ -42,9 +42,9 @@ import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
@@ -74,7 +74,7 @@ public class InviteServiceTest extends BaseWebScriptTest
{
// member variables for service instances
private AuthorityService authorityService;
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private SiteService siteService;
@@ -123,7 +123,7 @@ public class InviteServiceTest extends BaseWebScriptTest
// get references to services
this.authorityService = (AuthorityService) getServer().getApplicationContext().getBean("AuthorityService");
this.authenticationService = (AuthenticationService) getServer().getApplicationContext()
this.authenticationService = (MutableAuthenticationService) getServer().getApplicationContext()
.getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent) getServer().getApplicationContext()
.getBean("AuthenticationComponent");

10
source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
View File

@@ -29,15 +29,15 @@ import java.util.HashMap;
import java.util.Map;
import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.json.JSONException;
import org.json.JSONObject;
import org.springframework.extensions.surf.util.Content;
import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest;
import org.json.JSONException;
import org.json.JSONObject;
/**
* Webscript implementation for the POST method for 'changepassword' API.
@@ -48,14 +48,14 @@ public class ChangePasswordPost extends DeclarativeWebScript
{
private static final String PARAM_NEWPW = "newpw";
private static final String PARAM_OLDPW = "oldpw";
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthorityService authorityService;
/**
* @param authenticationService the AuthenticationService to set
*/
public void setAuthenticationService(AuthenticationService authenticationService)
public void setAuthenticationService(MutableAuthenticationService authenticationService)
{
this.authenticationService = authenticationService;
}

6
source/java/org/alfresco/repo/web/scripts/person/PersonServiceTest.java
View File

@@ -30,7 +30,7 @@ import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.Status;
@@ -49,7 +49,7 @@ import org.json.JSONObject;
*/
public class PersonServiceTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -66,7 +66,7 @@ public class PersonServiceTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/preference/PreferenceServiceTest.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
@@ -45,7 +45,7 @@ import org.json.JSONObject;
*/
public class PreferenceServiceTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -59,7 +59,7 @@ public class PreferenceServiceTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/search/PersonSearchTest.java
View File

@@ -28,8 +28,8 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.Status;
@@ -44,7 +44,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*/
public class PersonSearchTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private AuthorityService authorityService;
@@ -58,7 +58,7 @@ public class PersonSearchTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService");

6
source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
View File

@@ -39,9 +39,9 @@ import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
@@ -65,7 +65,7 @@ import org.json.JSONObject;
*/
public class SiteServiceTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private SiteService siteService;
@@ -87,7 +87,7 @@ public class SiteServiceTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");

6
source/java/org/alfresco/repo/web/scripts/tagging/TaggingServiceTest.java
View File

@@ -33,7 +33,7 @@ import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.tagging.TaggingService;
import org.alfresco.util.GUID;
@@ -49,7 +49,7 @@ import org.json.JSONArray;
*/
public class TaggingServiceTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
private TaggingService taggingService;
@@ -73,7 +73,7 @@ public class TaggingServiceTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.taggingService = (TaggingService)getServer().getApplicationContext().getBean("TaggingService");

6
source/java/org/alfresco/repo/web/scripts/wcm/WebProjectTest.java
View File

@@ -31,7 +31,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.Status;
@@ -50,7 +50,7 @@ import org.json.JSONObject;
*/
public class WebProjectTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -77,7 +77,7 @@ public class WebProjectTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/wcm/membership/WebProjectMembershipTest.java
View File

@@ -31,7 +31,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.springframework.extensions.webscripts.Status;
@@ -49,7 +49,7 @@ import org.json.JSONObject;
*/
public class WebProjectMembershipTest extends BaseWebScriptTest
{
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -77,7 +77,7 @@ public class WebProjectMembershipTest extends BaseWebScriptTest
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java
View File

@@ -33,7 +33,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
import org.json.JSONArray;
@@ -50,7 +50,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*/
public class AssetTest extends BaseWebScriptTest {
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -88,7 +88,7 @@ public class AssetTest extends BaseWebScriptTest {
setCustomContext(SUBMIT_CONFIG_LOCATION);
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

6
source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java
View File

@@ -33,7 +33,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.springframework.extensions.surf.util.ISO8601DateFormat;
import org.alfresco.util.PropertyMap;
@@ -52,7 +52,7 @@ import org.json.JSONObject;
*/
public class SandboxTest extends BaseWebScriptTest {
private AuthenticationService authenticationService;
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private PersonService personService;
@@ -80,7 +80,7 @@ public class SandboxTest extends BaseWebScriptTest {
{
super.setUp();
this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");

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

@@ -45,8 +45,8 @@ import org.alfresco.repo.webservice.types.NamedValue;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
@@ -76,7 +76,7 @@ public class AdministrationWebService extends AbstractWebService implements
private boolean manageAuthenticationDetails = true;
/** The authentication service */
private AuthenticationService authenticationService = null;
private MutableAuthenticationService authenticationService = null;
private AuthorityService authorityService;
@@ -133,7 +133,7 @@ public class AdministrationWebService extends AbstractWebService implements
*
* @param authenticationService the authentication service
*/
public void setAuthenticationService(AuthenticationService authenticationService)
public void setAuthenticationService(MutableAuthenticationService authenticationService)
{
this.authenticationService = authenticationService;
}