[midPoint-git] [Evolveum/midpoint] 6745c4: new selenium tests are added

honchar honchar at evolveum.com
Thu Aug 13 00:12:54 CEST 2015


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6745c4565b0b27d82ef07df6a4693bbbc79aa790
      https://github.com/Evolveum/midpoint/commit/6745c4565b0b27d82ef07df6a4693bbbc79aa790
  Author: KaterynaHonchar <gonchar.kate at gmail.com>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

  Changed paths:
    M testing/selenium-tests/pom.xml
    M testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/BaseTest.java
    A testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/account/AddAccountTest.java
    A testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/resource/AddResourceTest.java
    M testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/user/CreateUserTest.java
    M testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/user/DeleteUserTest.java
    M testing/selenium-tests/testng.xml

  Log Message:
  -----------
  new selenium tests are added


  Commit: 62aceff68ef4b9d29cdc37a91017964844cdf36f
      https://github.com/Evolveum/midpoint/commit/62aceff68ef4b9d29cdc37a91017964844cdf36f
  Author: KaterynaHonchar <gonchar.kate at gmail.com>
  Date:   2015-07-13 (Mon, 13 Jul 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.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/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/SystemConfigurationHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SystemConfigurationTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/resources/object-template/wrong-template.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.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/lens/Clockwork.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/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMappingInbound.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/TestVolatility.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    A model/model-intest/src/test/resources/volatility/resource-dummy-hr.xml
    A model/model-intest/src/test/resources/volatility/resource-dummy-volatile.xml
    A model/model-intest/src/test/resources/volatility/task-dummy-hr-livesync.xml
    A model/model-intest/src/test/resources/volatility/user-largo-with-assignment.xml
    A model/model-intest/src/test/resources/volatility/user-template-import-hr.xml
    M model/model-intest/testng.xml
    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/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/api/Change.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/IcfConvertor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.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/demo/hr.xml
    M samples/model-client-sample/pom.xml
    R samples/model-client-sample/src/test/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    R samples/model-client-sample/src/test/com/evolveum/midpoint/testing/model/client/sample/TestExchangeConnectorLow.java
    A samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/AbstractTestForExchangeConnector.java
    A samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/TestExchangeAlreadyExistsHandling.java
    A samples/model-client-sample/src/test/java/com/evolveum/midpoint/testing/model/client/sample/TestExchangeConnectorLow.java
    M samples/resources/scriptedsql/SearchScript.groovy
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/resources/common/system-configuration.xml
    M testing/conntest/src/test/resources/openldap/resource.xml

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


  Commit: 619822c7bac1e74c44dfb906dd061e4fcfa897cf
      https://github.com/Evolveum/midpoint/commit/619822c7bac1e74c44dfb906dd061e4fcfa897cf
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-07-22 (Wed, 22 Jul 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AllFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LogicalFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NoneFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/MakeLDIF/cities
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/MakeLDIF/example.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/MakeLDIF/first.names
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/MakeLDIF/last.names
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/MakeLDIF/states
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/MakeLDIF/streets
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/admin-backend.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/admin-backend.ldif.old
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/admin-keystore
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/admin-keystore.pin
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/admin-truststore
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/ads-truststore
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/ads-truststore.pin
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180837Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180838Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-2.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-3.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-4.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-5.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-6.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-7.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-8.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z-9.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306180847Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306181208Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306181505Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306181507Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/archived-configs/config-20150306181728Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/buildinfo
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/config.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/config.ldif.startok
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/http-config.json
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/java.properties
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-disabled.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-enabled.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-expired.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-idle-locked.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-permanently-locked.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-reset-locked.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-temporarily-locked.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/account-unlocked.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/password-changed.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/password-expired.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/password-expiring.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/messages/password-reset.template
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/00-core.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/01-pwpolicy.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/02-config.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-changelog.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-pwpolicyextension.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-rfc2713.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-rfc2714.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-rfc2739.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-rfc2926.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-rfc3112.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-rfc3712.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/03-uddiv3.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/04-rfc2307bis.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/05-rfc4876.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/05-samba.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/05-solaris.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/06-compat.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/schema/99-user.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/tasks.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/tasks.ldif.save
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/tools.properties
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/upgrade/schema.ldif.-1
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/upgrade/schema.ldif.current
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/config/wordlist.txt
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/db/userRoot/00000000.jdb
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/db/userRoot/je.config.csv
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/db/userRoot/je.info.0
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/db/userRoot/je.lck
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/db/userRoot/je.stat.csv
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-adminRoot.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-ads-truststore.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-backup.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-monitor.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-replicationChanges.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-schema.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-tasks.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/backend-userRoot.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/locks/server.lock
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/logs/access
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/logs/errors
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/logs/replication
    A infra/test-util/src/main/resources/test-data/opendj.template.ri/logs/server.out
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.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/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportReconDeprecated.java
    M model/model-intest/src/test/resources/security/role-conditional.xml
    A model/model-intest/src/test/resources/security/role-meta-nonsense.xml
    A model/model-intest/src/test/resources/sync/task-delete-dummy-accounts.xml
    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/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    A samples/resources/openldap/openldap-localhost-advanced-sync-modifytimestamp.xml
    M samples/resources/openldap/openldap-localhost-medium.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/Test389DsLocalhost.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/resources/389ds/resource-localhost.xml
    A testing/conntest/src/test/resources/389ds/task-sync-inetorgperson.xml
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/resources/logback-test.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUniversity.java
    A testing/story/src/test/resources/university/object-template-org.xml
    A testing/story/src/test/resources/university/org-top.xml
    A testing/story/src/test/resources/university/resource-dummy-hr.xml
    A testing/story/src/test/resources/university/resource-opendj.xml
    A testing/story/src/test/resources/university/role-meta-org.xml
    A testing/story/src/test/resources/university/task-dummy-hr-livesync.xml
    M testing/story/testng.xml
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
    M testing/wstest/src/test/resources/common/resource-opendj.xml

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


  Commit: fb50ce9d869ef2fa99d0fb97badad5371f133e30
      https://github.com/Evolveum/midpoint/commit/fb50ce9d869ef2fa99d0fb97badad5371f133e30
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-08-01 (Sat, 01 Aug 2015)

  Changed paths:
    M config/initial-objects/090-report-audit.xml
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/PageAdmin_en_US.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    A infra/test-util/src/main/resources/test-data/ldif/entries4000-389ds.ldif
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.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/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    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/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.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/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.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/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMappingInbound.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/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.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/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/entitlements/role-swashbuckler.xml
    M model/model-intest/src/test/resources/iteration/resource-dummy-pink.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/mapping-inbound/resource-dummy-tea-green.xml
    A model/model-intest/src/test/resources/preview/resource-dummy-yellow.xml
    A model/model-intest/src/test/resources/preview/user-rogers.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    A repo/repo-sql-impl-test/src/test/resources/basic/t002a.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/t002b.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsBacchus.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    A testing/conntest/src/test/resources/389ds/resource-bacchus.xml
    M testing/conntest/testng.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    M testing/story/src/test/resources/university/resource-opendj.xml
    M testing/story/src/test/resources/university/role-meta-org.xml
    M testing/story/src/test/resources/uuid/resource-opendj.xml

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


  Commit: c211969dcf9f06b7b5ea80c383dc78ed242cce8c
      https://github.com/Evolveum/midpoint/commit/c211969dcf9f06b7b5ea80c383dc78ed242cce8c
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-08-02 (Sun, 02 Aug 2015)

  Changed paths:
    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/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java

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


  Commit: caa2f928aa82c160880519654650c5f4fa04b35d
      https://github.com/Evolveum/midpoint/commit/caa2f928aa82c160880519654650c5f4fa04b35d
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DownloadButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DownloadButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DownloadButtonPanel.properties
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.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/util/UcfUtil.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/consistency-mechanism/.gitignore
    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: 5039ba8af821336865eff9f8afa7d1f067d37444
      https://github.com/Evolveum/midpoint/commit/5039ba8af821336865eff9f8afa7d1f067d37444
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-08-03 (Mon, 03 Aug 2015)

  Changed paths:
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_en_US.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java
    A infra/common/src/test/resources/policy/password-policy-tri.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java

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


  Commit: 809d2b2e478f93e1990de779ffeadc7638372519
      https://github.com/Evolveum/midpoint/commit/809d2b2e478f93e1990de779ffeadc7638372519
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-08-04 (Tue, 04 Aug 2015)

  Changed paths:
    M config/sql/_all/h2-3.2-all.sql
    M config/sql/_all/mysql-3.2-all.sql
    M config/sql/_all/oracle-3.2-all.sql
    M config/sql/_all/postgresql-3.2-all.sql
    M config/sql/_all/sqlserver-3.2-all.sql
    M config/sql/midpoint/3.2/h2/h2-3.2.sql
    M config/sql/midpoint/3.2/mysql/mysql-3.2.sql
    M config/sql/midpoint/3.2/oracle/oracle-3.2.sql
    M config/sql/midpoint/3.2/postgresql/postgresql-3.2.sql
    M config/sql/midpoint/3.2/sqlserver/sqlserver-3.2.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/LogfileTestTailer.java
    M infra/test-util/src/main/resources/test-data/ldif/example-4000.ldif
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/00000000.jdb
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.config.csv
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.info.0
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.stat.csv
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/ProvisioningTestUtil.java
    M 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/TestOpenDJ.java
    M 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
    R provisioning/provisioning-impl/src/test/resources/impl/account-change-password.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/account-change-password.xml
    A samples/resources/ad/ad-resource-groups-medusa-advanced.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
    M testing/conntest/src/test/resources/389ds/resource-bacchus.xml
    M testing/conntest/src/test/resources/389ds/resource-localhost.xml
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/conntest/src/test/resources/openldap/resource.xml
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSanity.java
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSecurity.java

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


  Commit: 983a22f6d1d006afff026095601d85558b6f8dcd
      https://github.com/Evolveum/midpoint/commit/983a22f6d1d006afff026095601d85558b6f8dcd
  Author: unknown <honchar.kateryna at evolveum.com>
  Date:   2015-08-05 (Wed, 05 Aug 2015)

  Changed paths:
    M NEWS
    M README
    M RELEASE-NOTES
    M build-system/pom.xml
    M config/initial-objects/040-role-enduser.xml
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    A samples/resources/opendj/opendj-legacy-connector.xml
    M samples/roles/authorization-roles.xml

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


  Commit: cdb9831f68b884fc26589513dfd82555f673546f
      https://github.com/Evolveum/midpoint/commit/cdb9831f68b884fc26589513dfd82555f673546f
  Author: honchar <honchar at evolveum.com>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    A testing/selenidetest/pom.xml
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/BaseTest.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/LoginTest.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/account/CreateAccountTest.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/resource/CheckResourceConnectionTest.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/resource/ImportResourceTest.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/resource/ResourceUtil.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/user/CreateUserTest.java
    A testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/user/UserUtil.java
    A testing/selenidetest/src/test/resources/logback-test.xml
    A testing/selenidetest/src/test/resources/spring-module.xml
    A testing/selenidetest/testng.xml
    R testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/BaseTest.java
    R testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/LoginTest.java
    R testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/account/AddAccountTest.java
    R testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/resource/AddResourceTest.java
    R testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/user/CreateUserTest.java
    R testing/selenium-tests/src/test/java/com/evolveum/midpoint/testing/selenium/tests/user/DeleteUserTest.java

  Log Message:
  -----------
  Created selenidetest module for automation tests, added some tests
PageResource.html and PageResource.java: changed the id of the element from basichSearch to basicSearch


  Commit: 56faf492b4270f3e4247a76859323b155c7b4bf9
      https://github.com/Evolveum/midpoint/commit/56faf492b4270f3e4247a76859323b155c7b4bf9
  Author: honchar <honchar at evolveum.com>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M .gitignore
    M build-system/pom.xml
    M cli/common/pom.xml
    M cli/ninja/pom.xml
    M cli/pom.xml
    M cli/seppuku/pom.xml
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui-sk-SK/pom.xml
    M gui/admin-gui-tr-TR/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/TopMenuBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    R gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ActivationUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M infra/test-util/pom.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M infra/util/pom.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/ws-util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/TaskService.java
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestExpressionFunctions.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-intest/pom.xml
    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/TestMultiConnector.java
    M model/model-intest/testng.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-ds-impl/pom.xml
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/DataSourceReport.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    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/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/ProvisioningTestUtil.java
    M 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/TestConnectorDiscovery.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNoActivation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    A provisioning/provisioning-impl/src/test/resources/dot.jpg
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    M repo/audit-api/pom.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/CleanupTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M repo/task-quartz-impl/testng.xml
    M samples/model-client-sample/pom.xml
    M samples/pom.xml
    A samples/resources/edirectory/resource-ldap-edirectory-legacy.xml
    R samples/resources/edirectory/resource-ldap-edirectory.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Abstract389DsTest.java
    A 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
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestEDirAthena.java
    A testing/conntest/src/test/resources/edir/resource-athena.xml
    A testing/conntest/src/test/resources/truststore.jks
    M testing/conntest/testng.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/minipoint/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/sanity/pom.xml
    M testing/selenium-tests/pom.xml
    M testing/story/pom.xml
    M testing/wstest/pom.xml
    M tools/gui-i18n/pom.xml
    M tools/pom.xml
    M tools/repo-ninja/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AlphabeticalMethodInterceptor.java
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/4c81ec307f4c...56faf492b427


More information about the midPoint-svn mailing list