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

104064: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103990: SHA-879: Overloaded "deployModel" method to make the created model active/inactive based on the passed in argument. Also, externalised the RepoAdminService error messages.,
      104009: SHA-879: An attempt to fix the test failure caused by r103990.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-13 16:26:10 +00:00
parent dd689fb8c4
commit 84ed670287
4 changed files with 112 additions and 36 deletions

View File

@@ -23,8 +23,8 @@ import java.util.List;
import org.alfresco.repo.admin.RepoModelDefinition;
import org.alfresco.service.Auditable;
import org.alfresco.service.PublicService;
import org.alfresco.service.cmr.admin.RepoUsage.UsageType;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
@@ -54,6 +54,18 @@ public interface RepoAdminService
@Auditable(parameters = {"modelStream", "modelFileName"}, recordable = {false, true})
public void deployModel(InputStream modelStream, String modelFileName);
/**
* Deploy custom model (to the 'Models' space). Allows creation of new
* models and incremental update of existing models.
*
* @param modelStream the model input stream
* @param modelFileName modelFileName the model file name
* @param activate whether the model should be activated or not
* @return the nodeRef of the created model
*/
@Auditable(parameters = { "modelStream", "modelFileName", "activate" }, recordable = { false, true, false })
public NodeRef deployModel(InputStream modelStream, String modelFileName, boolean activate);
/**
* Undeploy custom model (from the 'Models' space).
* Allows delete of existing models, if not used.