[midPoint-git] [Evolveum/midpoint] 461360: MID-4672 Org. tree sorting/ordering
kate
honchar at evolveum.com
Mon Sep 3 14:45:15 CEST 2018
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 461360cd01a69c8ed48e5e24b771dbfaae2944f0
https://github.com/Evolveum/midpoint/commit/461360cd01a69c8ed48e5e24b771dbfaae2944f0
Author: kate <honchar at evolveum.com>
Date: 2018-09-03 (Mon, 03 Sep 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
Log Message:
-----------
MID-4672 Org. tree sorting/ordering
Commit: eff7a31ddb3068dc52581d2a8568150fd7d2aa29
https://github.com/Evolveum/midpoint/commit/eff7a31ddb3068dc52581d2a8568150fd7d2aa29
Author: kate <honchar at evolveum.com>
Date: 2018-09-03 (Mon, 03 Sep 2018)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ModelServiceLocator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.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/PreviewChangesTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ApprovalStageExecutionInformationDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestIntegrationSecurity.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ExceptionUtil.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectResolver.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SimpleObjectResolver.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
R infra/test-util/src/main/java/com/evolveum/midpoint/test/util/DirectoryFileObjectResolver.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/BaseCertificationHandler.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-common/pom.xml
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/FunctionExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctionsXPath.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/FunctionLibrary.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/FunctionLibraryUtil.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionUtil.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/velocity/VelocityScriptEvaluator.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/LazyXPathVariableResolver.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/MidPointNamespaceContext.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/ReflectionXPathFunctionResolver.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/ReflectionXPathFunctionWrapper.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.java
R model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/AbstractValuePolicyOriginResolver.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ShadowValuePolicyOriginResolver.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/UserValuePolicyOriginResolver.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java
R model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestXPathExpressions.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
R model/model-common/src/test/resources/expression/xpath/expression-func-concatname.xml
R model/model-common/src/test/resources/expression/xpath/expression-func.xml
R model/model-common/src/test/resources/expression/xpath/expression-list.xml
R model/model-common/src/test/resources/expression/xpath/expression-objectref-variables-polystring.xml
R model/model-common/src/test/resources/expression/xpath/expression-objectref-variables.xml
R model/model-common/src/test/resources/expression/xpath/expression-root-node.xml
R model/model-common/src/test/resources/expression/xpath/expression-simple.xml
R model/model-common/src/test/resources/expression/xpath/expression-string-variables.xml
R model/model-common/src/test/resources/expression/xpath/expression-user-extension-ship-path.xml
R model/model-common/src/test/resources/expression/xpath/expression-user-extension-ship.xml
R model/model-common/src/test/resources/expression/xpath/expression-user-given-name.xml
R model/model-common/src/test/resources/expression/xpath/expression-user-stringify-full-name.xml
R model/model-common/src/test/resources/mapping/mapping-script-list-absolute-xpath.xml
R model/model-common/src/test/resources/mapping/mapping-script-list-relative-xpath.xml
R model/model-common/src/test/resources/mapping/mapping-script-root-node.xml
R model/model-common/src/test/resources/mapping/mapping-script-simple-xpath.xml
R model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-xpath.xml
R model/model-common/src/test/resources/mapping/mapping-script-system-variables-polystring-xpath.xml
R model/model-common/src/test/resources/mapping/mapping-script-variables-xpath.xml
M model/model-common/src/test/resources/mapping/mapping-value-condition-false.xml
M model/model-common/src/test/resources/mapping/mapping-value-condition-true.xml
M model/model-common/testng-unit.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/MappingDiagEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelImplUtils.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/expr/ExpressionHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AbstractConstruction.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/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensOwnerResolver.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/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/MappingEvaluator.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/lens/projector/focus/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/ObjectTemplateProcessor.java
M 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/ModifyExecutor.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/security/AuthenticationEvaluatorImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestSecurityQuestionsAuthenticator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.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/ReconciliationTaskHandler.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/sync/SynchronizationServiceUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeModelTaskHandler.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ModelImplUtils.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestRefinedSchema.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/controller/ModelUtilsTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestModelExpressions.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/security/TestAbstractAuthenticationEvaluator.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfiramtionEvaluator.java
M model/model-impl/src/test/resources/common/user-barbossa.xml
M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
M model/model-impl/src/test/resources/sync/correlation-case-insensitive.xml
M model/model-impl/src/test/resources/sync/correlation-case-insensitive_empl_number.xml
M model/model-impl/src/test/resources/sync/correlation-first-filter.xml
M model/model-impl/src/test/resources/sync/correlation-or-filter.xml
M model/model-impl/src/test/resources/sync/correlation-second-filter.xml
M model/model-impl/src/test/resources/sync/correlation-with-condition-emplNumber.xml
M model/model-impl/src/test/resources/sync/correlation-with-condition.xml
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/TestPreviewChanges.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/mapping/TestMapping.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityBasic.java
M model/model-intest/src/test/resources/common/resource-dummy-black.xml
M model/model-intest/src/test/resources/common/system-configuration-with-template.xml
M model/model-intest/src/test/resources/manual/resource-dummy-itsm.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/multi/resource-dummy-beige.xml
M model/model-intest/src/test/resources/multi/resource-dummy-dark-peru.xml
M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
M model/model-intest/src/test/resources/multi/resource-dummy-lavender.xml
M model/model-intest/src/test/resources/multi/resource-dummy-peru.xml
M model/model-intest/src/test/resources/preview/resource-dummy-lemon.xml
M model/model-test/pom.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportService.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointLocalQueryExecutor.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/legacy/AbstractWfTestLegacy.java
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/DirectoryFileObjectResolver.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/ObjectResolver.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/RepoObjectResolver.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/AbstractObjectResolvableExpressionEvaluatorFactory.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionFactory.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeTaskHandler.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
R repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/RepoObjectResolver.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/RepoSimpleObjectResolver.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/AbstractAsserter.java
M repo/repo-test-util/src/main/resources/ctx-configuration-test.xml
M repo/repo-test-util/src/main/resources/ctx-expression-test.xml
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/OwnerResolver.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Compare: https://github.com/Evolveum/midpoint/compare/df0e89066d89...eff7a31ddb30
**NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
More information about the midPoint-svn
mailing list