[midPoint-git] [Evolveum/midpoint] c57f27: string policy type - containerable

Viliam Repan vilo.repan at evolveum.com
Sat Sep 30 22:59:18 CEST 2017


  Branch: refs/heads/feature/boot
  Home:   https://github.com/Evolveum/midpoint
  Commit: c57f27842beec7933accd9d544c755696538349e
      https://github.com/Evolveum/midpoint/commit/c57f27842beec7933accd9d544c755696538349e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  string policy type - containerable


  Commit: 48369365962f6cd2233dc63d9cc5907fe5401332
      https://github.com/Evolveum/midpoint/commit/48369365962f6cd2233dc63d9cc5907fe5401332
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrWorkItemDto.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/DeltaBuilder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/PolicyRuleTypeUtil.java
    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/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/xml/DomAwareEqualsStrategy.java
    M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertCaseOperationsHelper.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/TestSoDCertification.java
    M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java
    M model/certification-impl/src/test/resources/common/system-configuration.xml
    M model/certification-impl/src/test/resources/complex/system-configuration.xml
    M model/certification-impl/src/test/resources/sod/a-test-2a.xml
    M model/certification-impl/src/test/resources/sod/a-test-2b.xml
    M model/certification-impl/src/test/resources/sod/a-test-2c.xml
    M model/certification-impl/src/test/resources/sod/a-test-3x.xml
    M model/certification-impl/src/test/resources/sod/a-test-3y.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPath.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/AssignmentPathSegment.java
    M 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
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    M 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
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedStateTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTimeValidityTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedTransitionTrigger.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PolicyRuleExternalizationOptions.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/AssignmentPathImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentSpec.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/Clockwork.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/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/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentTripleEvaluator.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/policy/AssignmentPolicyRuleEvaluationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/ObjectPolicyRuleEvaluationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleEvaluationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    R 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/PolicyStateRecorder.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/RulesEvaluationContext.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    R 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/TestPolicyRules2.java
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyStateRecording.java
    A model/model-impl/src/test/resources/lens/policy/state/a-test-2a.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-2b.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-2c.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-3a.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-3b.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-3x.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-3y.xml
    A model/model-impl/src/test/resources/lens/policy/state/a-test-wrong.xml
    A model/model-impl/src/test/resources/lens/policy/state/metarole-common-rules.xml
    A model/model-impl/src/test/resources/lens/policy/state/user-bob.xml
    A model/model-impl/src/test/resources/lens/policy/state/user-eve.xml
    A model/model-impl/src/test/resources/lens/role-judge-record-only.xml
    R model/model-impl/src/test/resources/lens/role-judge-situation-only.xml
    A model/model-impl/src/test/resources/lens/role-pirate-record-only.xml
    R model/model-impl/src/test/resources/lens/role-pirate-situation-only.xml
    M model/model-impl/src/test/resources/lens/role-thief.xml
    M model/model-impl/testng-unit.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestSegregationOfDuties.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/policy/ApprovalSchemaBuilder.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/restriction/FullTextRestriction.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java

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


  Commit: 57ad0819927046159e438bf2b0ffad457a8de76f
      https://github.com/Evolveum/midpoint/commit/57ad0819927046159e438bf2b0ffad457a8de76f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/boot


  Commit: 56489a83782a7da48995907f2d804a4d6dd43f71
      https://github.com/Evolveum/midpoint/commit/56489a83782a7da48995907f2d804a4d6dd43f71
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.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/Clockwork.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/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputStruct.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisableSlowProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-disable-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable-slow-proposed.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Many fixes to activation, parallelism, test improvements. Work in progress. (MID-4154)


  Commit: b3dca985f9e43c2287df04aff86216b7b3f057f1
      https://github.com/Evolveum/midpoint/commit/b3dca985f9e43c2287df04aff86216b7b3f057f1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/ClassPathUtil.java

  Log Message:
  -----------
  classpath util cleanup


  Commit: ecac53961b32a1d77490c8a9aaff850c5111260e
      https://github.com/Evolveum/midpoint/commit/ecac53961b32a1d77490c8a9aaff850c5111260e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/PipelineItem.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/VariablesUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/schema/piracy.xsd
    A model/model-intest/src/test/resources/scripting/scripting-users-in-background.xml

  Log Message:
  -----------
  Added "task" variable for bulk actions. Fixed /rpc/executeScript?asynchronous=true.


  Commit: ebc43a4a25c3c9b28eba4e21e79c2a0cc9c14665
      https://github.com/Evolveum/midpoint/commit/ebc43a4a25c3c9b28eba4e21e79c2a0cc9c14665
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

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


  Commit: e3b79c0ba6518e7dfa3ba969d4ff46c116bddf80
      https://github.com/Evolveum/midpoint/commit/e3b79c0ba6518e7dfa3ba969d4ff46c116bddf80
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.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/Clockwork.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/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.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/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionMappingLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java

  Log Message:
  -----------
  More parallelism improvements, bugfixies and test improvements (MID-4154) ... but still work in progress


  Commit: e5823afc754d851b81a1a5719e67e443fa0043ea
      https://github.com/Evolveum/midpoint/commit/e5823afc754d851b81a1a5719e67e443fa0043ea
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/security/role-self-accounts-partial-control-password.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java

  Log Message:
  -----------
  Adjusting and improving tests, fixing conflict detection delay (MID-4154)


  Commit: 63e273832f9ec1c1343ff4ebc26241e3daf7ecfe
      https://github.com/Evolveum/midpoint/commit/63e273832f9ec1c1343ff4ebc26241e3daf7ecfe
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.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/Clockwork.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/LensProjectionContext.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/PersonaProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.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/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputStruct.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionMappingLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisableSlowProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-disable-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M model/model-intest/src/test/resources/security/role-self-accounts-partial-control-password.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'fix/MID-4154'


  Commit: 24e1195f8af4b4b18d9a2e3004197dadd9c0170f
      https://github.com/Evolveum/midpoint/commit/24e1195f8af4b4b18d9a2e3004197dadd9c0170f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistryImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/PipelineItem.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ScriptingService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.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/Clockwork.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/LensProjectionContext.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/PersonaProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ProjectorComponentRunnable.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.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/MappingEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingOutputStruct.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionMappingLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/VariablesUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/ScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/expressions/SearchEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualDisableSlowProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/TestSemiManualSlowProposed.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/manual/resource-semi-manual-disable-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-one-semi-manual-disable-slow-proposed.xml
    A model/model-intest/src/test/resources/manual/role-two-semi-manual-disable-slow-proposed.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-light-crimson.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    A model/model-intest/src/test/resources/scripting/scripting-users-in-background.xml
    M model/model-intest/src/test/resources/security/role-self-accounts-partial-control-password.xml
    M model/model-intest/testng-integration.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/manual/AbstractManualResourceTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/boot


  Commit: e8379b69e73ee289e85d7df0c6b7c1bfce1cbda3
      https://github.com/Evolveum/midpoint/commit/e8379b69e73ee289e85d7df0c6b7c1bfce1cbda3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/org.identityconnectors.common.logging

  Log Message:
  -----------
  class not found fixed


  Commit: 149fc0ac9338fcf20a236e3f2d3e2f4ed82b440d
      https://github.com/Evolveum/midpoint/commit/149fc0ac9338fcf20a236e3f2d3e2f4ed82b440d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2017-09-30 (Sat, 30 Sep 2017)

  Changed paths:
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorFactoryConnIdImpl.java

  Log Message:
  -----------
  loading of icf connectors fixed, now works for standalone springboot as well as for standard war


Compare: https://github.com/Evolveum/midpoint/compare/8de243fe1c13...149fc0ac9338


More information about the midPoint-svn mailing list