[midPoint-git] [Evolveum/midpoint] 8b1193: Forgotten change.

Pavol Mederly mederly at evolveum.com
Thu May 5 16:08:35 CEST 2016


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8b11938ba54dc5d255fc3b3da1e3bb746f8365eb
      https://github.com/Evolveum/midpoint/commit/8b11938ba54dc5d255fc3b3da1e3bb746f8365eb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  Forgotten change.


  Commit: 2ce64205688d176dedef7448f0ddf2e7be132ec6
      https://github.com/Evolveum/midpoint/commit/2ce64205688d176dedef7448f0ddf2e7be132ec6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M .travis.yml
    R README
    A README.md
    M config/sql/midpoint/3.4/h2/h2-upgrade-3.3-3.4.sql
    M config/sql/midpoint/3.4/mysql/mysql-upgrade-3.3-3.4.sql
    M config/sql/midpoint/3.4/oracle/oracle-upgrade-3.3-3.4.sql
    M config/sql/midpoint/3.4/postgresql/postgresql-upgrade-3.3-3.4.sql
    M config/sql/midpoint/3.4/sqlserver/sqlserver-upgrade-3.3-3.4.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/AssociationWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.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/component/prism/ObjectWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.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/search/SearchItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoicePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssociationValueChoicePanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et_EE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties
    M gui/admin-gui/src/main/webapp/less/midpoint-theme.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.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/negative/TestAssignmentErrors.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.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/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectDiscriminator.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDjTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDj.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDjDumber.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDjNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/object/resource-opendj-dumber.xml
    M provisioning/provisioning-impl/testng-integration.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M samples/evolveum/resource-openldap.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsDnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractAdLdapTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractEDirTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestEDirDeimos.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/story/pom.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: c1db5ffa40dece706fce62e234138c85ed4d7436
      https://github.com/Evolveum/midpoint/commit/c1db5ffa40dece706fce62e234138c85ed4d7436
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html

  Log Message:
  -----------
  Partly fixed layout for schema handling step. (Some problems remain.)


  Commit: b7ef5a5bbe9ecfcf54571fd383cbfbcffcc66500
      https://github.com/Evolveum/midpoint/commit/b7ef5a5bbe9ecfcf54571fd383cbfbcffcc66500
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/ResourceWizardPreviousButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

  Log Message:
  -----------
  RW: previous button saves the state. Fixed deletion of object type in schema handling.


  Commit: 880c4627b0a68ef0816b8493e6796bec3670b33e
      https://github.com/Evolveum/midpoint/commit/880c4627b0a68ef0816b8493e6796bec3670b33e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.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/web/component/message/FeedbackListView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
    M testing/rest/pom.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: 7a6c76ae916d5c9f9f1a0c68853f123d43819229
      https://github.com/Evolveum/midpoint/commit/7a6c76ae916d5c9f9f1a0c68853f123d43819229
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    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/ProfilingConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ProfilingConfigPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/util/src/main/resources/ctx-interceptor.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/system-init/src/main/resources/config.xml

  Log Message:
  -----------
  Profiling aspect presence is now configurable.


  Commit: 6c9c4fbc18181192d1efe7c1d545bb8260b82d9a
      https://github.com/Evolveum/midpoint/commit/6c9c4fbc18181192d1efe7c1d545bb8260b82d9a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M .travis.yml
    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/MultipleAssignmentSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceSummaryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/TestConnectionDialog.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/TestConnectionDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionResultPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/TestConnectionResultDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/AddFocusAction.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/ProvisioningTestUtil.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ProvisioningTestUtil.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestConnectorDiscovery.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestCsvFile.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/TestDBTable.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnore.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyCaseIgnoreUpcaseName.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyExtra.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyHacks.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyLegacy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNoActivation.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyPrioritiesAndReadReplace.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyReadReplaceForAll.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyResourceAndSchemaCaching.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySchemaless.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummySecurity.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuid.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/mock/SynchornizationServiceMock.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/AbstractOpenDjTest.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDj.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjDumber.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/ucf/TestUcfOpenDj.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDjTest.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnoreUpcaseName.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyHacks.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyLegacy.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNegative.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNoActivation.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyPrioritiesAndReadReplace.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyReadReplaceForAll.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyResourceAndSchemaCaching.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummySchemaless.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummySecurity.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuid.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDj.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDjDumber.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDjNegative.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/mock/SynchornizationServiceMock.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    R provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/common/resource-csv.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-derby.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-dummy.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-bad.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-dumber.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-initialized.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-create.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-delete.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-read.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj-no-update.xml
    A provisioning/provisioning-impl/src/test/resources/common/resource-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/impl/sync-task-example.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-csv.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-derby.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-dummy.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-bad.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-dumber.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-initialized.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-create.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-delete.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-read.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-update.xml
    R provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M provisioning/provisioning-impl/testng-integration.xml
    A samples/resources/scriptedrest/openstack/OpenStack-CreateScript.groovy
    A samples/resources/scriptedrest/openstack/OpenStack-DeleteScript.groovy
    A samples/resources/scriptedrest/openstack/OpenStack-SearchScript.groovy
    A samples/resources/scriptedrest/openstack/OpenStack-UpdateScript.groovy
    A samples/resources/scriptedrest/openstack/OpenStack-schema.groovy
    A samples/resources/scriptedrest/openstack/resource-openstack.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDjDumber.java
    A testing/conntest/src/test/resources/opendj-dumber/resource.xml
    A testing/conntest/src/test/resources/opendj-dumber/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/opendj-dumber/task-sync.xml
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/conntest/testng-integration.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gui/admin-gui/src/main/resources/localization/Midpoint.properties


Compare: https://github.com/Evolveum/midpoint/compare/c599b903788c...6c9c4fbc1818


More information about the midPoint-svn mailing list