[midPoint-git] [Evolveum/midpoint] fb427e: some more code refactor

kate honchar at evolveum.com
Sat Sep 16 01:11:07 CEST 2017 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: fb427e5be9be495f5b459ddcfc3f7c3e792ca18f
      https://github.com/Evolveum/midpoint/commit/fb427e5be9be495f5b459ddcfc3f7c3e792ca18f
  Author: kate <honchar at evolveum.com>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/dto/AssignmentViewType.java

  Log Message:
  -----------
  some more code refactor


  Commit: 11e379466b55350e1c77b45b708bf680b9da5ac1
      https://github.com/Evolveum/midpoint/commit/11e379466b55350e1c77b45b708bf680b9da5ac1
  Author: kate <honchar at evolveum.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less

  Log Message:
  -----------
  code refactoring for role catalog, using grid view


  Commit: 26a94518888d593903d3d37e435b78bd634d629e
      https://github.com/Evolveum/midpoint/commit/26a94518888d593903d3d37e435b78bd634d629e
  Author: kate <honchar at evolveum.com>
  Date:   2017-09-16 (Sat, 16 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulePropertiesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LocalizableMessageModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/FileAppenderConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/dto/GenericHandlerDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupListPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerGroupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/EvaluatedTriggerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/InformationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/EvaluatedTriggerDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/EvaluatedTriggerGroupDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinitionImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ItemEntry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchemaImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismPrettyPrinter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/LocalizationUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_cs.properties
    M infra/schema/src/main/resources/localization/schema_de.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/localization/schema_es.properties
    M infra/schema/src/main/resources/localization/schema_et.properties
    M infra/schema/src/main/resources/localization/schema_fi.properties
    M infra/schema/src/main/resources/localization/schema_hu.properties
    M infra/schema/src/main/resources/localization/schema_pl.properties
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_sk.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M infra/schema/src/main/resources/localization/schema_zh_CN.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
    M infra/schema/src/test/resources/common/json/no-ns/resource-expression.json
    M infra/schema/src/test/resources/common/json/ns/resource-expression.json
    M infra/schema/src/test/resources/common/xml/no-ns/resource-expression.xml
    M infra/schema/src/test/resources/common/xml/ns/resource-expression.xml
    M infra/schema/src/test/resources/common/yaml/no-ns/resource-expression.yaml
    M infra/schema/src/test/resources/common/yaml/ns/resource-expression.yaml
    M infra/util/pom.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessage.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/LocalizableMessageBuilder.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/TreeNode.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/CommonException.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/ObjectNotFoundException.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/PolicyViolationException.java
    M model/certification-impl/pom.xml
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationHook.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractUninitializedCertificationTest.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java
    A model/certification-impl/src/test/resources/common/user-administrator-plain.xml
    A model/certification-impl/src/test/resources/complex/messages.properties
    A model/certification-impl/src/test/resources/complex/role-correct-high-risk.xml
    A model/certification-impl/src/test/resources/complex/role-correct.xml
    A model/certification-impl/src/test/resources/complex/role-empty.xml
    A model/certification-impl/src/test/resources/complex/role-high-risk-empty.xml
    A model/certification-impl/src/test/resources/complex/system-configuration.xml
    A model/certification-impl/src/test/resources/complex/user-jack.xml
    A model/certification-impl/src/test/resources/ctx-certification-test-with-workflows.xml
    M model/certification-impl/testng-integration.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedCompositeTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedMultiplicityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedSituationTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituation.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/SimpleOperationName.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/AssignmentPolicyRuleEvaluationContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectPolicyRuleEvaluationContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectState.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEvaluationContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicySituationUpdater.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/CompositeConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ModificationConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicyConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicySituationConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/StateConstraintEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/TransitionConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractModelImplementationIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyMetadata.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/RecordingProgressListener.java
    M model/model-impl/src/test/resources/common/system-configuration.xml
    A model/model-impl/src/test/resources/lens/policy/role-ambiguous-reference.xml
    A model/model-impl/src/test/resources/lens/policy/role-chained-references.xml
    A model/model-impl/src/test/resources/lens/policy/role-cyclic-references.xml
    A model/model-impl/src/test/resources/lens/policy/role-person.xml
    A model/model-impl/src/test/resources/lens/policy/role-student.xml
    A model/model-impl/src/test/resources/lens/policy/role-temporary.xml
    A model/model-impl/src/test/resources/lens/policy/role-unresolvable-references.xml
    A model/model-impl/src/test/resources/lens/policy/user-frank.xml
    A model/model-impl/src/test/resources/lens/policy/user-joe.xml
    A model/model-impl/src/test/resources/lens/policy/user-peter.xml
    M model/model-impl/src/test/resources/lens/role-judge.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/DelayingProgressListener.java
    R model/model-intest/src/test/resources/common/account-herman-opendj.xml
    R model/model-intest/src/test/resources/common/resource-opendj.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/rbac/role-cannibal-deprecated.xml
    M model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-createable.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    R model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationHook.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/TimeValidityNotifier.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfExpressionEvaluationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/AdditionalInformationGenerator.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/PolicyRuleBasedAspect.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/AbstractWfTestPolicy.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/metarole/TestAssignmentsWithDifferentMetaroles.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/object/TestObjectConstraints.java
    A model/workflow-impl/src/test/resources/policy/object/metarole-constraints.xml
    A model/workflow-impl/src/test/resources/policy/object/role-employee.xml
    A model/workflow-impl/src/test/resources/policy/object/system-configuration.xml
    A model/workflow-impl/src/test/resources/policy/object/user-employee-owner.xml
    M model/workflow-impl/src/test/resources/policy/sod/metarole-criminal-exclusion.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/repo-test-util/src/main/resources/test-config.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M samples/certification/sod/a-test-2a.xml
    M samples/certification/sod/a-test-2b.xml
    M samples/certification/sod/a-test-2c.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java


Compare: https://github.com/Evolveum/midpoint/compare/bf93efc3af73...26a94518888d

More information about the midPoint-svn mailing list