[midPoint-git] [Evolveum/midpoint] aa4f6c: TestLdapUniversity

Pavol Mederly mederly at evolveum.com
Tue Nov 25 22:58:02 CET 2014 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: aa4f6c37c4544ab38f0488ae2fe201f091fcba30
      https://github.com/Evolveum/midpoint/commit/aa4f6c37c4544ab38f0488ae2fe201f091fcba30
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    A testing/longtest/src/test/resources/common/resource-opendj-university.xml
    A testing/longtest/src/test/resources/schema/university.xsd

  Log Message:
  -----------
  TestLdapUniversity
(cherry picked from commit 005082a)


  Commit: 00d8563092ba132ee170d8c5823031986995f1da
      https://github.com/Evolveum/midpoint/commit/00d8563092ba132ee170d8c5823031986995f1da
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M testing/longtest/pom.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapComplex.java
    A testing/longtest/src/test/resources/common/resource-opendj-complex.xml
    M testing/longtest/src/test/resources/common/system-configuration.xml
    M testing/longtest/src/test/resources/ctx-longtest-test-main.xml
    A testing/longtest/src/test/resources/ldap-complex/role-captain.xml
    A testing/longtest/src/test/resources/ldap-complex/role-judge.xml
    A testing/longtest/src/test/resources/ldap-complex/role-pirate.xml
    A testing/longtest/src/test/resources/ldap-complex/role-sailor.xml
    A testing/longtest/src/test/resources/ldap-complex/roles.ldif
    A testing/longtest/src/test/resources/ldap-complex/user-template.xml
    M testing/longtest/src/test/resources/logging.properties
    M testing/longtest/src/test/resources/schema/piracy.xsd

  Log Message:
  -----------
  LdapTestComplex
(cherry picked from commit 396e485)


  Commit: 47e8317919b34c92b645dd77075b49187e450660
      https://github.com/Evolveum/midpoint/commit/47e8317919b34c92b645dd77075b49187e450660
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.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/ShadowCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlPerformanceMonitor.java
    M testing/longtest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Miscellaneous perf-related changes.


  Commit: ef105cf83d3a3c1c5775145d5745230446c427f5
      https://github.com/Evolveum/midpoint/commit/ef105cf83d3a3c1c5775145d5745230446c427f5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    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/sync/ReconciliationTaskHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
    M testing/longtest/src/test/resources/ctx-longtest-test-main.xml

  Log Message:
  -----------
  MID-2102 Fixed iterator problem (preliminarily).
Fixed memleak in some long-running tests.
Reverting some mistakes that creeped in recently.


  Commit: cfa4fb7fb0b17b5290f7fcae173831c75122b69c
      https://github.com/Evolveum/midpoint/commit/cfa4fb7fb0b17b5290f7fcae173831c75122b69c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectPaging.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-common/src/test/resources/expression/functions/resource-opendj.xml
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/resources/common/connector-ldap.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml
    M model/model-intest/src/test/resources/negative/resource-csvfile-broken.xml
    M model/model-intest/src/test/resources/negative/resource-csvfile-notfound.xml
    M model/model-test/pom.xml
    M pom.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/pom.xml
    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/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.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/TestCsvFile.java
    M provisioning/provisioning-impl/src/test/resources/logback-test.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-csv.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-bad.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-initialized.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-create.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-delete.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-read.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-update.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java
    M samples/demo-generic synchronization/resource-GenSync-CSV.xml
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/demo-rs/resource-csv-source.xml
    M samples/demo-rs/resource-csv-target.xml
    M samples/demo-rs/resource-csv-xxx.xml
    M samples/demo-rs/resource-ldap-opendj.xml
    M samples/demo-rs/resource-ldap-openldap.xml
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/resources/csvfile/HR-csvfile-resource.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-multi-nosync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-2.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-3.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-4.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-5.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    M samples/resources/csvfile/localhost-csvfile-resource-import.xml
    M samples/resources/csvfile/localhost-csvfile-resource-simple-remote.xml
    M samples/resources/csvfile/localhost-csvfile-resource-simple.xml
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/edirectory/resource-ldap-edirectory.xml
    M samples/resources/opendj/opendj-localhost-basic.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/opendj/opendj-resource-genericsync.xml
    M samples/resources/openldap/openldap-localhost-medium.xml
    M samples/resources/zimbra/ldap-zimbra.xml
    M samples/rest/opendj-resource-sync.xml
    M samples/samples-test/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/common/resource-opendj-vlv.xml
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/rest/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/pom.xml
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/story/src/test/resources/orgsync/resource-opendj.xml
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    M testing/story/src/test/resources/uuid/resource-opendj.xml
    M testing/story/src/test/resources/village/resource-opendj.xml

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

Conflicts:
	provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
	provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java


  Commit: 680fa81f6961322c7d8dd75c489eddca6a5de3a5
      https://github.com/Evolveum/midpoint/commit/680fa81f6961322c7d8dd75c489eddca6a5de3a5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M model/model-intest/src/test/resources/negative/resource-csvfile-broken.xml
    M model/model-intest/src/test/resources/negative/resource-csvfile-notfound.xml

  Log Message:
  -----------
  Fixing connector info in model-intest


Compare: https://github.com/Evolveum/midpoint/compare/d5f9f1a0d468...680fa81f6961

More information about the midPoint-svn mailing list