[midPoint-git] [Evolveum/midpoint] c64965: Making TestRepositoryPerformance.test100TreeImport...

[Viliam Repan]

  Branch: refs/heads/repository
  Home:   https://github.com/Evolveum/midpoint
  Commit: c64965ff41d01914257044bc696ebcd8035c5df9
      https://github.com/Evolveum/midpoint/commit/c64965ff41d01914257044bc696ebcd8035c5df9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    A testing/longtest/src/test/resources/common/object-template-org.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Making TestRepositoryPerformance.test100TreeImport work. Some logging improvements.


  Commit: 93ea14fe87fc9ac03d9298e70c7b8f25b40f1441
      https://github.com/Evolveum/midpoint/commit/93ea14fe87fc9ac03d9298e70c7b8f25b40f1441
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    A testing/longtest/src/test/resources/schema/orgsync.xsd

  Log Message:
  -----------
  Forgotten file.


  Commit: 24a4d133685e93b0031476adaab7d1289e2a8d1c
      https://github.com/Evolveum/midpoint/commit/24a4d133685e93b0031476adaab7d1289e2a8d1c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Attept to do more work on security - needs to be postponed until the parser branch is merged.


  Commit: ddb21bf2ff1976bb9a76a42a8a4c632ff2554b86
      https://github.com/Evolveum/midpoint/commit/ddb21bf2ff1976bb9a76a42a8a4c632ff2554b86
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java

  Log Message:
  -----------
  MID-1791 - fixed incorrent handling of parent org unit addition to created Org Unit.


  Commit: 9c395cbff7fd2b8b6dcd206e2e578e508d4e8784
      https://github.com/Evolveum/midpoint/commit/9c395cbff7fd2b8b6dcd206e2e578e508d4e8784
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java

  Log Message:
  -----------
  MID-1789 fix - user is now able to delete parent org units in org unit editor.


  Commit: 72cf98994e9bff7ba426d07f36a8f6f4bc94d072
      https://github.com/Evolveum/midpoint/commit/72cf98994e9bff7ba426d07f36a8f6f4bc94d072
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java

  Log Message:
  -----------
  MID-1756 - one more small fix.


  Commit: 3f68bd36e25462e314721c87543d607ac6bc8bd3
      https://github.com/Evolveum/midpoint/commit/3f68bd36e25462e314721c87543d607ac6bc8bd3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    A testing/longtest/src/test/resources/common/object-template-org.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/logback-test.xml
    A testing/longtest/src/test/resources/schema/orgsync.xsd

  Log Message:
  -----------
  Merge branch 'master' into repository

Conflicts:
	testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java


  Commit: 0b0e7589f0dd932207723966f3e6518f8a1bc4ac
      https://github.com/Evolveum/midpoint/commit/0b0e7589f0dd932207723966f3e6518f8a1bc4ac
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    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/t004.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml

  Log Message:
  -----------
  created failing test for parentOrgRefs, disabled for now. repository operation fails, but should fail differently (or fix it properly).


  Commit: df639649f3f6fb8e89357fffa1e3e1872026ad75
      https://github.com/Evolveum/midpoint/commit/df639649f3f6fb8e89357fffa1e3e1872026ad75
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java

  Log Message:
  -----------
  compile fix for longtests


Compare: https://github.com/Evolveum/midpoint/compare/eb9ea70464c5...df639649f3f6