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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
64426: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62536: Reverted Sites Public REST API changes, committed in r61735 and r62502. Also updated CloudSiteServiceImpl overlay to override isSiteAdmin method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-15 01:40:20 +00:00
parent 25895187d8
commit b0add3b79a
4 changed files with 549 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
source/java/org/alfresco/rest/api/Sites.java
View File

@@ -16,7 +16,6 @@
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.rest.api;
import org.alfresco.query.PagingResults;
@@ -24,7 +23,6 @@ import org.alfresco.rest.api.model.FavouriteSite;
import org.alfresco.rest.api.model.MemberOfSite;
import org.alfresco.rest.api.model.Site;
import org.alfresco.rest.api.model.SiteContainer;
import org.alfresco.rest.api.model.SiteImpl;
import org.alfresco.rest.api.model.SiteMember;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Paging;
@@ -35,52 +33,32 @@ import org.alfresco.service.cmr.site.SiteRole;
public interface Sites
{
SiteInfo validateSite(String siteShortName);
SiteInfo validateSite(NodeRef nodeRef);
SiteInfo validateSite(String siteShortName);
SiteInfo validateSite(NodeRef nodeRef);
CollectionWithPagingInfo<SiteMember> getSiteMembers(String siteShortName, Parameters parameters);
Site getSite(String siteId);
SiteImpl updateSite(String siteShortName, SiteImpl site);
void deleteSite(String siteShortName);
/**
* people/<personId>/sites/<siteId>
*
* @param siteId
* @param personId
* @return
*/
MemberOfSite getMemberOfSite(String personId, String siteShortName);
SiteMember getSiteMember(String personId, String siteShortName);
SiteMember addSiteMember(String siteShortName, SiteMember siteMember);
void removeSiteMember(String personId, String siteId);
SiteMember updateSiteMember(String siteShortName, SiteMember siteMember);
CollectionWithPagingInfo<MemberOfSite> getSites(String personId, Parameters parameters);
SiteContainer getSiteContainer(String siteShortName, String containerId);
PagingResults<SiteContainer> getSiteContainers(String siteShortName, Paging paging);
CollectionWithPagingInfo<Site> getSites(Parameters parameters);
/**
* people/<personId>/sites/<siteId>
*
* @param siteId
* @param personId
* @return
*/
MemberOfSite getMemberOfSite(String personId, String siteShortName);
SiteMember getSiteMember(String personId, String siteShortName);
SiteMember addSiteMember(String siteShortName, SiteMember siteMember);
void removeSiteMember(String personId, String siteId);
SiteMember updateSiteMember(String siteShortName, SiteMember siteMember);
CollectionWithPagingInfo<MemberOfSite> getSites(String personId, Parameters parameters);
SiteContainer getSiteContainer(String siteShortName, String containerId);
PagingResults<SiteContainer> getSiteContainers(String siteShortName, Paging paging);
CollectionWithPagingInfo<Site> getSites(Parameters parameters);
FavouriteSite getFavouriteSite(String personId, String siteShortName);
void addFavouriteSite(String personId, FavouriteSite favouriteSite);
void removeFavouriteSite(String personId, String siteId);
CollectionWithPagingInfo<FavouriteSite> getFavouriteSites(String personId, Parameters parameters);
SiteRole getSiteRole(String siteId);
SiteRole getSiteRole(String siteId, String personId);
}