[midPoint-git] midPoint branch bootstrap updated. v2.3devel-815-g288a2d5

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  288a2d5155edf111faa7c7cd9691703e12f698cd (commit) v2.3devel-815-g288a2d5
       via  356499040e5da7076fc009fad3ae2358e1ad609a (commit) v2.3devel-492-g3564990
       via  67678c1074eb9d6361cc1a7c9b8c4cafa38b732a (commit) v2.3devel-491-g67678c1
       via  401fd124614e02088798ddece4d413f504d52cd4 (commit) v2.3devel-490-g401fd12
       via  6b0f602b67d148995b7207ddac4cc6dcf13e492a (commit) v2.3devel-489-g6b0f602
       via  0a27c9cc9e16b92cb28659eb63d194ad4ae66f82 (commit) v2.3devel-485-g0a27c9c
       via  727b77d80a7df0e916787525f220c724c39fdbea (commit) v2.3devel-484-g727b77d
       via  cd60392bebcf52754c92434b9d17dfc52a655580 (commit) v2.3devel-486-gcd60392
       via  c5b8125e8669422d8f76255d2d1531953789912d (commit) v2.3devel-485-gc5b8125
       via  6379cb03eba67bdb46c0a4a7ee70ddd13ca86970 (commit) v2.3devel-384-g6379cb0
       via  a06d0a6d5f1230142c13a5d42929b986e7997f24 (commit) v2.3devel-805-ga06d0a6
       via  6f4b69fbd18e37c0ef65a9c951ce763a7977069b (commit) v2.3devel-483-g6f4b69f
      from  e4d936402d31fb9f9a090a83a6b1e00f8e3264d2 (commit) v2.3devel-803-ge4d9364

- Log -----------------------------------------------------------------
commit 288a2d5155edf111faa7c7cd9691703e12f698cd
Merge: a06d0a6 3564990
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Jan 7 17:52:43 2014 +0100

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

commit a06d0a6d5f1230142c13a5d42929b986e7997f24
Merge: e4d9364 6f4b69f
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Tue Jan 7 11:58:23 2014 +0100

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

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

(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:
 gui/admin-gui/pom.xml                              |    7 +-
 .../page/admin/workflow/PageProcessInstance.java   |    1 +
 .../admin/workflow/dto/ProcessInstanceDto.java     |   43 ++---
 gui/admin-gui/src/main/webapp/WEB-INF/web.xml      |    1 +
 .../configuration/api/MidpointConfiguration.java   |    8 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |   32 +++-
 .../midpoint/model/api/expr/MidpointFunctions.java |    9 +
 .../midpoint/model/cleanup/CleanUpTaskHandler.java |   21 ++-
 .../midpoint/model/expr/MidpointFunctionsImpl.java |    6 +
 model/report-api/pom.xml                           |    6 +
 {repo/repo-cache => model/report-api}/testng.xml   |    5 +-
 model/report-impl/pom.xml                          |    6 -
 .../midpoint/report/ReportCreateTaskHandler.java   |    1 +
 .../evolveum/midpoint/report/ReportManager.java    |   53 ------
 .../midpoint/report/ReportManagerImpl.java         |  182 ++++++++++++++----
 .../com/evolveum/midpoint/report/ReportUtils.java  |   19 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |    2 +-
 .../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 +-
 .../src/test/resources/repo/resource-opendj.xml    |    4 +-
 .../src/test/resources/repo/resource-opendj.xml    |   10 +-
 48 files changed, 759 insertions(+), 266 deletions(-)
 copy {repo/repo-cache => model/report-api}/testng.xml (87%)
 delete mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportManager.java
 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