Merged DEV to 5.2.N (5.2.1)

131050 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
   131057 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate / fix test CMISTest.testModelAvailability
   131064 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - added patch to remove JBPM database tables
   131169 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - replaced generic DB script with database specific scripts
   131171 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix DB2 patch
   131213 skopf: REPO-483 - The repository does not contain any code or data related to JBPM / ACE-1659 - Remove JBPM and Hibernate
      - Fix JBPM table removal patch

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alex Mukha
2016-10-10 17:34:57 +00:00
parent eba3054605
commit c20cc9f602
5 changed files with 5 additions and 23 deletions

View File

@@ -178,15 +178,6 @@ public class InviteServiceTest extends BaseWebScriptTest
{
public Object doWork() throws Exception
{
// // redeploy invite process definition in case it has been modified
// WorkflowDefinition inviteWfDefinition = workflowService.getDefinitionByName(
// "jbpm$" + WorkflowModelNominatedInvitation.WF_PROCESS_INVITE.toPrefixString(namespaceService));
// workflowService.undeployDefinition(inviteWfDefinition.id);
// ClassPathResource inviteWfResource = new ClassPathResource(
// "alfresco/workflow/invitation-nominated_processdefinition.xml");
// workflowService.deployDefinition(
// JBPMEngine.ENGINE_ID, inviteWfResource.getInputStream(), MimetypeMap.MIMETYPE_XML);
// Create new invitee email address list
inviteeEmailAddrs = new ArrayList<String>();

View File

@@ -857,7 +857,7 @@ public class SiteServiceTest extends AbstractSiteServiceTest
/*
* Negative test - site does exist but invitation doesn't
*/
sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/jbpm$8787487"), 404);
sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/activiti$8787487"), 404);
/*
* Negative test - site does exist but invitation engine is wrong