[midPoint-git] midPoint branch bootstrap updated. v2.3devel-315-g60bf42f

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  60bf42fc0d61d780dac69b6336cffc73e1d3e43d (commit) v2.3devel-315-g60bf42f
       via  5769b9d72aeadb031878818c955a2ae80bb645e9 (commit) v2.3devel-311-g5769b9d
       via  9da2b3198862069acc987095cced8c1d2ecd8c11 (commit) v2.3devel-164-g9da2b31
       via  4b11c9d0e9be313cc1b7a7d1c3543fb2f81d1cf3 (commit) v2.3devel-163-g4b11c9d
       via  8c88dc73030742eb5171596f713e37f0b1882e69 (commit) v2.3devel-162-g8c88dc7
      from  3ac17f0d0baf439e2dce1414315a25ae360bf90c (commit) v2.3devel-310-g3ac17f0

- Log -----------------------------------------------------------------
commit 60bf42fc0d61d780dac69b6336cffc73e1d3e43d
Merge: 5769b9d 9da2b31
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sun Nov 10 12:59:54 2013 +0100

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

commit 5769b9d72aeadb031878818c955a2ae80bb645e9
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sun Nov 10 12:59:42 2013 +0100

    test page sample for biznet, will be disabled/removed before release

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

(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/assignment/ACAttributePanel.html |    2 +-
 .../com/evolveum/midpoint/web/page/PageBase.java   |    4 +
 .../midpoint/web/page/login/PageLogin.html         |   10 +-
 .../roles/PageRole.html => test/PageTest.html}     |   30 ++-
 .../evolveum/midpoint/web/page/test/PageTest.java  |  201 ++++++++++++++++++++
 .../midpoint/web/page/test/PageTest.properties}    |   11 +-
 .../midpoint/web/security/PageUrlMapping.java      |    3 +
 .../ApprovalLevel.java                             |    0
 .../ApprovalRequest.java                           |    0
 .../ApprovalSchema.java                            |    0
 .../{itemapproval => itemApproval}/Constants.java  |    0
 .../{itemapproval => itemApproval}/Decision.java   |    0
 .../LightweightObjectRef.java                      |    0
 .../ProcessVariableNames.java                      |    0
 .../ApprovalLevelImpl.java                         |    0
 .../ApprovalRequestImpl.java                       |    0
 .../ApprovalSchemaImpl.java                        |    0
 .../InitializeLoopThroughApproversInLevel.java     |    0
 .../InitializeLoopThroughLevels.java               |    0
 .../PrepareResult.java                             |    0
 .../RecordIndividualDecision.java                  |    0
 .../SummarizeDecisionsInLevel.java                 |    0
 .../task/quartzimpl/TaskManagerQuartzImpl.java     |   42 ++--
 .../quartzimpl/execution/ExecutionManager.java     |   10 +-
 24 files changed, 260 insertions(+), 53 deletions(-)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/{admin/roles/PageRole.html => test/PageTest.html} (55%)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.java
 copy gui/{admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/ExecuteChangeOptionsPanel_sk_SK.utf8.properties => admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.properties} (71%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalLevel.java (100%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalRequest.java (100%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalSchema.java (100%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/Constants.java (100%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/Decision.java (100%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/LightweightObjectRef.java (100%)
 rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ProcessVariableNames.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalLevelImpl.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalRequestImpl.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalSchemaImpl.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/InitializeLoopThroughApproversInLevel.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/InitializeLoopThroughLevels.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/PrepareResult.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/RecordIndividualDecision.java (100%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/SummarizeDecisionsInLevel.java (100%)


hooks/post-receive
-- 
midPoint