[midPoint-git] midPoint branch master updated. v2.3devel-871-gb3692cb

[Pavol Mederly]

Project "midPoint" branch master has been updated
       via  b3692cbfffd41753ae76370c0d78543d81378be4 (commit) v2.3devel-871-gb3692cb
       via  40fae1b523654605ec2b9d3d300e7a05ecdc9d9d (commit) v2.3devel-869-g40fae1b
       via  178fd7279318d2062ec6f0363094bd722568132a (commit) v2.3devel-868-g178fd72
       via  37587ca7ac3b1bed06e134d3db9f33083022f08c (commit) v2.3devel-860-g37587ca
       via  580558f08d89d8961b8548a5ec76d62ad4ad1fa7 (commit) v2.3devel-859-g580558f
       via  3851507aa69ebd080a74fdf1edd61c41320d6b7b (commit) v2.3devel-858-g3851507
      from  1ce891d3864f34c7e379af376d4afc4691d5f143 (commit) v2.3devel-865-g1ce891d

- Log -----------------------------------------------------------------
commit b3692cbfffd41753ae76370c0d78543d81378be4
Merge: 40fae1b 1ce891d
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Jan 13 10:29:25 2014 +0100

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

commit 40fae1b523654605ec2b9d3d300e7a05ecdc9d9d
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Jan 13 10:23:35 2014 +0100

    Fixing compilation errors from last merge.

commit 178fd7279318d2062ec6f0363094bd722568132a
Merge: 37587ca 6a8eba4
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Jan 13 10:16:26 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
    
    Conflicts:
    	model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GeneralChangeProcessor.java

commit 37587ca7ac3b1bed06e134d3db9f33083022f08c
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Mon Jan 13 10:10:10 2014 +0100

    Preparing externalization of process instance state. (In progress.)

commit 580558f08d89d8961b8548a5ec76d62ad4ad1fa7
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Fri Jan 10 17:40:12 2014 +0100

    Continuing with cleaning-up wf code. Making tests pass.

commit 3851507aa69ebd080a74fdf1edd61c41320d6b7b
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Fri Jan 10 10:59:59 2014 +0100

    Cleaning structure of wf-impl module, simplifying inheritance tree. Work in progress.

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

(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:
 .../web/page/admin/server/dto/TaskDto.java         |   14 +-
 .../schema/MidPointPrismContextFactory.java        |    3 +
 .../midpoint/schema/constants/SchemaConstants.java |    1 +
 .../schema/src/main/resources/META-INF/catalog.xml |    2 +
 .../main/resources/xml/ns/private/fake/fake-1.wsdl |    4 +
 .../xml/ns/public/communication/workflow-1.xsd     |  212 --------------
 .../public/model/workflow/process-variables-2.xsd  |  106 +++++++
 .../midpoint/model/api/expr/MidpointFunctions.java |    2 +-
 .../model-client/src/compile/resources/catalog.xml |    2 +
 .../src/main/resources/META-INF/catalog.xml        |    2 +
 .../expression/ExpressionEvaluationContext.java    |    2 +-
 .../midpoint/model/expr/MidpointFunctionsImpl.java |   15 +-
 .../midpoint/notifications/WorkflowListener.java   |    7 +-
 .../com/evolveum/midpoint/wf/api/Constants.java    |   42 ---
 .../evolveum/midpoint/wf/api/ProcessListener.java  |   21 +-
 .../midpoint/wf/api/WfTaskExtensionItemsNames.java |   75 +++++
 .../evolveum/midpoint/wf/api/WorkItemListener.java |   21 ++
 .../java/com/evolveum/midpoint/wf/jobs/Job.java    |    7 +
 .../evolveum/midpoint/wf/jobs/JobController.java   |  127 +++-----
 .../midpoint/wf/jobs/JobCreationInstruction.java   |   82 +++---
 .../com/evolveum/midpoint/wf/jobs/WfTaskUtil.java  |  308 ++++++++------------
 .../wf/processors/BaseChangeProcessor.java         |  227 ++-------------
 .../wf/processors/BaseConfigurationHelper.java     |   92 ++++++
 .../BaseModelInvocationProcessingHelper.java       |  180 ++++++++++++
 .../midpoint/wf/processors/ChangeProcessor.java    |    2 +
 .../wf/processors/general/GcpExpressionHelper.java |   96 ++++++
 .../processors/general/GeneralChangeProcessor.java |  228 ++++-----------
 ...essor.java => GeneralChangeProcessor.java.orig} |  162 +++++-----
 .../GeneralChangeProcessorConfigurationHelper.java |  111 +++++++
 .../primary/PcpChildJobCreationInstruction.java    |   70 +++++
 .../midpoint/wf/processors/primary/PcpJob.java     |   54 ++++
 .../processors/primary/PrimaryChangeProcessor.java |  128 ++++----
 .../PrimaryChangeProcessorConfigurationHelper.java |   77 +++++
 .../primary/PrimaryChangeProcessorJob.java         |  104 -------
 .../primary/user/AddRoleAssignmentWrapper.java     |   31 +-
 .../processors/primary/user/BaseUserWrapper.java   |   58 ----
 .../primary/user/ChangePasswordWrapper.java        |   23 +-
 .../wf/processors/primary/wrapper/BaseWrapper.java |   77 +++++
 .../PrimaryApprovalProcessWrapper.java             |  271 ++++++++---------
 .../WrapperHelper.java}                            |  196 +++++++------
 .../evolveum/midpoint/wf/util/MiscDataUtil.java    |    5 +-
 .../midpoint/wf/TestGeneralChangeProcessor.java    |   83 +++++-
 .../midpoint/wf/TestUserChangeApproval.java        |   16 +-
 .../model-contexts/context-dummy-resource.xml      |    2 +
 ...pprovingDummyResourceChangesProcess.bpmn20.xml} |   18 +-
 .../src/test/resources/test-config.xml             |    5 +-
 .../evolveum/midpoint/schema/xjc/PrefixMapper.java |    2 +-
 47 files changed, 1801 insertions(+), 1572 deletions(-)
 delete mode 100644 infra/schema/src/main/resources/xml/ns/public/communication/workflow-1.xsd
 create mode 100644 infra/schema/src/main/resources/xml/ns/public/model/workflow/process-variables-2.xsd
 delete mode 100644 model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/Constants.java
 create mode 100644 model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WfTaskExtensionItemsNames.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseConfigurationHelper.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseModelInvocationProcessingHelper.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpExpressionHelper.java
 copy model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/{GeneralChangeProcessor.java => GeneralChangeProcessor.java.orig} (74%)
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GeneralChangeProcessorConfigurationHelper.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpChildJobCreationInstruction.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpJob.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PrimaryChangeProcessorConfigurationHelper.java
 delete mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PrimaryChangeProcessorJob.java
 delete mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/BaseUserWrapper.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/BaseWrapper.java
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/{ => wrapper}/PrimaryApprovalProcessWrapper.java (93%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/{user/BaseWrapper.java => wrapper/WrapperHelper.java} (74%)
 copy infra/schema/src/test/resources/common/model-context-1.xml => model/workflow-impl/src/test/resources/model-contexts/context-dummy-resource.xml (99%)
 rename model/workflow-impl/src/test/resources/processes/{ApprovingDummyGreenResourceChangesProcess.bpmn20.xml => ApprovingDummyResourceChangesProcess.bpmn20.xml} (78%)


hooks/post-receive
-- 
midPoint