[midPoint-git] [Evolveum/midpoint] e05a5e: assignment tab panle, policy rules tab panle, assi...
Katarina Valalikova
k.valalikova at evolveum.com
Tue Aug 22 14:06:14 CEST 2017
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: e05a5e05386f628844b0ab7a9c8b46c12ec63c33
https://github.com/Evolveum/midpoint/commit/e05a5e05386f628844b0ab7a9c8b46c12ec63c33
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
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/gui/api/util/WebModelServiceUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.ast
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.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/assignment/PolicyRulesPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RelationTypes.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleParametricRoleSelector.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleRoleSelector.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractFocusTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractRoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusDetailsTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/SampleFormFocusTabPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/AssignmentListDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ListDataProvider2.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/Selectable.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableBean.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableObjectDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminAbstractRole.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/configuration/component/ChooseTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageService.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/R_AtomicFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/builder/S_ConditionEntry.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
Log Message:
-----------
assignment tab panle, policy rules tab panle, assignment details, policy rule details panles improvements.
Commit: f2e5f5178df16edf135aa7f56f9823fe0e975556
https://github.com/Evolveum/midpoint/commit/f2e5f5178df16edf135aa7f56f9823fe0e975556
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-08-17 (Thu, 17 Aug 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/RelationSelectorAssignablePanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/RelationSelectorAssignablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.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/AbstractAssignmentDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDataTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java
Log Message:
-----------
displayname panel + some cleanup
Commit: 8d20963260c3c7fb547cd8cef2d52cd40a41569d
https://github.com/Evolveum/midpoint/commit/8d20963260c3c7fb547cd8cef2d52cd40a41569d
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-08-22 (Tue, 22 Aug 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusConsentTabPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusConsentTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.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/configuration/component/ChooseTypePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
Log Message:
-----------
continue on assignemnt list and datiles pages.
Commit: 5c45a696cd4b927c3ed21e3b2685cfce2444643a
https://github.com/Evolveum/midpoint/commit/5c45a696cd4b927c3ed21e3b2685cfce2444643a
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-08-22 (Tue, 22 Aug 2017)
Changed paths:
M build-system/pom.xml
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/page/PageBase.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/ObjectPolicyConfigurationEditor.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SelectableBean.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageBulkAction.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.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/configuration/component/ImportOptionsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/AppenderConfiguration.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/configuration/dto/ObjectPolicyConfigurationTypeDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/ObjectPolicyDialogDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.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/resources/component/TestConnectionMessagesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/DefaultGuiProgressListener.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/FocusSubwrapperDto.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/security/MidPointObjectChecker.java
M gui/admin-gui/src/main/resources/localization/Midpoint.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_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 gui/admin-gui/src/main/webapp/WEB-INF/web.xml
M infra/common/pom.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.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/LayerRefinedObjectClassDefinitionImpl.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/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
M infra/prism/pom.xml
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ExpressionWrapper.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerDomTarget.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerStringTarget.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/SerializerTarget.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/S_MaybeDelete.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/LexicalProcessorRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/dom/DomLexicalWriter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/AbstractJsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathDeserializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathSerializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathTypeDeserializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/ItemPathTypeSerializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/NullLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/YamlLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/ItemPathHolder.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PathHolderSegment.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismSerializerImpl.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/TrivialItemPathParser.java
R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/TrivialXPathParser.java
R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XPathHolder.java
R infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/XPathSegment.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemPathType.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
A infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractJsonLexicalProcessorTest.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
R infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
A infra/prism/src/test/resources/common/json/objects-1.json
A infra/prism/src/test/resources/common/json/objects-10-list-of-lists.json
A infra/prism/src/test/resources/common/json/objects-2-wrong-2.json
A infra/prism/src/test/resources/common/json/objects-2-wrong.json
A infra/prism/src/test/resources/common/json/objects-3-ns.json
A infra/prism/src/test/resources/common/json/objects-4-no-root-ns.json
A infra/prism/src/test/resources/common/json/objects-5-error.json
A infra/prism/src/test/resources/common/json/objects-6-single.json
A infra/prism/src/test/resources/common/json/objects-7-single.json
A infra/prism/src/test/resources/common/json/objects-9-list-single.json
A infra/prism/src/test/resources/common/xml/objects-1.xml
A infra/prism/src/test/resources/common/xml/objects-3-ns.xml
A infra/prism/src/test/resources/common/xml/objects-4-no-root-ns.json
A infra/prism/src/test/resources/common/xml/objects-4-no-root-ns.xml
A infra/prism/src/test/resources/common/xml/objects-5-error.json
A infra/prism/src/test/resources/common/xml/objects-5-error.xml
A infra/prism/src/test/resources/common/xml/objects-6-single.xml
A infra/prism/src/test/resources/common/xml/objects-7-single.xml
A infra/prism/src/test/resources/common/yaml/objects-1.yaml
A infra/prism/src/test/resources/common/yaml/objects-10-list-of-lists.yaml
A infra/prism/src/test/resources/common/yaml/objects-2-wrong-2.yaml
A infra/prism/src/test/resources/common/yaml/objects-2-wrong.yaml
A infra/prism/src/test/resources/common/yaml/objects-3-ns.yaml
A infra/prism/src/test/resources/common/yaml/objects-4-no-root-ns.yaml
A infra/prism/src/test/resources/common/yaml/objects-5-error.yaml
A infra/prism/src/test/resources/common/yaml/objects-6-single.yaml
A infra/prism/src/test/resources/common/yaml/objects-7-single.yaml
A infra/prism/src/test/resources/common/yaml/objects-8-multi-document.yaml
A infra/prism/src/test/resources/common/yaml/objects-9-list-single.yaml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingTypeFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
R infra/schema/src/main/java/com/evolveum/midpoint/schema/result/VariousValues.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/ParamsTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.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/TestConstants.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestOperationResult.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjects.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIteratively.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIterativelyFirstTwo.java
A infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIterativelyWrong.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseResource.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
A infra/schema/src/test/resources/common/json/no-ns/objects-wrong.json
A infra/schema/src/test/resources/common/json/ns/objects-wrong.json
A infra/schema/src/test/resources/common/xml/no-ns/objects-wrong.xml
A infra/schema/src/test/resources/common/xml/ns/objects-wrong.xml
M infra/schema/src/test/resources/common/xml/ns/resource-opendj.xml
A infra/schema/src/test/resources/common/yaml/no-ns/objects-wrong.yaml
A infra/schema/src/test/resources/common/yaml/ns/objects-wrong.yaml
M infra/schema/testng-unit.xml
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.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/script/xpath/XPathExpressionCodeHolder.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
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/ModelWebServiceRaw.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/ModelDiagController.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/ModelUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportObjectsFromFileTaskHandler.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/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/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationalDataManager.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/ConstructionProcessor.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/OutboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
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/AbstractInitializedModelIntegrationTest.java
A 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/TestModelServiceContract.java
A 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/TestUserTemplate.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/AbstractImportTest.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/BadImportTest.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportRefTest.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/JsonImportTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/XmlImportTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/YamlImportTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/manual/AbstractManualResourceTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/AbstractRbacTest.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestAssignmentValidity.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/TestRbacLightInitialProjection.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacNoInbounds.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
A model/model-intest/src/test/resources/common/connector-dbtable.json
A model/model-intest/src/test/resources/common/connector-dbtable.yaml
A model/model-intest/src/test/resources/common/resource-dummy.json
A model/model-intest/src/test/resources/common/resource-dummy.yaml
A model/model-intest/src/test/resources/common/role-strong-sailor.xml
A model/model-intest/src/test/resources/common/user-herman.json
A model/model-intest/src/test/resources/common/user-herman.yaml
A model/model-intest/src/test/resources/importer/import-bad.json
A model/model-intest/src/test/resources/importer/import-bad.yaml
A model/model-intest/src/test/resources/importer/import-ref.json
M model/model-intest/src/test/resources/importer/import-ref.xml
A model/model-intest/src/test/resources/importer/import-ref.yaml
A model/model-intest/src/test/resources/importer/import-task.json
A model/model-intest/src/test/resources/importer/import-task.yaml
A model/model-intest/src/test/resources/importer/import-users-overwrite.json
A model/model-intest/src/test/resources/importer/import-users-overwrite.yaml
A model/model-intest/src/test/resources/importer/import-users.json
A model/model-intest/src/test/resources/importer/import-users.yaml
A model/model-intest/src/test/resources/importer/resource-derby.json
A model/model-intest/src/test/resources/importer/resource-derby.yaml
A model/model-intest/src/test/resources/importer/resource-dummy-changed.json
A model/model-intest/src/test/resources/importer/resource-dummy-changed.yaml
A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.json
A model/model-intest/src/test/resources/importer/resource-dummy-runtime-resolution.yaml
M model/model-intest/src/test/resources/logback-test.xml
M model/model-intest/src/test/resources/rbac/role-weak-singer.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/CustomTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/ProcessInstanceProvider.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/activiti/dao/WorkItemProvider.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ConfigurationExceptionHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
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/ResourceObjectConverter.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManagedConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/ConflictWatcher.java
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/EncodingTest.java
A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.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 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.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/TaskQuartzImpl.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/ExecutionManager.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/RemoteNodesManager.java
M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: a95ad5dc8f98037a726bc8d91286eb62899c4875
https://github.com/Evolveum/midpoint/commit/a95ad5dc8f98037a726bc8d91286eb62899c4875
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2017-08-22 (Tue, 22 Aug 2017)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
Log Message:
-----------
fixing assignable selector, fixing build
Compare: https://github.com/Evolveum/midpoint/compare/b3fe837bab02...a95ad5dc8f98
More information about the midPoint-svn
mailing list