[midPoint-git] [Evolveum/midpoint] 22780e: fix openstack resource sample
mederly
noreply at github.com
Wed Mar 13 16:49:14 CET 2019
Branch: refs/heads/feature/messaging-as-source
Home: https://github.com/Evolveum/midpoint
Commit: 22780e003df79132d9c549f811268fe272e255ed
https://github.com/Evolveum/midpoint/commit/22780e003df79132d9c549f811268fe272e255ed
Author: Kristof <kri.zub99 at gmail.com>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M samples/resources/openstack/resource-openstack-connector.xml
Log Message:
-----------
fix openstack resource sample
Commit: 1810c9770e45f11b8b26e5878c835aafbbb4894a
https://github.com/Evolveum/midpoint/commit/1810c9770e45f11b8b26e5878c835aafbbb4894a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
Log Message:
-----------
Bring order to event requestee/requester getters
Commit: 2edf29e3ca145db64d128e9438f346f46e25240e
https://github.com/Evolveum/midpoint/commit/2edf29e3ca145db64d128e9438f346f46e25240e
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-03-06 (Wed, 06 Mar 2019)
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/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.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/resources/ResourceContentResourcePanel.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/roles/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentInfoDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.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_en.properties
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedConstruction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
M model/model-intest/src/test/resources/common/user-will.xml
M model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M samples/resources/openstack/resource-openstack-connector.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
M testing/story/src/test/resources/delayed-enable/object-template-user.xml
M testing/story/src/test/resources/trafo/resource-dummy-ad.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: f42a0c700f381615e0b0a9dec31ebe1c126266e4
https://github.com/Evolveum/midpoint/commit/f42a0c700f381615e0b0a9dec31ebe1c126266e4
Author: kate <honchar at evolveum.com>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/MidPoint.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/modal/ConfirmationModal.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ViewResourcePage.java
Log Message:
-----------
increased waiting time for schrodinger gui tests
Commit: 9613b94743d622f60a2c8298f7f755a5d342f147
https://github.com/Evolveum/midpoint/commit/9613b94743d622f60a2c8298f7f755a5d342f147
Author: kate <honchar at evolveum.com>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.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/resources/ResourceContentResourcePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentInfoDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.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_en.properties
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedConstruction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
M model/model-intest/src/test/resources/common/user-will.xml
M model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
M samples/resources/openstack/resource-openstack-connector.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 69285589821b545934a09769c3fbee46644b81a4
https://github.com/Evolveum/midpoint/commit/69285589821b545934a09769c3fbee46644b81a4
Author: Kristof <kri.zub99 at gmail.com>
Date: 2019-03-06 (Wed, 06 Mar 2019)
Changed paths:
M samples/resources/openstack/resource-openstack-connector.xml
Log Message:
-----------
add associaton in openstack sample
Commit: bfed7b5f619efae8f57c542dbdbe58185c0a7b2a
https://github.com/Evolveum/midpoint/commit/bfed7b5f619efae8f57c542dbdbe58185c0a7b2a
Author: kate <honchar at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
Log Message:
-----------
npe fix
Commit: 91ec067ebd4aa3413f5926ef1b1a74dc39990012
https://github.com/Evolveum/midpoint/commit/91ec067ebd4aa3413f5926ef1b1a74dc39990012
Author: kate <honchar at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M samples/resources/openstack/resource-openstack-connector.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: d80fece2e5ca87cb7dc6d61d5a04a432d73d7572
https://github.com/Evolveum/midpoint/commit/d80fece2e5ca87cb7dc6d61d5a04a432d73d7572
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M build-system/pom.xml
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.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/manual/DummyItsmIntegrationConnectorInstance.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
M model/model-intest/src/test/resources/logback-test.xml
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConfiguredConnectorInstanceEntry.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/ResourceManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java
M provisioning/provisioning-impl/src/test/resources/logback-test.xml
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManagedConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
A provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
Log Message:
-----------
Reworked connector instance lifecycle management (MID-5068)
Commit: ec5d485f7cb2398bf4070fc42b49c8bfb2839bf3
https://github.com/Evolveum/midpoint/commit/ec5d485f7cb2398bf4070fc42b49c8bfb2839bf3
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
R 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/data/column/ColumnUtils.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.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/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.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/roles/AbstractRoleMemberPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentInfoDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsInfoDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.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_en.properties
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedConstruction.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/helpers/ExpressionHelper.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
M model/model-intest/src/test/resources/common/user-will.xml
M model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
M samples/resources/openstack/resource-openstack-connector.xml
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ObjectListArchetypeTests.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMapleLeaf.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccounts.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
M testing/story/src/test/resources/delayed-enable/object-template-user.xml
M testing/story/src/test/resources/trafo/resource-dummy-ad.xml
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/MidPoint.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/modal/ConfirmationModal.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersPageTable.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ViewResourcePage.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/user/UserPage.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 7cb47ad2a71def156d94e175b431ddae326aad77
https://github.com/Evolveum/midpoint/commit/7cb47ad2a71def156d94e175b431ddae326aad77
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLimitedResources.java
A testing/story/src/test/resources/limited-resources/resource-dummy-no-create.xml
Log Message:
-----------
Attempt to reproduce "unsupported" error criticality issue (MID-5129): cannot reproduce
Commit: 0ba73845bfc6c7363dc7509fe792e7fcb2bde524
https://github.com/Evolveum/midpoint/commit/0ba73845bfc6c7363dc7509fe792e7fcb2bde524
Author: kate <honchar at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
Log Message:
-----------
attempt to improve error displaying while account loading
Commit: 6654ad26b0622f65a8d1b5d756be56c674089617
https://github.com/Evolveum/midpoint/commit/6654ad26b0622f65a8d1b5d756be56c674089617
Author: kate <honchar at evolveum.com>
Date: 2019-03-07 (Thu, 07 Mar 2019)
Changed paths:
M build-system/pom.xml
M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.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/manual/DummyItsmIntegrationConnectorInstance.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
M model/model-intest/src/test/resources/logback-test.xml
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConfiguredConnectorInstanceEntry.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/ResourceManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java
M provisioning/provisioning-impl/src/test/resources/logback-test.xml
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManagedConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
A provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLimitedResources.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
A testing/story/src/test/resources/limited-resources/resource-dummy-no-create.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: da44cff7c243e7e9adb4cc2f13be523d057c708f
https://github.com/Evolveum/midpoint/commit/da44cff7c243e7e9adb4cc2f13be523d057c708f
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-08 (Fri, 08 Mar 2019)
Changed paths:
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLimitedResources.java
Log Message:
-----------
Improving connectorErrorCriticality test (MID-5129)
Commit: d34c81b0b60c81d22d95c0ea88c4533dc42ff287
https://github.com/Evolveum/midpoint/commit/d34c81b0b60c81d22d95c0ea88c4533dc42ff287
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-08 (Fri, 08 Mar 2019)
Changed paths:
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalOperationClasses.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
Log Message:
-----------
Optimizing prism clone (fixes TestPlentyOfAssignments)
Commit: a84b15dc45efa7d0c1e6594f746c18c5bc0116c0
https://github.com/Evolveum/midpoint/commit/a84b15dc45efa7d0c1e6594f746c18c5bc0116c0
Author: skublik <lskublik at evolveum.com>
Date: 2019-03-08 (Fri, 08 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
Log Message:
-----------
change jasper template because of prism API
Commit: b891dc328eb62d94207be378486a84e4dfa58c6a
https://github.com/Evolveum/midpoint/commit/b891dc328eb62d94207be378486a84e4dfa58c6a
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-08 (Fri, 08 Mar 2019)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
Log Message:
-----------
Fixing error handling in context loader in dependecies+delete case (also fixes TestScience)
Commit: a0a638a0dc4fe75c9824b327fd01100ed75d0d27
https://github.com/Evolveum/midpoint/commit/a0a638a0dc4fe75c9824b327fd01100ed75d0d27
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: 2019-03-11 (Mon, 11 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
Log Message:
-----------
minor fixes
Commit: 1b74520b111e290b87d663a235c6621cee9ee2c0
https://github.com/Evolveum/midpoint/commit/1b74520b111e290b87d663a235c6621cee9ee2c0
Author: Petr Gašparík <petr.gasparik at ami.cz>
Date: 2019-03-11 (Mon, 11 Mar 2019)
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_fr.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_lt.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/localization/schema_fr.properties
Log Message:
-----------
Translation, WIP
Commit: 4e6acc031a346ea3028ae5a52542e6ac4667f3f7
https://github.com/Evolveum/midpoint/commit/4e6acc031a346ea3028ae5a52542e6ac4667f3f7
Author: kate <honchar at evolveum.com>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectList.java
Log Message:
-----------
fix MID-5185 search parameters are inherited between pages
Commit: a5f04dc8df4d8087990937d2fc0908080c380342
https://github.com/Evolveum/midpoint/commit/a5f04dc8df4d8087990937d2fc0908080c380342
Author: kate <honchar at evolveum.com>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
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_fr.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_lt.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/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalOperationClasses.java
M infra/schema/src/main/resources/localization/schema_fr.properties
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLimitedResources.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: 5797dedd0c93671f8d9ab8419914adad46b90cdf
https://github.com/Evolveum/midpoint/commit/5797dedd0c93671f8d9ab8419914adad46b90cdf
Author: kate <honchar at evolveum.com>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
Log Message:
-----------
fix MID-5184 Resource wizard destroys connector reference
Commit: 90ebf0672dfc4916efdf20ff50dd9c778bd8bba3
https://github.com/Evolveum/midpoint/commit/90ebf0672dfc4916efdf20ff50dd9c778bd8bba3
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
Log Message:
-----------
Minor test cleanup
Commit: ed15ada6b0273e6b0a9c42eecae8a1058d73be1f
https://github.com/Evolveum/midpoint/commit/ed15ada6b0273e6b0a9c42eecae8a1058d73be1f
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: 2019-03-12 (Tue, 12 Mar 2019)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusConstraintsChecker.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
M model/model-intest/src/test/resources/iteration/user-template-iteration.xml
Log Message:
-----------
Fixing check for polystring norm in iteration (MID-5199)
Commit: 5780350db50ae22282a0c90cb3865b0d3d160fc2
https://github.com/Evolveum/midpoint/commit/5780350db50ae22282a0c90cb3865b0d3d160fc2
Author: kate <honchar at evolveum.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java
Log Message:
-----------
fix MID-5179 Lists users configured with collections throws "no icon class"
Commit: 4c36d23338ebc97507dccd6c21a86b65e75e9a2f
https://github.com/Evolveum/midpoint/commit/4c36d23338ebc97507dccd6c21a86b65e75e9a2f
Author: kate <honchar at evolveum.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusConstraintsChecker.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
M model/model-intest/src/test/resources/iteration/user-template-iteration.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: cfe343955a70cc9939a06ed222b7a777ca480338
https://github.com/Evolveum/midpoint/commit/cfe343955a70cc9939a06ed222b7a777ca480338
Author: Kristof <kri.zub99 at gmail.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
A samples/resources/openstack/mandatory-description.xml
A samples/resources/openstack/object-template-for-project.xml
M samples/resources/openstack/resource-openstack-connector.xml
Log Message:
-----------
openstack add new samples
Commit: 13a64cf495a21e348535216943e092d92f2fcec5
https://github.com/Evolveum/midpoint/commit/13a64cf495a21e348535216943e092d92f2fcec5
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventListener.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceEventListenerImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
Log Message:
-----------
Fix model-api/repo-api dependency problem
Commit: b628cce199fd9b17dd1e06d3333b2a4f34907b8b
https://github.com/Evolveum/midpoint/commit/b628cce199fd9b17dd1e06d3333b2a4f34907b8b
Author: kate <honchar at evolveum.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
Log Message:
-----------
MID-5169 Default ordering of views in menu
Commit: f8b53599204b8a7f7890db573bb2144c2bfa0d4c
https://github.com/Evolveum/midpoint/commit/f8b53599204b8a7f7890db573bb2144c2bfa0d4c
Author: kate <honchar at evolveum.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
Changed paths:
A samples/resources/openstack/mandatory-description.xml
A samples/resources/openstack/object-template-for-project.xml
M samples/resources/openstack/resource-openstack-connector.xml
Log Message:
-----------
Merge branch 'master' of https://github.com/Evolveum/midpoint
Commit: ab655fef73922204c4afff335eef3f285c38ec77
https://github.com/Evolveum/midpoint/commit/ab655fef73922204c4afff335eef3f285c38ec77
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-03-13 (Wed, 13 Mar 2019)
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/MultifunctionalButton.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/search/SearchFactory.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectList.java
M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
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_fr.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_lt.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 icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/AbstractDummyConnector.java
M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaRegistryImpl.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalCounters.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalOperationClasses.java
M infra/schema/src/main/resources/localization/schema_fr.properties
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusConstraintsChecker.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorDummyFake.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.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/manual/DummyItsmIntegrationConnectorInstance.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestBrokenResources.java
M model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
M model/model-intest/src/test/resources/iteration/user-template-iteration.xml
M model/model-intest/src/test/resources/logback-test.xml
A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConfiguredConnectorInstanceEntry.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/ResourceManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorManager.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java
M provisioning/provisioning-impl/src/test/resources/logback-test.xml
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManagedConnectorInstance.java
M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
A provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
A samples/resources/openstack/mandatory-description.xml
A samples/resources/openstack/object-template-for-project.xml
M samples/resources/openstack/resource-openstack-connector.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLimitedResources.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestPlentyOfAssignments.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
A testing/story/src/test/resources/limited-resources/resource-dummy-no-create.xml
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/MidPoint.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/modal/ConfirmationModal.java
M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ViewResourcePage.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature/messaging-as-source
# Conflicts:
# provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
Compare: https://github.com/Evolveum/midpoint/compare/aa5fbc89701c...ab655fef7392
More information about the midPoint-svn
mailing list