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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml
View File

@@ -2,7 +2,7 @@
<shortname>IMAP Workflow Handler</shortname> <shortname>IMAP Workflow Handler</shortname>
<description> <description>
This webscript starts a different workflow. It is used in the IMAP email body links. The workflowType should be a fully-qualified worklfow-definition name, with This webscript starts a different workflow. It is used in the IMAP email body links. The workflowType should be a fully-qualified worklfow-definition name, with
engine-name included. eg: activiti$activitiAdhoc. If engine-name is left out, JBPM is used as engine-name for the process. engine-name included. eg: activiti$activitiAdhoc. If engine-name is left out, Activiti is used as engine-name for the process.
(The optional feature is the reply email with a report.) (The optional feature is the reply email with a report.)
</description> </description>
<url>/imap/start-workflow?alfTicket={ticket}&amp;nodeRefId={id}&amp;workflowType={wt}&amp;assignTo={at}&amp;workflowDueDateDay={ddd}&amp;workflowDueDateMonth={ddm}&amp;workflowDueDateYear={ddy}&amp;description={desc}&amp;workflowPriority={wp?}</url> <url>/imap/start-workflow?alfTicket={ticket}&amp;nodeRefId={id}&amp;workflowType={wt}&amp;assignTo={at}&amp;workflowDueDateDay={ddd}&amp;workflowDueDateMonth={ddm}&amp;workflowDueDateYear={ddy}&amp;description={desc}&amp;workflowPriority={wp?}</url>

2
config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js
View File

@@ -13,7 +13,7 @@ function main()
// ALF-13898: accept FULL workflow-definition name if provided, otherwise revert to prefixing behavior // ALF-13898: accept FULL workflow-definition name if provided, otherwise revert to prefixing behavior
var workflowType = args.workflowType; var workflowType = args.workflowType;
if(workflowType.indexOf('$') < 0) { if(workflowType.indexOf('$') < 0) {
workflowType = "jbpm$wf:" + workflowType; workflowType = "activiti$" + workflowType;
} }
var assignTo = people.getPerson(args.assignTo); var assignTo = people.getPerson(args.assignTo);

13
config/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js
View File

@@ -8,20 +8,11 @@ function main()
return; return;
} }
// TODO Quick-fix, workaround to handle $ being removed from taskId.
// C;heck taskId contains $ and add if not.
var separatorIndex = taskId.indexOf('$'); var separatorIndex = taskId.indexOf('$');
if(separatorIndex == -1) if(separatorIndex == -1)
{ {
if(taskId.indexOf('jbpm') == 0) status.setCode(status.STATUS_BAD_REQUEST, "TaskID missing when ending task.");
{ return;
taskId = 'jbpm$' + taskId.substring(4);
}
else
{
status.setCode(status.STATUS_BAD_REQUEST, "TaskID missing when ending task.");
return;
}
} }
// Check TaskId is valid // Check TaskId is valid

9
source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
View File

@@ -178,15 +178,6 @@ public class InviteServiceTest extends BaseWebScriptTest
{ {
public Object doWork() throws Exception 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 // Create new invitee email address list
inviteeEmailAddrs = new ArrayList<String>(); inviteeEmailAddrs = new ArrayList<String>();

2
source/test-java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
View File

@@ -857,7 +857,7 @@ public class SiteServiceTest extends AbstractSiteServiceTest
/* /*
* Negative test - site does exist but invitation doesn't * 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 * Negative test - site does exist but invitation engine is wrong