inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
93992: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93945: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93895: MNT-12873: Merged V4.2.3 (4.2.3.16) to V4.2-BUG-FIX(4.2.5)
            93552 :Merged DEV to V4.2.3 (4.2.3.16)
               93524: MNT-13156: CLONE - Introduction of SiteRole in 4.2.x breaks sites API when there is a custom role defined
                  - Implement site role as String instead of enumeration to allow custom roles. Add CustomRoleTest Unit Test. In SitesImpl convert UnknownAuthorityException into InvalidArgumentException.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:29:20 +00:00
parent 7e1f737e7e
commit 10971d5415
8 changed files with 49 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/model/FavouriteSite.java
View File

@@ -19,7 +19,6 @@
package org.alfresco.rest.api.model;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
/**
* Represents a user's favourite site.
@@ -35,7 +34,7 @@ public class FavouriteSite extends SiteImpl
{
}
public FavouriteSite(SiteInfo siteInfo, SiteRole role)
public FavouriteSite(SiteInfo siteInfo, String role)
{
super(siteInfo, role);
}

11
source/java/org/alfresco/rest/api/model/MemberOfSite.java
View File

@@ -23,7 +23,6 @@ import org.alfresco.rest.framework.resource.EmbeddedEntityResource;
import org.alfresco.rest.framework.resource.UniqueId;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
/**
* Represents membership of a site.
@@ -33,7 +32,7 @@ import org.alfresco.service.cmr.site.SiteRole;
*/
public class MemberOfSite implements Comparable<MemberOfSite>
{
private SiteRole role;
private String role;
private String siteShortName;
private NodeRef guid;
@@ -41,7 +40,7 @@ public class MemberOfSite implements Comparable<MemberOfSite>
{
}
public MemberOfSite(String siteShortName, NodeRef siteGuid, SiteRole role)
public MemberOfSite(String siteShortName, NodeRef siteGuid, String role)
{
super();
if(siteShortName == null)
@@ -61,7 +60,7 @@ public class MemberOfSite implements Comparable<MemberOfSite>
this.guid = siteGuid;
}
public static MemberOfSite getMemberOfSite(SiteInfo siteInfo, SiteRole siteRole)
public static MemberOfSite getMemberOfSite(SiteInfo siteInfo, String siteRole)
{
MemberOfSite memberOfSite = new MemberOfSite(siteInfo.getShortName(), siteInfo.getNodeRef(), siteRole);
return memberOfSite;
@@ -84,12 +83,12 @@ public class MemberOfSite implements Comparable<MemberOfSite>
this.guid = guid;
}
public SiteRole getRole()
public String getRole()
{
return role;
}
public void setRole(SiteRole role)
public void setRole(String role)
{
if(role == null)
{

3
source/java/org/alfresco/rest/api/model/Site.java
View File

@@ -19,7 +19,6 @@
package org.alfresco.rest.api.model;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteRole;
import org.alfresco.service.cmr.site.SiteVisibility;
/**
@@ -38,5 +37,5 @@ public interface Site
String getTitle();
String getDescription();
SiteVisibility getVisibility();
SiteRole getRole();
String getRole();
}

7
source/java/org/alfresco/rest/api/model/SiteImpl.java
View File

@@ -21,7 +21,6 @@ package org.alfresco.rest.api.model;
import org.alfresco.rest.framework.resource.UniqueId;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteRole;
import org.alfresco.service.cmr.site.SiteVisibility;
/**
@@ -37,13 +36,13 @@ public class SiteImpl implements Site, Comparable<SiteImpl>
protected String title;
protected String description;
protected SiteVisibility visibility;
protected SiteRole role;
protected String role;
public SiteImpl()
{
}
public SiteImpl(SiteInfo siteInfo, SiteRole role)
public SiteImpl(SiteInfo siteInfo, String role)
{
if(siteInfo == null)
{
@@ -140,7 +139,7 @@ public class SiteImpl implements Site, Comparable<SiteImpl>
}
@Override
public SiteRole getRole()
public String getRole()
{
return role;
}

8
source/java/org/alfresco/rest/api/model/SiteMember.java
View File

@@ -32,13 +32,13 @@ import org.alfresco.service.cmr.site.SiteRole;
public class SiteMember
{
private String personId;
private SiteRole role;
private String role;
public SiteMember()
{
}
public SiteMember(String personId, SiteRole role)
public SiteMember(String personId, String role)
{
super();
if(personId == null)
@@ -60,12 +60,12 @@ public class SiteMember
return personId;
}
public SiteRole getRole()
public String getRole()
{
return role;
}
public void setRole(SiteRole role)
public void setRole(String role)
{
if(role == null)
{