[midPoint-git] midPoint branch bootstrap updated. v2.3devel-669-g261480e
Vilo Repan
git at evolveum.com
Tue Dec 17 13:33:54 CET 2013
Project "midPoint" branch bootstrap has been updated
via 261480e0b9720014ed29e96682bd7a14af818954 (commit) v2.3devel-669-g261480e
via 0cd77de5f13c8839a670a3c9aaf595a2909c6c0b (commit) v2.3devel-668-g0cd77de
via ea0d13371e6942e7744c1dad376c4c7f59bc3e6c (commit) v2.3devel-667-gea0d133
via 45bcf5daef1b1adf8c57fe4b93e5e8a5ea02a10a (commit) v2.3devel-387-g45bcf5d
via bbd013c427657fb8fa4e89c8bc2c426b6b630a1d (commit) v2.3devel-386-gbbd013c
via c699bf9809ad9d2dd4f2b6a674bbaeffc814f061 (commit) v2.3devel-385-gc699bf9
via 31e530f932774538644b70e65a89e7691feafa6f (commit) v2.3devel-380-g31e530f
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 bce5fe6f78bbe009e40424cd141b74334d191771 (commit) v2.3devel-658-gbce5fe6
- Log -----------------------------------------------------------------
commit 261480e0b9720014ed29e96682bd7a14af818954
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 17 13:21:11 2013 +0100
fixing compilation errors
commit 0cd77de5f13c8839a670a3c9aaf595a2909c6c0b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 17 13:03:59 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/admin/workflow/PageProcessInstance.java
commit ea0d13371e6942e7744c1dad376c4c7f59bc3e6c
Merge: bce5fe6 45bcf5d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 17 13:03: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/admin/workflow/PageProcessInstance.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:
.../sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql | 24 +-
.../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql | 25 +
.../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql | 23 +
.../postgresql/postgresql-upgrade-2.2-to-2.3.sql | 24 +
.../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql | 23 +
config/sql/midpoint/2.3/h2/h2-2.3.sql | 1858 ++++++++---------
config/sql/midpoint/2.3/mysql/mysql-2.3.sql | 2134 ++++++++++----------
config/sql/midpoint/2.3/oracle/oracle-2.3.sql | 1857 ++++++++---------
.../sql/midpoint/2.3/postgresql/postgresql-2.3.sql | 1858 ++++++++---------
.../sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql | 1864 ++++++++---------
.../midpoint/web/component/form/DateFormGroup.java | 3 +-
.../midpoint/web/component/input/DatePanel.java | 3 +-
.../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 | 9 +-
.../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 | 88 +-
.../midpoint/model/controller/ModelController.java | 28 +-
.../midpoint/report/ReportCreateTaskHandler.java | 36 +-
.../midpoint/report/ReportManagerImpl.java | 58 +-
.../evolveum/midpoint/report/BasicReportTest.java | 351 +---
.../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 +-
repo/repo-sql-impl-test/sql-procedures/mysql.sql | 1 +
.../sql-procedures/postgresql.sql | 1 +
.../sql-procedures/sqlserver.sql | 1 +
.../src/test/resources/basic/objects.xml | 10 +-
.../midpoint/repo/sql/data/common/RReport.java | 26 +-
.../repo/sql/data/common/RReportOutput.java | 133 ++
.../task/quartzimpl/TaskManagerQuartzImpl.java | 29 +-
57 files changed, 5778 insertions(+), 5734 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
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list