Commit Graph

336 Commits

Author SHA1 Message Date
Alan Davis
34940ab70a MNT-17601 "My completed tasks" error with embedded sub process
- The reason that no tasks were found was that the ActivitiTypeConverter.findUserTasks(...)
     method simply did not take sup processes into account. Transitions in a sub process were
     not being walked, so no user tasks inside the sub process were found. A test was added that
     ensures that the task inside the sub process of the sample workflow is now found. 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-05-18 14:35:03 +00:00
Jamal Kaabi-Mofrad
b96832b0fd Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
135590 jkaabimofrad: APPSREPO-35: Added password reset V1 API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-16 19:39:24 +00:00
Alan Davis
b4b391199d MNT-17022 Errors in 5.1.1 when displaying any document linked to jBPM workflow
The getWorkflowsForContent method has been modified to catch the exception and return
one less item in the list of workflows to be processed when the workflow is jBPM (or
any other unregistered workflow - including future ones). It also logs a debug.
For example:

Workflow Component for engine id 'jbpm' is not registered. Ignored workflow on
workspace://SpacesStore/a0afc2d8-01e4-4fa5-a3b0-08d91d1fda03

Having examined the the rest of WorkflowServiceImpl (and spoken to the original
author), I don't believe there are other points in the code that we need worry about
for the UI perspective, even though there are 22 other methods directly calling the
method that throws the exception.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-10 16:16:14 +00:00
Ancuta Morarasu
a75200b776 REPO-2043 / MNT-16053: Extending cm:person causes activiti to fail
- Ensure the 'scope' is set when converting properties with multiple=true, on ActivitiScriptNode nodes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-06 16:41:28 +00:00
Steven Glover
761b6c2b21 Merged from DEV/SG/REPO1259 to 5.2.N
MNT-16541 "Cache update for custom workflow model fails" update to use released alfresco-core and alfresco-data-model

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 17:04:49 +00:00
Andrei Rebegea
1e97c7c275 ALF-18332 : WorkflowObjectFactory.createTransition doesn't use the description property
- Fixed default description key for transition + added testcase
   - merged from DEV/HEAD_WROKFLOW to 5.2.N

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131924 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-01 09:07:52 +00:00
Martin Muller
9c906b9857 Reverting 131547
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 15:05:06 +00:00
Martin Muller
7fc64be964 REPO_1259, MNT-16541. Using init instead of destroy for workflow listener. Otherwise it could lead to a deadlock since 5.0.3
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-10-19 12:56:30 +00:00
Alex Mukha
33ee24817c 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
2016-10-10 17:34:57 +00:00
Martin Muller
88818dca9a Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Cristian Turlica
7992f174cf Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
127262 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      127234 cpopa: MNT-16063 : Activiti workflows without userTask does not work
         - Prevent tasks retrieval from finished executions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-20 13:17:01 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
741769a993 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124236 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE)
      124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites
            - added a new method to InvitationService to make use of the limit in the searchInvitation
            - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter
            - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter
            - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement
            - added junit tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-21 11:05:59 +00:00
Alan Davis
2906638865 Merged 5.1.N (5.1.1) to HEAD (5.1)
120715 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120675 dungureanu: Merged DEV to 5.0.N (5.0.4)
         120674 dungureanu: MNT-14922: Workflow console's user command is case sensitive
            - Look up the correct user, throw error if not found. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:39:41 +00:00
Bogdan Horje
005c9543f5 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:32:24 +00:00
Alan Davis
4135061942 Merged 5.0.N (5.0.3) to HEAD (5.1)
111249: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      111099: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110999: Merged DEV to V4.2.5 (4.2.5)
            MNT-10537 : BPM Models are filtered for CMIS getTypeDefinition
               - As for DictionaryModelType we should destroy dictionary when new model is deployed from classpath.
               - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 17:53:53 +00:00
Tatyana Valkevych
10e4c81087 Merged 5.0.N (5.0.3) to HEAD (5.1)
110341: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110159: MNT-14392 - Adding debug log to ActivitiWorkflowEngine,
      110160: MNT-14392 more debug logging.,
      110199: MNT-14392 - Missed check in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-08-21 17:07:44 +00:00
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Tatyana Valkevych
761a92b2cc Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
102053: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101917: Merged DEV to 5.0.N (5.0.2)
         101898 : MNT-13826: Activiti engine throwing NPE when changing a long String (>4000 characters) to a normal String (<4000 characters))
            - Replaced deprecated methods


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-20 14:12:13 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
3b8bee75b0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
89755: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      89709: Merged DEV to V4.2-BUG-FIX
       88701 : MNT-11809 : Activiti losses data with large Aspect or Type property values
        Configured client-side validation, added server-side validation via task and workflow filters. Added unit test.
       88897 : MNT-11809 : Activiti losses data with large Aspect or Type property values 
        Update some config and unit test. 
       89616 : MNT-11809 : Activiti losses data with large Aspect or Type property values 
        Added and updated some tests. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 10:42:34 +00:00
Matt Ward
3740ac93d1 ACE-3137: Workflow Admin Console: Not possibility to signal transition for activiti
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-23 12:09:58 +00:00
Ahmed Owian
f16b1ac567 ACE-3121: Workflow Admin Console: Cannot change priority for activiti
- Removed priority value validation.  Just checked the type.
   - TODO: Determine if DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-16 21:50:10 +00:00
Ahmed Owian
24560c0afd ACE-3121: Workflow Admin Console: Cannot change priority for activiti
- Handled priority property for Task
   - Determine if DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-16 21:34:08 +00:00
