[midPoint-git] [Evolveum/midpoint] d39da3: cleaner back button handling on import page, parti...
Viliam Repan
vilo.repan at evolveum.com
Thu Mar 9 14:27:30 CET 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: d39da31651d963014fa9d0af02a9fd6303124bfb
https://github.com/Evolveum/midpoint/commit/d39da31651d963014fa9d0af02a9fd6303124bfb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)
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/web/component/menu/MainMenuItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
Log Message:
-----------
cleaner back button handling on import page, partial fix for MID-3690
Commit: f4f40300102b7a2c87f88b90be6df54f3561f871
https://github.com/Evolveum/midpoint/commit/f4f40300102b7a2c87f88b90be6df54f3561f871
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/SubscriptionType.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.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/page/admin/certification/CertDecisionHelper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
R infra/common/src/main/java/com/evolveum/midpoint/common/policy/StringPolicyUtils.java
R infra/common/src/main/java/com/evolveum/midpoint/common/policy/ValuePolicyGenerator.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/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanMarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JavaTypeConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.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/main/resources/xml/ns/public/common/common-model-context-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/parser/TestParseUser.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M infra/schema/src/test/resources/common/json/no-ns/user-jack.json
M infra/schema/src/test/resources/common/json/ns/user-jack.json
M infra/schema/src/test/resources/common/xml/no-ns/user-jack.xml
M infra/schema/src/test/resources/common/xml/ns/user-jack.xml
M infra/schema/src/test/resources/common/yaml/no-ns/user-jack.yaml
M infra/schema/src/test/resources/common/yaml/ns/user-jack.yaml
M model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/SoDCertificationTest.java
M model/certification-impl/src/test/resources/sod/a-test-2a.xml
M model/certification-impl/src/test/resources/sod/a-test-2b.xml
A model/certification-impl/src/test/resources/sod/a-test-2c.xml
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.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/GenerateExpressionEvaluatorFactory.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/StringPolicyUtils.java
A model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.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/lens/AssignmentPathSegmentImpl.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/projector/PasswordPolicyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScannerTaskHandler.java
M model/model-impl/src/main/resources/ctx-model.xml
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPasswordPolicy.java
A 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
R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicySituations.java
A model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
A model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
M model/model-impl/testng-unit.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
M model/model-intest/src/test/resources/common/password-policy-global.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/password/password-policy-ugly.xml
M model/model-intest/src/test/resources/password/resource-dummy-ugly.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowConstants.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/messages/TaskEvent.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/MidpointUtil.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/SummarizeDecisionsInLevel.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCompleteListener.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskDeleteListener.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.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/other/TestEscalation.java
M model/workflow-impl/src/test/resources/logback-test.xml
A model/workflow-impl/src/test/resources/policy/escalation/role-e2.xml
M model/workflow-impl/src/test/resources/policy/system-configuration.xml
M repo/repo-test-util/pom.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
M samples/certification/sod/a-test-2a.xml
M samples/certification/sod/a-test-2b.xml
A samples/certification/sod/a-test-2c.xml
M samples/certification/sod/sod-certification.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 8d3a7858d27b4101ebaf76446f8c1296bdb7984e
https://github.com/Evolveum/midpoint/commit/8d3a7858d27b4101ebaf76446f8c1296bdb7984e
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-03-08 (Wed, 08 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/PopupObjectListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
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_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.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 infra/prism/src/main/java/com/evolveum/midpoint/prism/OriginType.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SimpleTypeDefinitionImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M infra/schema/src/main/resources/localization/schema_pl.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-certification-3.xsd
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-workflows-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyGenerator.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/AuditController.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/ObjectMerger.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/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/LensElementContext.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/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PolicyRuleProcessor.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/action/LinkAction.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/ModelTUtil.java
M model/model-impl/src/test/resources/common/resource-dummy.xml
M model/model-impl/src/test/resources/common/system-configuration.xml
M model/model-impl/src/test/resources/lens/ppolicy/password-policy-props.xml
M model/model-impl/src/test/resources/lens/ppolicy/password-policy-username.xml
M model/model-impl/src/test/resources/lens/role-judge.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
M model/model-intest/src/test/resources/common/password-policy-global.xml
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemAllocationEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemCustomEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemLifecycleEvent.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemAllocationChangeOperationInfo.java
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemListener.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationInfo.java
A model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkItemOperationSourceInfo.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/WfTimedActionTriggerHandler.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/BaseGcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/scenarios/GcpScenarioBean.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/tasks/WfTaskController.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/AbstractTestAssignmentApproval.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/assignments/global/TestAssignmentApprovalGlobal.java
M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestEscalation.java
M model/workflow-impl/src/test/resources/policy/metarole-default.xml
A model/workflow-impl/src/test/resources/policy/system-configuration-global.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreter2Test.java
M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryContext.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryException.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryCriteriaImpl.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/DefaultMatcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/Matcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/PolyStringMatcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/matcher/StringMatcher.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AndRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/CollectionRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/InOidRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestrictionOperation.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/LogicalRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NotRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/Restriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/TypeRestriction.java
R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/UnaryLogicalRestriction.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryDefinitionRegistry2.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/QueryInterpreter2.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyContainerDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaDataNodeDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaEntityPointerDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaPropertyDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaReferenceDefinition.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolutionState.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/resolution/ItemPathResolver.java
M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestStrings.java
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 3cb2436fb98ce64de4b98917d85081a4f485e001
https://github.com/Evolveum/midpoint/commit/3cb2436fb98ce64de4b98917d85081a4f485e001
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/Url.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceVisualization.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MountedMapperWithoutPageComponentInfo.java
Log Message:
-----------
MID-3690 fix for url pattern matching in security
Commit: 282705132cf1cb933921b0802449b4671c82e9b6
https://github.com/Evolveum/midpoint/commit/282705132cf1cb933921b0802449b4671c82e9b6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-03-09 (Thu, 09 Mar 2017)
Changed paths:
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugDumpable.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionEnvironment.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/AssignmentPathImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.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/EvaluationOrderImpl.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/projector/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/SimpleObjectRef.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/SimpleObjectRefImpl.java
M repo/repo-api/pom.xml
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-cache/pom.xml
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java
M samples/tasks/bulk-actions/send-notifications-about-all-users.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Compare: https://github.com/Evolveum/midpoint/compare/d9505a31075b...282705132cf1
More information about the midPoint-svn
mailing list