[midPoint-git] midPoint branch master updated. v2.3devel-1224-gfaca322
Pavol Mederly
git at evolveum.com
Mon Mar 10 23:32:53 CET 2014
Project "midPoint" branch master has been updated
via faca322177af94091fefea8ceec14ff9ba472834 (commit) v2.3devel-1224-gfaca322
via f647d70c01ba1277380521658ef1f3ac14679eaf (commit) v2.3devel-1222-gf647d70
from 80d70535b8877c5be85037a7dfbd530662e71eee (commit) v2.3devel-1222-g80d7053
- Log -----------------------------------------------------------------
commit faca322177af94091fefea8ceec14ff9ba472834
Merge: f647d70 80d7053
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Mar 10 23:32:21 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
commit f647d70c01ba1277380521658ef1f3ac14679eaf
Author: Pavol Mederly <mederly at evolveum.com>
Date: Mon Mar 10 23:32:07 2014 +0100
Refactoring and documenting workflows.
-----------------------------------------------------------------------
(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:
.../processes/itemApproval/ItemApprovalPanel.java | 13 +-
.../page/admin/workflow/PageProcessInstance.java | 9 +-
.../web/page/admin/workflow/PageWorkItem.java | 4 +-
.../page/admin/workflow/ProcessInstancePanel.java | 64 +-
.../admin/workflow/dto/ProcessInstanceDto.java | 6 +-
.../midpoint/schema/constants/ObjectTypes.java | 4 +
.../midpoint/schema/constants/SchemaConstants.java | 2 +
.../resources/xml/ns/public/common/common-2a.xsd | 8 +
.../xml/ns/public/model/workflow/extension-2.xsd | 8 +-
.../model/workflow/process-instance-state-2.xsd | 64 +-
.../workflow/DefaultWorkflowEventCreator.java | 4 +-
.../evolveum/midpoint/wf/api/WorkflowManager.java | 2 -
model/workflow-impl/pom.xml | 7 -
.../evolveum/midpoint/wf/WorkflowManagerImpl.java | 29 +-
.../midpoint/wf/activiti/ActivitiEngine.java | 2 +
.../wf/activiti/ActivitiEngineDataHelper.java | 38 -
.../midpoint/wf/activiti/ActivitiInterface.java | 95 ++-
.../{ => activiti}/dao/ProcessInstanceManager.java | 166 ++---
.../dao/ProcessInstanceProvider.java | 610 +++++++--------
.../wf/{ => activiti}/dao/WorkItemManager.java | 296 ++++----
.../wf/{ => activiti}/dao/WorkItemProvider.java | 782 ++++++++++++--------
.../evolveum/midpoint/wf/jobs/JobController.java | 224 +++---
.../midpoint/wf/jobs/JobCreationInstruction.java | 2 +-
...rocessResponse.java => TaskCompletedEvent.java} | 47 +-
...yProcessResponse.java => TaskCreatedEvent.java} | 47 +-
.../evolveum/midpoint/wf/messages/TaskEvent.java | 154 ++++
.../common}/ActivitiUtil.java | 150 ++--
.../common/CommonProcessVariableNames.java | 16 +-
.../processes/common/MidPointProcessListener.java | 3 +-
.../wf/processes/common/MidPointTaskListener.java | 43 +-
.../common}/SpringApplicationContextHolder.java | 184 ++---
.../itemApproval/ApprovalRequestImpl.java | 2 +-
.../wf/processes/itemApproval/Constants.java | 31 -
.../InitializeLoopThroughApproversInLevel.java | 11 +-
.../wf/processes/itemApproval/PrepareResult.java | 4 +-
.../itemApproval/RecordIndividualDecision.java | 4 +-
.../itemApproval/SummarizeDecisionsInLevel.java | 2 +-
.../midpoint/wf/processors/BaseAuditHelper.java | 150 ++++
.../wf/processors/BaseExternalizationHelper.java | 11 +-
.../midpoint/wf/processors/ChangeProcessor.java | 62 +-
.../general/GcpProcessVariableNames.java | 20 +-
.../processors/general/GeneralChangeProcessor.java | 50 +-
.../{ => wrapper}/DefaultGcpProcessWrapper.java | 12 +-
.../general/{ => wrapper}/GcpProcessWrapper.java | 19 +-
.../primary/PcpExternalizationHelper.java | 19 +-
.../primary/PcpProcessVariableNames.java | 36 +
.../wf/processors/primary/PcpRepoAccessHelper.java | 148 ++++
.../processors/primary/PrimaryChangeProcessor.java | 89 ++-
.../primary/user/AddRoleAssignmentWrapper.java | 2 +-
.../primary/user/ChangePasswordWrapper.java | 4 +-
.../wf/processors/primary/wrapper/BaseWrapper.java | 7 -
.../wrapper/PrimaryApprovalProcessWrapper.java | 25 +-
.../processors/primary/wrapper/WrapperHelper.java | 6 +-
.../evolveum/midpoint/wf/util/MiscDataUtil.java | 65 +-
.../TestAuthenticationInfoHolder.java | 74 +-
.../midpoint/wf/TestUserChangeApproval.java | 3 +-
...pprovingDummyResourceChangesProcessWrapper.java | 2 +-
.../wf/general/TestGeneralChangeProcessor.java | 5 +-
.../src/test/resources/ctx-workflow-test-main.xml | 5 +-
.../src/test/resources/logback-test.xml | 2 +-
model/workflow-impl/testng.xml | 2 +-
61 files changed, 2311 insertions(+), 1644 deletions(-)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{ => activiti}/dao/ProcessInstanceManager.java (96%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{ => activiti}/dao/ProcessInstanceProvider.java (97%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{ => activiti}/dao/WorkItemManager.java (97%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{ => activiti}/dao/WorkItemProvider.java (69%)
copy model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/{QueryProcessResponse.java => TaskCompletedEvent.java} (77%)
copy model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/{QueryProcessResponse.java => TaskCreatedEvent.java} (77%)
create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/TaskEvent.java
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{activiti => processes/common}/ActivitiUtil.java (90%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{activiti => processes/common}/SpringApplicationContextHolder.java (88%)
delete mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/Constants.java
create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseAuditHelper.java
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TreeThemeBasic.java => model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpProcessVariableNames.java (56%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/{ => wrapper}/DefaultGcpProcessWrapper.java (73%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/{ => wrapper}/GcpProcessWrapper.java (57%)
create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpProcessVariableNames.java
create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpRepoAccessHelper.java
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{activiti => util}/TestAuthenticationInfoHolder.java (92%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list