[midPoint-git] [Evolveum/midpoint] 7cdfe3: LexicalProcessor.readObjectsIteratively done.
Viliam Repan
vilo.repan at evolveum.com
Sun Aug 20 20:58:51 CEST 2017
Branch: refs/heads/feature/boot
Home: https://github.com/Evolveum/midpoint
Commit: 7cdfe305742591e3c72d79066cfbfae3f3bef8d7
https://github.com/Evolveum/midpoint/commit/7cdfe305742591e3c72d79066cfbfae3f3bef8d7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-15 (Tue, 15 Aug 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismParser.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/json/AbstractJsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismParserImpl.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
A infra/prism/src/test/resources/common/json/objects-1.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/yaml/objects-1.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/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjectsIteratively.java
M infra/schema/testng-unit.xml
Log Message:
-----------
LexicalProcessor.readObjectsIteratively done.
Commit: f3e58dd55a653b8584e025af52bf3f438360a293
https://github.com/Evolveum/midpoint/commit/f3e58dd55a653b8584e025af52bf3f438360a293
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-15 (Tue, 15 Aug 2017)
Changed paths:
M build-system/pom.xml
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/input/DataLanguagePanel.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/component/ImportOptionsPanel.html
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M infra/common/pom.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.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/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContextImpl.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.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
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
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/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
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/resources/common/json/objects-3-ns.json
M 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/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
M infra/prism/src/test/resources/common/yaml/objects-3-ns.yaml
M infra/prism/src/test/resources/common/yaml/objects-6-single.yaml
A infra/prism/src/test/resources/common/yaml/objects-7-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/util/ObjectTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
M 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/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.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/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.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
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/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/testng-integration.xml
Log Message:
-----------
MID-3639 (import in JSON/YAML) practically done.
- readObjectsIteratively available also for XML
- readObjects/readObjectsIteratively uses element name (c:objects) to check for single object / multi object case
- error handling in object importer implemented for JSON/YAML
- fixed item path serialization for JSON/YAML
Commit: 5e8238ee5cbfcd4fd13d61bb6c2281d0fe3a9f7a
https://github.com/Evolveum/midpoint/commit/5e8238ee5cbfcd4fd13d61bb6c2281d0fe3a9f7a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-15 (Tue, 15 Aug 2017)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
Log Message:
-----------
Fixed "summarize" options for JSON/YAML import.
Commit: c6e6d10df6a2d7f7eb1fbc0d0fa6cf05667a557c
https://github.com/Evolveum/midpoint/commit/c6e6d10df6a2d7f7eb1fbc0d0fa6cf05667a557c
Author: Petr Gašparík <petr at gasparik.cz>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
Log Message:
-----------
Translation, WIP
Commit: 7ec4854d87d255c481489aee208491e9331e8785
https://github.com/Evolveum/midpoint/commit/7ec4854d87d255c481489aee208491e9331e8785
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DataLanguagePanel.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/lex/LexicalProcessor.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/NullLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/yaml/MidpointYAMLGenerator.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismSerializerImpl.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
M 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-9-list-single.json
M 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-8-multi-document.yaml
A infra/prism/src/test/resources/common/yaml/objects-9-list-single.yaml
M infra/schema/src/test/java/com/evolveum/midpoint/schema/parser/TestParseObjects.java
M model/model-intest/src/test/resources/importer/import-bad.yaml
M model/model-intest/src/test/resources/importer/import-ref.yaml
Log Message:
-----------
Support for multi-document YAML files and for "list of objects" format for JSON and YAML.
Commit: 2227756947e32d564a25e4a571bff1434324cbf2
https://github.com/Evolveum/midpoint/commit/2227756947e32d564a25e4a571bff1434324cbf2
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
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/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
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/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-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
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/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
A model/model-intest/src/test/resources/common/role-strong-sailor.xml
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
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
# Conflicts:
# gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
Commit: 83ff8252a7c224e9521ce1ee6be5047a9e0d4ed7
https://github.com/Evolveum/midpoint/commit/83ff8252a7c224e9521ce1ee6be5047a9e0d4ed7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
Log Message:
-----------
Simple test for MID-4112
Commit: 406fe7324be9b80d55d9daa76eab4497a99f52f9
https://github.com/Evolveum/midpoint/commit/406fe7324be9b80d55d9daa76eab4497a99f52f9
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
Changed definition of preferredLanguage and locale properties to match the reality.
Commit: 4a551725c92846ab762aabfccda5eff9b7e0f8f8
https://github.com/Evolveum/midpoint/commit/4a551725c92846ab762aabfccda5eff9b7e0f8f8
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2017-08-16 (Wed, 16 Aug 2017)
Changed paths:
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 40007d0aac5b133b1de5eb84f2c1d5f0239e6096
https://github.com/Evolveum/midpoint/commit/40007d0aac5b133b1de5eb84f2c1d5f0239e6096
Author: Petr Gašparík <petr at gasparik.cz>
Date: 2017-08-17 (Thu, 17 Aug 2017)
Changed paths:
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_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
Log Message:
-----------
Translation update.
Thanks to all that contributed on Transifex:
AivoK (et), ardanu (tr), atuc2 (fi), Christian.Huber (de), claudio.victorero (fi), petr.gasparik (cs), wstaszewski (pl)
Commit: 04e5c6ac7b6c4a2d1922111ac58d3db901a9e7fe
https://github.com/Evolveum/midpoint/commit/04e5c6ac7b6c4a2d1922111ac58d3db901a9e7fe
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-17 (Thu, 17 Aug 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
Log Message:
-----------
Fixed MID-4120: NPE when authorization contains substring filter
Commit: c86a3e8e64c01888cad260e5247325c97e456c3f
https://github.com/Evolveum/midpoint/commit/c86a3e8e64c01888cad260e5247325c97e456c3f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-17 (Thu, 17 Aug 2017)
Changed paths:
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_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_zh_CN.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 20c030222a9fc2420dcb7d0f61379df2c84c252a
https://github.com/Evolveum/midpoint/commit/20c030222a9fc2420dcb7d0f61379df2c84c252a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-18 (Fri, 18 Aug 2017)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_MaybeDelete.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.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/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-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/DelayingProgressListener.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRaceConditions.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.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/sync/AbstractSynchronizationStoryTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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
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
Log Message:
-----------
MID-4112: Resolution of conflicts arising during clockwork processing
Commit: 4927ad4439377cb5a0f1c58a4b72b5393e51ba05
https://github.com/Evolveum/midpoint/commit/4927ad4439377cb5a0f1c58a4b72b5393e51ba05
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-18 (Fri, 18 Aug 2017)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/DefaultGuiProgressListener.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ProgressInformation.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.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/ObjectUpdater.java
Log Message:
-----------
MID-4112: Fixing midpoint startup failure, fixing progress reporting, adjusting default retry parameters
Commit: 571efa77c886983313fa85424018671781600bd7
https://github.com/Evolveum/midpoint/commit/571efa77c886983313fa85424018671781600bd7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-18 (Fri, 18 Aug 2017)
Changed paths:
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/ConflictWatcherImpl.java
Log Message:
-----------
Some tests for conflict watchers.
Commit: 64bac9ad878970d885dcadf0998396ecf8c24d36
https://github.com/Evolveum/midpoint/commit/64bac9ad878970d885dcadf0998396ecf8c24d36
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2017-08-18 (Fri, 18 Aug 2017)
Changed paths:
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/page/admin/configuration/PageSystemConfiguration.java
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/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/resources/localization/Midpoint.properties
Log Message:
-----------
MID-4112: adapting object template GUI to keep conflict resolution info untouched
Commit: c643930c7ab2f26cf0534b5e802673175f612877
https://github.com/Evolveum/midpoint/commit/c643930c7ab2f26cf0534b5e802673175f612877
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-08-20 (Sun, 20 Aug 2017)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/pom.xml
R gui/admin-gui/src/main/resources/application.yml
M repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java
Log Message:
-----------
updated dependencies, cleanup
Commit: 97bdc6849767924faff4fe516e0b61d218b26a2c
https://github.com/Evolveum/midpoint/commit/97bdc6849767924faff4fe516e0b61d218b26a2c
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2017-08-20 (Sun, 20 Aug 2017)
Changed paths:
M build-system/pom.xml
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/ObjectPolicyConfigurationEditor.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/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/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/users/DefaultGuiProgressListener.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 infra/common/pom.xml
M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.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/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/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/util/ObjectTypeUtil.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/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/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/script/xpath/XPathExpressionCodeHolder.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/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/ObjectImporter.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-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
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/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/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/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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
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
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/boot
Compare: https://github.com/Evolveum/midpoint/compare/497ac3367a37...97bdc6849767
More information about the midPoint-svn
mailing list