[midPoint-git] midPoint branch bootstrap updated. v2.3devel-637-g44e0272

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  44e0272a8b11af27931d409cf0a0e9771bf11485 (commit) v2.3devel-637-g44e0272
       via  a32b6b95029c70977baff8971e2a820f11891d2e (commit) v2.3devel-633-ga32b6b9
       via  d0e30bb3c4659d9fea5968dba17a18977e329ccf (commit) v2.3devel-369-gd0e30bb
       via  8653270d43407e8eeeb02402e3f44e654a3bc622 (commit) v2.3devel-366-g8653270
       via  bee007e2f1eaac6512ba472f9fab56decb7ab47a (commit) v2.3devel-367-gbee007e
       via  aba6ad63093d6ac6f45a7fd5f8e6d7a511b727ad (commit) v2.3devel-366-gaba6ad6
      from  27df6bf93c50e9e0f31cde3308177374991889b5 (commit) v2.3devel-631-g27df6bf

- Log -----------------------------------------------------------------
commit 44e0272a8b11af27931d409cf0a0e9771bf11485
Merge: a32b6b9 d0e30bb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 12:07:16 2013 +0100

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

commit a32b6b95029c70977baff8971e2a820f11891d2e
Merge: 27df6bf aba6ad6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Thu Dec 12 12:06:42 2013 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
    
    Conflicts:
    	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java

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

(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:
 .../component/data/BaseSortableDataProvider.java   |    6 +-
 .../web/component/model/delta/DeltaPanel.java      |   17 -
 .../com/evolveum/midpoint/web/page/PageBase.java   |   12 +-
 .../midpoint/web/page/admin/PageAdmin.java         |    4 +-
 .../web/page/admin/home/PageDashboard.java         |   11 +-
 .../web/page/admin/server/PageTaskEdit.java        |    5 +-
 .../page/admin/workflow/PageProcessInstance.java   |    6 +-
 .../page/admin/workflow/PageProcessInstances.java  |    8 +-
 .../web/page/admin/workflow/PageWorkItem.java      |   14 +-
 .../web/page/admin/workflow/PageWorkItems.java     |   10 +-
 .../workflow/dto/ProcessInstanceDtoProvider.java   |    8 +-
 .../admin/workflow/dto/WorkItemDtoProvider.java    |    8 +-
 .../midpoint/web/security/MidPointApplication.java |    8 +-
 .../com/evolveum/midpoint/prism/Definition.java    |   12 +-
 .../prism/schema/DomToSchemaProcessor.java         |    3 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |  543 ++++++++++++++++++--
 .../ns/public/model/workflow/common-forms-2.xsd    |   94 ----
 .../java/com/evolveum/midpoint/util/DOMUtil.java   |    9 +
 .../java/com/evolveum/midpoint/util/MiscUtil.java  |    6 +
 .../evolveum/midpoint/model/api/TaskService.java   |    2 +-
 .../midpoint/model/api/WorkflowService.java        |   97 ++++
 .../midpoint/model/controller/ModelController.java |   66 ++-
 .../midpoint/model/lens/ChangeExecutor.java        |   22 +-
 .../midpoint/notifications/WorkflowListener.java   |   14 +-
 .../{WorkflowService.java => WorkflowManager.java} |  288 +++++------
 ...owServiceImpl.java => WorkflowManagerImpl.java} |  394 +++++++-------
 .../midpoint/wf/activiti/ActivitiEngine.java       |    9 -
 .../wf/activiti/ActivitiEngineDataHelper.java      |    1 -
 .../midpoint/wf/dao/ProcessInstanceManager.java    |   20 +-
 .../midpoint/wf/dao/ProcessInstanceProvider.java   |   10 +-
 .../evolveum/midpoint/wf/dao/WorkItemManager.java  |    8 +-
 .../evolveum/midpoint/wf/dao/WorkItemProvider.java |   16 +-
 .../midpoint/wf/TestGeneralChangeProcessor.java    |    2 +-
 .../midpoint/wf/TestUserChangeApproval.java        |    2 +-
 34 files changed, 1109 insertions(+), 626 deletions(-)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/{WorkflowService.java => WorkflowManager.java} (96%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{WorkflowServiceImpl.java => WorkflowManagerImpl.java} (95%)


hooks/post-receive
-- 
midPoint