Merged HEAD (5.2) to 5.2.N (5.2.1)

127531 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125513 jvonka: RA-779 / RA-780: Sites API - create site & delete site
      - follow-on improvemnts (generating site id, adding favorite with option to sip)
      - more tests (+ve & -ve)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:00:09 +00:00
parent 96a9c61e8b
commit 5e3eff4113
6 changed files with 203 additions and 136 deletions

View File

@@ -44,6 +44,7 @@ import java.util.List;
*
* @author Gethin James
* @author steveglover
* @author janv
*/
@EntityResource(name="sites", title = "Sites")
public class SiteEntityResource implements EntityResourceAction.Read<Site>,
@@ -98,6 +99,7 @@ public class SiteEntityResource implements EntityResourceAction.Read<Site>,
}
/**
* Create the given site.
*
* @param entity
* @param parameters
@@ -113,7 +115,7 @@ public class SiteEntityResource implements EntityResourceAction.Read<Site>,
}
List<Site> result = new ArrayList<>(1);
result.add(sites.createSite(entity.get(0)));
result.add(sites.createSite(entity.get(0), parameters));
return result;
}
}