[midPoint-git] midPoint branch gensync updated. v2.3devel-404-g4db5fa2

[Radovan Semancik]

Project "midPoint" branch gensync has been updated
       via  4db5fa2e482184ce1f969bc6828432f3eaf3a83c (commit) v2.3devel-404-g4db5fa2
       via  6ef8f727fb02ff38d6e74ccc9af481b5442c0eb8 (commit) v2.3devel-383-g6ef8f72
       via  041bdc55680bfa59591319c10cf04a8dd3a94182 (commit) v2.3devel-382-g041bdc5
       via  ab34966f76b6f422b374fc132efef7184b3b0dea (commit) v2.3devel-380-gab34966
       via  2958fe73498a7db3880fbb8d21cb84201f336204 (commit) v2.3devel-368-g2958fe7
      from  f45ab2cfd2b3502bfbc00e0b895718234ee207a1 (commit) v2.3devel-399-gf45ab2c

- Log -----------------------------------------------------------------
commit 4db5fa2e482184ce1f969bc6828432f3eaf3a83c
Merge: f45ab2c 6ef8f72
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Mon Dec 16 15:46:01 2013 +0100

    Merge branch 'master' into gensync

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

(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/component/model/delta/DeltaDto.java        |    2 +
 .../web/component/wf/workItems/WorkItemsPanel.java |    2 +-
 .../web/page/admin/home/PageDashboard.java         |    7 +-
 .../web/page/admin/home/dto/AdminHomeDto.java      |    1 -
 .../web/page/admin/home/dto/MyWorkItemDto.java     |   10 +-
 .../admin/server/dto/TaskDtoExecutionStatus.java   |   16 +-
 .../page/admin/workflow/PageProcessInstance.java   |    8 +-
 .../page/admin/workflow/PageProcessInstances.java  |   11 +-
 .../web/page/admin/workflow/PageWorkItem.java      |   59 +++++---
 .../web/page/admin/workflow/PageWorkItems.java     |    9 +-
 .../admin/workflow/dto/ProcessInstanceDto.java     |   81 +++++-----
 .../workflow/dto/ProcessInstanceDtoProvider.java   |    6 +-
 .../admin/workflow/dto/WorkItemDetailedDto.java    |   54 ++++---
 .../web/page/admin/workflow/dto/WorkItemDto.java   |   34 ++---
 .../admin/workflow/dto/WorkItemDtoProvider.java    |   14 +-
 .../midpoint/prism/xml/XmlTypeConverter.java       |    5 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |    7 +
 .../midpoint/model/controller/ModelController.java |   28 ++--
 .../evolveum/midpoint/wf/api/ProcessInstance.java  |  108 --------------
 .../com/evolveum/midpoint/wf/api/WorkItem.java     |  111 --------------
 .../evolveum/midpoint/wf/api/WorkItemDetailed.java |  101 -------------
 .../evolveum/midpoint/wf/api/WorkflowManager.java  |   20 +--
 .../evolveum/midpoint/wf/WorkflowManagerImpl.java  |   32 ++--
 .../midpoint/wf/dao/ProcessInstanceProvider.java   |  105 ++++++++-----
 .../evolveum/midpoint/wf/dao/WorkItemProvider.java |  155 +++++++++++++-------
 .../midpoint/wf/processors/ChangeProcessor.java    |    6 +-
 .../processors/general/GeneralChangeProcessor.java |    6 +-
 .../primary/PrimaryApprovalProcessWrapper.java     |    6 +-
 .../processors/primary/PrimaryChangeProcessor.java |   17 ++-
 .../primary/user/AddRoleAssignmentWrapper.java     |    2 +-
 .../wf/processors/primary/user/BaseWrapper.java    |    4 +-
 .../primary/user/ChangePasswordWrapper.java        |    2 +-
 .../evolveum/midpoint/wf/util/MiscDataUtil.java    |   40 ++++-
 .../midpoint/wf/TestGeneralChangeProcessor.java    |   12 +-
 .../midpoint/wf/TestUserChangeApproval.java        |    7 +-
 .../task/quartzimpl/TaskManagerQuartzImpl.java     |   29 +++-
 36 files changed, 497 insertions(+), 620 deletions(-)
 delete mode 100644 model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/ProcessInstance.java
 delete mode 100644 model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItem.java
 delete mode 100644 model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemDetailed.java


hooks/post-receive
-- 
midPoint