[midPoint-git] midPoint branch master updated. v2.3devel-490-g401fd12

[Pavol Mederly]

Project "midPoint" branch master has been updated
       via  401fd124614e02088798ddece4d413f504d52cd4 (commit) v2.3devel-490-g401fd12
       via  6b0f602b67d148995b7207ddac4cc6dcf13e492a (commit) v2.3devel-489-g6b0f602
       via  cd60392bebcf52754c92434b9d17dfc52a655580 (commit) v2.3devel-486-gcd60392
       via  c5b8125e8669422d8f76255d2d1531953789912d (commit) v2.3devel-485-gc5b8125
       via  6379cb03eba67bdb46c0a4a7ee70ddd13ca86970 (commit) v2.3devel-384-g6379cb0
      from  0a27c9cc9e16b92cb28659eb63d194ad4ae66f82 (commit) v2.3devel-485-g0a27c9c

- Log -----------------------------------------------------------------
commit 401fd124614e02088798ddece4d413f504d52cd4
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Tue Jan 7 15:37:01 2014 +0100

    Fixing workflow-impl pom.xml/spring ctx w.r.t. reports.

commit 6b0f602b67d148995b7207ddac4cc6dcf13e492a
Merge: cd60392 0a27c9c
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Tue Jan 7 15:31:55 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

commit cd60392bebcf52754c92434b9d17dfc52a655580
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Tue Jan 7 12:20:04 2014 +0100

    Reenabling aspects.

commit c5b8125e8669422d8f76255d2d1531953789912d
Merge: 6379cb0 6f4b69f
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Tue Jan 7 12:14:08 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
    
    Conflicts:
    	model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/TestGeneralChangeProcessor.java

commit 6379cb03eba67bdb46c0a4a7ee70ddd13ca86970
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Tue Jan 7 12:07:51 2014 +0100

    Enhancing workflows - interim commit.

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../page/admin/workflow/PageProcessInstance.java   |    1 +
 .../admin/workflow/dto/ProcessInstanceDto.java     |   37 +---
 .../configuration/api/MidpointConfiguration.java   |    8 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |   32 +++-
 .../midpoint/model/api/expr/MidpointFunctions.java |    9 +
 .../midpoint/model/expr/MidpointFunctionsImpl.java |    6 +
 model/report-impl/pom.xml                          |    6 -
 .../src/test/resources/ctx-report-test-main.xml    |    1 -
 .../wf/processes/CommonProcessVariableNames.java   |    5 +
 .../midpoint/wf/processes/StringHolder.java        |    4 +
 .../midpoint/wf/processes/WorkflowResult.java      |    2 -
 .../itemApproval/ProcessVariableNames.java         |    2 +-
 .../evolveum/midpoint/wf/util/WfVariablesUtil.java |   89 +++++++++
 model/workflow-impl/pom.xml                        |   12 ++
 .../evolveum/midpoint/wf/WorkflowManagerImpl.java  |    2 +-
 .../midpoint/wf/activiti/ActivitiUtil.java         |    5 +
 .../midpoint/wf/dao/ProcessInstanceManager.java    |    3 +-
 .../midpoint/wf/dao/ProcessInstanceProvider.java   |    2 +-
 .../midpoint/wf/jobs/JobCreationInstruction.java   |    8 +
 .../processes/common/MidPointProcessListener.java  |   21 ++-
 .../wf/processors/BaseChangeProcessor.java         |    4 +
 .../processors/general/GeneralChangeProcessor.java |   34 +++-
 .../primary/PrimaryApprovalProcessWrapper.java     |   73 ++++++--
 .../processors/primary/PrimaryChangeProcessor.java |    6 +-
 .../primary/user/AddRoleAssignmentWrapper.java     |    4 +-
 .../wf/processors/primary/user/BaseWrapper.java    |   15 +-
 .../midpoint/wf/util/JaxbValueContainer.java       |   20 ++
 .../evolveum/midpoint/wf/util/MiscDataUtil.java    |    7 +-
 .../resources/processes/ItemApproval.bpmn20.xml    |    2 +-
 .../midpoint/wf/TestGeneralChangeProcessor.java    |  196 ++++++++++++++++----
 .../src/test/resources/ctx-workflow-test-main.xml  |    1 +
 .../src/test/resources/logback-test.xml            |    2 +-
 ...ingDummyGreenResourceChangesProcess.bpmn20.xml} |   41 ++--
 .../processes/MyGreatPrimaryProcess.bpmn20.xml     |   18 +-
 .../src/test/resources/test-config.xml             |   13 +-
 .../midpoint/init/StartupConfiguration.java        |   17 +-
 36 files changed, 542 insertions(+), 166 deletions(-)
 create mode 100644 model/workflow-api/src/main/java/com/evolveum/midpoint/wf/util/WfVariablesUtil.java
 copy model/workflow-impl/src/test/resources/processes/{MyGreatPrimaryProcess.bpmn20.xml => ApprovingDummyGreenResourceChangesProcess.bpmn20.xml} (62%)


hooks/post-receive
-- 
midPoint