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 (5.2) to 5.2.N (5.2.1)

Browse Source 
127528 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125406 jvonka: RA-779 / RA-780: Sites API - initial commit for create site [default/functional Share site ;-)] & delete site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 13:59:39 +00:00
parent 0fe50bd9f0
commit bfa0404bab
15 changed files with 705 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/java/org/alfresco/rest/api/impl/FavouritesImpl.java
View File

@@ -1,4 +1,4 @@
/*
/*
* #%L
* Alfresco Remote API
* %%
@@ -9,20 +9,20 @@
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api.impl;
import java.util.AbstractList;
@@ -47,7 +47,6 @@ import org.alfresco.rest.api.model.Favourite;
import org.alfresco.rest.api.model.Folder;
import org.alfresco.rest.api.model.FolderTarget;
import org.alfresco.rest.api.model.Site;
import org.alfresco.rest.api.model.SiteImpl;
import org.alfresco.rest.api.model.SiteTarget;
import org.alfresco.rest.api.model.Target;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
@@ -60,6 +59,7 @@ import org.alfresco.rest.framework.resource.parameters.where.QueryHelper.WalkerC
import org.alfresco.service.cmr.favourites.FavouritesService;
import org.alfresco.service.cmr.favourites.FavouritesService.Type;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.util.Pair;
@@ -126,7 +126,7 @@ public class FavouritesImpl implements Favourites
{
SiteInfo siteInfo = siteService.getSite(nodeRef);
String role = sites.getSiteRole(siteInfo.getShortName());
Site site = new SiteImpl(siteInfo, role);
Site site = new Site(siteInfo, role);
target = new SiteTarget(site);
}
else
@@ -189,8 +189,8 @@ public class FavouritesImpl implements Favourites
else if(target instanceof SiteTarget)
{
SiteTarget siteTarget = (SiteTarget)target;
NodeRef guid = siteTarget.getSite().getGuid();
SiteInfo siteInfo = sites.validateSite(guid);
String guid = siteTarget.getSite().getGuid();
SiteInfo siteInfo = sites.validateSite(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, guid));
NodeRef siteNodeRef = siteInfo.getNodeRef();
String siteId = siteInfo.getShortName();

203
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -1,4 +1,4 @@
/*
/*
* #%L
* Alfresco Remote API
* %%
@@ -9,20 +9,20 @@
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api.impl;
import java.io.Serializable;
@@ -57,7 +57,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.core.exceptions.ConstraintViolatedException;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
@@ -76,9 +75,18 @@ import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.preference.PreferenceService;
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.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.cmr.view.ImportPackageHandler;
import org.alfresco.service.cmr.view.ImporterBinding;
import org.alfresco.service.cmr.view.ImporterContentCache;
import org.alfresco.service.cmr.view.ImporterProgress;
import org.alfresco.service.cmr.view.ImporterService;
import org.alfresco.service.cmr.view.Location;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ISO9075;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -87,6 +95,7 @@ import org.apache.commons.logging.LogFactory;
* Centralises access to site services and maps between representations.
*
* @author steveglover
* @author janv
* @since publicapi1.0
*/
public class SitesImpl implements Sites
@@ -102,6 +111,8 @@ public class SitesImpl implements Sites
protected SiteService siteService;
protected FavouritesService favouritesService;
protected PreferenceService preferenceService;
protected ImporterService importerService;
protected SiteSurfConfig siteSurfConfig;
public void setPreferenceService(PreferenceService preferenceService)
{
@@ -138,6 +149,16 @@ public class SitesImpl implements Sites
this.siteService = siteService;
}
public void setImporterService(ImporterService importerService)
{
this.importerService = importerService;
}
public void setSiteSurfConfig(SiteSurfConfig siteSurfConfig)
{
this.siteSurfConfig = siteSurfConfig;
}
public SiteInfo validateSite(NodeRef guid)
{
SiteInfo siteInfo = null;
@@ -241,7 +262,7 @@ public class SitesImpl implements Sites
{
role = getSiteRole(siteId);
}
return new SiteImpl(siteInfo, role);
return new Site(siteInfo, role);
}
/**
@@ -268,7 +289,7 @@ public class SitesImpl implements Sites
String roleStr = siteService.getMembersRole(siteInfo.getShortName(), personId);
if(roleStr != null)
{
SiteImpl site = new SiteImpl(siteInfo, roleStr);
Site site = new Site(siteInfo, roleStr);
siteMember = new MemberOfSite(site.getId(), siteInfo.getNodeRef(), roleStr);
}
else
@@ -604,7 +625,7 @@ public class SitesImpl implements Sites
List<Site> page = new AbstractList<Site>()
{
@Override
public SiteImpl get(int index)
public Site get(int index)
{
SiteInfo siteInfo = sites.get(index);
@@ -613,7 +634,7 @@ public class SitesImpl implements Sites
{
role = siteService.getMembersRole(siteInfo.getShortName(), personId);
}
return new SiteImpl(siteInfo, role);
return new Site(siteInfo, role);
}
@Override
@@ -811,4 +832,146 @@ public class SitesImpl implements Sites
return CollectionWithPagingInfo.asPaged(paging, favourites, favouriteSites.hasMoreItems(), favouriteSites.getTotalResultCount().getFirst());
}
public void deleteSite(String siteId, Parameters parameters)
{
SiteInfo siteInfo = validateSite(siteId);
if(siteInfo == null)
{
// site does not exist
throw new EntityNotFoundException(siteId);
}
siteId = siteInfo.getShortName();
// default false (if not provided)
boolean permanentDelete = Boolean.valueOf(parameters.getParameter(PARAM_PERMANENT));
if (permanentDelete == true)
{
// Set as temporary to delete node instead of archiving.
nodeService.addAspect(siteInfo.getNodeRef(), ContentModel.ASPECT_TEMPORARY, null);
}
siteService.deleteSite(siteId);
}
// based on Share create site
private static final int SITE_MAXLEN_ID = 72;
private static final int SITE_MAXLEN_TITLE = 256;
private static final int SITE_MAXLEN_DESCRIPTION = 512;
/**
* Create default/preset (Share) site - with DocLib container/component
*
* @param site
* @return
*/
public Site createSite(Site site)
{
site = validateSite(site);
String siteId = site.getId();
siteService.createSite("sitePreset", siteId, site.getTitle(), site.getDescription(), site.getVisibility());
importSite(siteId);
// pre-create doclib
siteService.createContainer(siteId, SiteService.DOCUMENT_LIBRARY, ContentModel.TYPE_FOLDER, null);
return getSite(siteId);
}
private Site validateSite(Site site)
{
// site title - mandatory
String siteTitle = site.getTitle();
if ((siteTitle == null) || siteTitle.isEmpty())
{
throw new InvalidArgumentException("Site title is expected: "+siteTitle);
}
else if (siteTitle.length() > SITE_MAXLEN_TITLE)
{
throw new InvalidArgumentException("Site title exceeds max length of "+SITE_MAXLEN_TITLE+" characters");
}
SiteVisibility siteVisibility = site.getVisibility();
if (siteVisibility == null)
{
throw new InvalidArgumentException("Site visibility is expected: "+siteTitle+" (eg. PUBLIC, PRIVATE, MODERATED)");
}
String siteId = site.getId();
if (siteId == null)
{
siteId = siteTitle.trim();
siteId = siteId.replace(" ","-");
siteId = siteId.replaceAll("[^A-Za-z0-9\\-]","");
}
else
{
if (! siteId.matches("[^A-Za-z0-9\\-]"))
{
throw new InvalidArgumentException("Invalid site id - should consist of alphanumeric/dash characters");
}
}
if (siteId.length() > SITE_MAXLEN_ID)
{
throw new InvalidArgumentException("Site id exceeds max length of "+SITE_MAXLEN_ID+ "characters");
}
site.setId(siteId);
String siteDescription = site.getDescription();
if ((siteDescription != null) && (siteDescription.length() > SITE_MAXLEN_DESCRIPTION))
{
throw new InvalidArgumentException("Site description exceeds max length of "+SITE_MAXLEN_DESCRIPTION+" characters");
}
return site;
}
private void importSite(final String siteId)
{
ImportPackageHandler acpHandler = new SiteImportPackageHandler(siteSurfConfig, siteId);
Location location = new Location(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
location.setPath("/app:company_home/st:sites/cm:" + ISO9075.encode(siteId));
ImporterBinding binding = new ImporterBinding()
{
@Override
public String getValue(String key)
{
if (key.equals("siteId"))
{
return siteId;
}
return null;
}
@Override
public UUID_BINDING getUUIDBinding()
{
return UUID_BINDING.CREATE_NEW;
}
@Override
public QName[] getExcludedClasses()
{
return null;
}
@Override
public boolean allowReferenceWithinTransaction()
{
return false;
}
@Override
public ImporterContentCache getImportConentCache()
{
return null;
}
};
importerService.importView(acpHandler, location, binding, (ImporterProgress)null);
}
}