MERGE DEV/3.2_INVITATION to HEAD

MOB-124 First cut of invitation service
  First cut group site membership

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-02-26 15:53:23 +00:00
parent 52a639c2c8
commit 0f9c09ba09
62 changed files with 5678 additions and 381 deletions

View File

@@ -37,14 +37,16 @@ import org.alfresco.repo.jscript.ScriptNode.NodeValueConverter;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.site.SiteInfo;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.site.SiteService;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PermissionService;
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.ParameterCheck;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
@@ -158,7 +160,8 @@ public class Site implements Serializable
/**
* Gets whether the site is public or not
*
* @return true is public false otherwise
* @return true is public false otherwise
* @deprecated since version 3.2, replaced by {@link #getVisibility()}
*/
public boolean getIsPublic()
{
@@ -169,6 +172,7 @@ public class Site implements Serializable
* Set whether the site is public or not
*
* @param isPublic true the site is public false otherwise
* @deprecated since version 3.2, replaced by {@link #setVisibility(String)}
*/
public void setIsPublic(boolean isPublic)
{
@@ -176,6 +180,29 @@ public class Site implements Serializable
this.siteInfo.setIsPublic(isPublic);
}
/**
* Get the site visibility
*
* @return String site visibility
*/
public String getVisibility()
{
return this.siteInfo.getVisibility().toString();
}
/**
* Set the site visibility
*
* @param visibility site visibility (public|moderated|private)
*/
public void setVisibility(String visibility)
{
ParameterCheck.mandatoryString("visibility", visibility);
SiteVisibility siteVisibility = SiteVisibility.valueOf(visibility);
this.siteInfo.setVisibility(siteVisibility);
this.isDirty = true;
}
/**
* Get the site node, null if none
*