Ahmed Owian
eb0a69770d ACE-3121: Workflow Admin Console: Cannot change priority for activiti
- Handled priority property for Task
   - Determine if DelegateTask also needs similar handling

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-16 18:24:25 +00:00
Neil McErlean
b652eb89c5 Removing the possibility of a NPE in WorkflowService when run with trace logging. (Findbugs)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-14 13:34:44 +00:00
Stefan Kopf
a98be4b880 ACE-3095 - Patch patch.eol-wcmwf fails if wf engine is disabled.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-13 12:40:21 +00:00
Stefan Kopf
36c3cb3a04 ACE-2171 - EOL: WCM and related JBPM workflow definition removal
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-10 14:33:33 +00:00
Alan Davis
35496888c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
85449: trivial build difference,


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-22 15:59:38 +00:00
Mark Rogers
1481a5481e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84758: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80284: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-19 22:28:29 +00:00
Alan Davis
435aadfdff Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84221: Defensive code around missing namespace check for WorkflowQNameConverter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:31:28 +00:00
Alan Davis
9895e145f7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84017: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82509: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         82351: MNT-12272: Merged DEV to V4.1-BUG-FIX (4.1.10)
            82330: MNT-12272: Possible sql injection in /api/workflow-instances
               - Set exluded definitions for query using parameter binding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:20:08 +00:00
Alan Davis
1aa5f4a1fd Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83759: Merge WAT2 to HEADBUGFIX: r83494  When package items are added/removed it dispatches an Activiti VARIABLE_UPDATED event


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:54 +00:00
Erik Winlof
8aececc730 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
82400: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80250: ACE-2276	 - Update Activiti to 5.16.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83240 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 07:00:28 +00:00
Erik Winlof
b4ca4268d7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78747: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78624: Merged V4.2.1 (4.2.1.10) to V4.2-BUG-FIX (4.2.4)
         77969: MNT-11926: Unable to start a workflow from a taskListener
         When activity workflow is started suspend CommandContext propogation (if any exists) so that new ProcessInstance could be flushed and correctly converted to WorkflowPath. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:53:48 +00:00
Erik Winlof
0baa0f74f4 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 12:01:49 +00:00
Will Abson
b703c1de1f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71587: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70327: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70241: MNT-10122: Merged DEV to V4.1-BUG-FIX (4.1.9)
            63046: MNT-10122 Related to MNT-2234 - Incorrect workflow history when using jBPM
             - In JBPMEngine.getTaskProperties() was added ContentModel.PROP_CREATOR property. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:09:49 +00:00
Alan Davis
e19cce7317 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68533: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68310: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68265: MNT-11345: Merged V4.1.6 (4.1.6.15) to V4.1-BUG-FIX (4.1.9)
            65696: Merged DEV to V4.1.6 (4.1.6.15)
               65522: MNT-10931 : Unable to retrieve completed workflow's tasks using workflowService.queryTasks() with processProperties
               Added a check to NOT include start-task when the process for the given processId is already ended.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:32:45 +00:00
Mark Rogers
dbc38d4879 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68151: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67784: MNT-11086 : Reverse merged
         Merged DEV to V4.2-BUG-FIX (4.2.2) 
            61306: MNT-10537: BPM Models are filtered for CMIS getTypeDefinition
               Destroy the dictionary in WorkflowDeployer to clear dictionary registry caches.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68433 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:18:10 +00:00
Alan Davis
5a833ba4ac Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64782: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64028: Merged DEV to V4.2-BUG-FIX (4.2.2) 
         61306: MNT-10537: BPM Models are filtered for CMIS getTypeDefinition
            Destroy the dictionary in WorkflowDeployer to clear dictionary registry caches.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:51:16 +00:00
Alan Davis
9425a422f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63097: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63044: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         63001: Reverse merged
            << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-941/ >>
            62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
            In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:54:15 +00:00
Alan Davis
6fd14d0987 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63096: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63043: Revert the reverse to merge the reverse from V4.1-BF instead
         62900: Reverse merge from V4.2-BUG-FIX (4.2.2) to V4.1-BUG-FIX (4.1.8)
            62851: Reverse merged
               << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-194 >>
               62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
               In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:53:19 +00:00
Alan Davis
50b4c69df3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63079: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62900: Reverse merge from V4.2-BUG-FIX (4.2.2) to V4.1-BUG-FIX (4.1.8)
         62851: Reverse merged
            << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-194 >>
            62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
            In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:44:05 +00:00
Alan Davis
1dc8214cbd Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63078: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62851: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM.
         In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:43:08 +00:00
Alan Davis
bc8088a4f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60164: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60119: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60059: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60025 : MNT-10244 : JavaScript: workflow.createPackage() should return noderef
               - Create ScriptNode with script global scope


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 10:35:08 +00:00
Alan Davis
875b90ea55 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59554: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59450: MNT-9967: Using db-count for process/task entities for retreiving counts, instead of using actual list size (activiti)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 02:05:13 +00:00
Alan Davis
85ad67efdc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57142: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56925: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56865:  MNT-9713: Two tasks listed in the 'current tasks' list of the callActiviti workflow's details page not one
            - ProcessStartExecutionListener was updated. Now we set startTaskCompleted variable, when we will process start execution for sub instances.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:04:17 +00:00
Gavin Cornwell
200a140b33 CLOUD-2178: Incorrect defaults used when no message is supplied when starting a hybrid workflow
CLOUD-2167: Notification emails for assigned tasks are not populated correctly 

NOTE: If no message is supplied the task type is used as the description rather than empty string in the email notification. Also fixed the task type display for "simple cloud task", now shows "Task" and not "Review".

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@57957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-18 09:55:47 +00:00