[midPoint-git] midPoint branch master updated. v2.3devel-1228-g07319ea

Pavol Mederly git at evolveum.com
Wed Mar 12 00:53:14 CET 2014


Project "midPoint" branch master has been updated
       via  07319ea2a66d6c4ff9e18cc3941895c64ff9766c (commit) v2.3devel-1228-g07319ea
       via  da3e9b61f13d015527201f03cb85b2bcf2979625 (commit) v2.3devel-1225-gda3e9b6
      from  5b4cc9a6dd214d9b04610bce3d7d0136adedd37c (commit) v2.3devel-1226-g5b4cc9a

- Log -----------------------------------------------------------------
commit 07319ea2a66d6c4ff9e18cc3941895c64ff9766c
Merge: da3e9b6 5b4cc9a
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Wed Mar 12 00:52:31 2014 +0100

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

commit da3e9b61f13d015527201f03cb85b2bcf2979625
Author: Pavol Mederly <mederly at evolveum.com>
Date:   Wed Mar 12 00:52:16 2014 +0100

    Another big refactoring and cleanup of workflows:
    1. Separation of the idea of process interface (wrapper) from change aspect (PCP) or scenario (GCP)
    2. Fixing both change processors to state when at least tests pass.
    3. Reorganized externalized process state (not OK for now due to problems in prism module).

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

(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/prism/ContainerWrapper.java      |    2 +-
 .../processes/EmptyProcessDetailsPanel.html}       |    2 +-
 .../wf/processes/EmptyProcessDetailsPanel.java     |   14 +-
 .../processes/EmptyProcessDetailsPanel.properties} |    4 +-
 .../processes/itemApproval/ItemApprovalPanel.java  |    8 +-
 .../page/admin/workflow/ProcessInstancePanel.java  |   32 +-
 .../admin/workflow/dto/ProcessInstanceDto.java     |    4 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |    6 +-
 .../model/workflow/process-instance-state-2.xsd    |  105 ++-
 .../workflow/DefaultWorkflowEventCreator.java      |   19 +-
 .../midpoint/wf/api/WfTaskExtensionItemsNames.java |    1 -
 .../primary/PcpTaskExtensionItemsNames.java        |    2 +-
 .../com/evolveum/midpoint/wf/WfConfiguration.java  |    2 +-
 .../evolveum/midpoint/wf/WorkflowManagerImpl.java  |   13 +-
 .../midpoint/wf/activiti/ActivitiInterface.java    |   10 +-
 .../wf/activiti/dao/ProcessInstanceManager.java    |    2 +-
 .../wf/activiti/dao/ProcessInstanceProvider.java   |    4 +-
 .../evolveum/midpoint/wf/jobs/JobController.java   |   10 +-
 .../midpoint/wf/jobs/JobCreationInstruction.java   |    6 +
 .../com/evolveum/midpoint/wf/jobs/WfTaskUtil.java  |   10 +-
 .../midpoint/wf/messages/ProcessEvent.java         |   28 +-
 .../wf/processes/BaseProcessMidPointInterface.java |   64 ++
 .../processes/DefaultProcessMidPointInterface.java |   46 ++
 .../wf/processes/ProcessInterfaceFinder.java       |   47 ++
 .../wf/processes/ProcessMidPointInterface.java     |   40 ++
 .../common/CommonProcessVariableNames.java         |   13 +-
 .../itemApproval/ItemApprovalProcessInterface.java |  103 +++
 .../wf/processes/itemApproval/PrepareResult.java   |    6 +-
 .../itemApproval/RecordIndividualDecision.java     |    3 +-
 .../wf/processors/BaseChangeProcessor.java         |    8 +
 .../wf/processors/BaseExternalizationHelper.java   |   38 +-
 .../midpoint/wf/processors/ChangeProcessor.java    |   16 +-
 .../general/GcpProcessVariableNames.java           |    8 +-
 .../processors/general/GeneralChangeProcessor.java |  102 ++-
 .../general/scenarios/BaseGcpScenarioBean.java     |  122 ++++
 .../general/scenarios/DefaultGcpScenarioBean.java} |   10 +-
 .../GcpScenarioBean.java}                          |   19 +-
 .../general/wrapper/DefaultGcpProcessWrapper.java  |   63 --
 .../primary/PcpChildJobCreationInstruction.java    |   46 ++
 .../processors/primary/PcpConfigurationHelper.java |   20 +-
 .../primary/PcpExternalizationHelper.java          |   25 +-
 .../midpoint/wf/processors/primary/PcpJob.java     |   11 +-
 .../primary/PcpProcessVariableNames.java           |    4 +-
 .../processors/primary/PrimaryChangeProcessor.java |   65 +-
 .../BasePrimaryChangeAspect.java}                  |   37 +-
 .../PrimaryChangeAspect.java}                      |   41 +-
 .../PrimaryChangeAspectHelper.java}                |  106 +--
 ...ntWrapper.java => AddRoleAssignmentAspect.java} |  688 ++++++++++----------
 ...swordWrapper.java => ChangePasswordAspect.java} |  327 +++++-----
 ...ApprovingDummyResourceChangesScenarioBean.java} |   23 +-
 .../wf/general/TestGeneralChangeProcessor.java     |    7 +-
 .../src/test/resources/logback-test.xml            |    1 -
 .../src/test/resources/test-config.xml             |    6 +-
 model/workflow-impl/testng.xml                     |    1 +
 54 files changed, 1429 insertions(+), 971 deletions(-)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/{data/column/CheckBoxPanel.html => wf/processes/EmptyProcessDetailsPanel.html} (92%)
 copy model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpProcessVariableNames.java => gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.java (62%)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/{dialog/ConfirmationDialog.properties => wf/processes/EmptyProcessDetailsPanel.properties} (89%)
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/BaseProcessMidPointInterface.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/DefaultProcessMidPointInterface.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/ProcessInterfaceFinder.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/ProcessMidPointInterface.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/ItemApprovalProcessInterface.java
 create mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/BaseGcpScenarioBean.java
 copy model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/{messages/TaskCompletedEvent.java => processors/general/scenarios/DefaultGcpScenarioBean.java} (70%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/{wrapper/GcpProcessWrapper.java => scenarios/GcpScenarioBean.java} (62%)
 delete mode 100644 model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/DefaultGcpProcessWrapper.java
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/{wrapper/BaseWrapper.java => aspect/BasePrimaryChangeAspect.java} (68%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/{wrapper/PrimaryApprovalProcessWrapper.java => aspect/PrimaryChangeAspect.java} (78%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/{wrapper/WrapperHelper.java => aspect/PrimaryChangeAspectHelper.java} (54%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/{AddRoleAssignmentWrapper.java => AddRoleAssignmentAspect.java} (86%)
 rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/{ChangePasswordWrapper.java => ChangePasswordAspect.java} (70%)
 rename model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/{ApprovingDummyResourceChangesProcessWrapper.java => ApprovingDummyResourceChangesScenarioBean.java} (69%)


hooks/post-receive
-- 
midPoint


More information about the midPoint-svn mailing list