[midPoint-git] [Evolveum/midpoint] 6700a8: Fix for focus iterations

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6700a8ada6eb7414cd2ec1b4b48200395cb6fbc7
      https://github.com/Evolveum/midpoint/commit/6700a8ada6eb7414cd2ec1b4b48200395cb6fbc7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.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
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fix for focus iterations


  Commit: 4c0a0f5802b2f5343108d8cbebc96cb2b9437a8e
      https://github.com/Evolveum/midpoint/commit/4c0a0f5802b2f5343108d8cbebc96cb2b9437a8e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/page-user-details.less
    M infra/util/src/main/java/com/evolveum/midpoint/util/JAXBUtil.java
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml

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


  Commit: 20422308598839a831ddc0d1d9d5f0f020c0d8a5
      https://github.com/Evolveum/midpoint/commit/20422308598839a831ddc0d1d9d5f0f020c0d8a5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java

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


  Commit: 6c8d0cddadcca41c591609ec77ed7bbc257c40de
      https://github.com/Evolveum/midpoint/commit/6c8d0cddadcca41c591609ec77ed7bbc257c40de
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjectorRoleEntitlement.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestSynchronizationService.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/sync/TestRecomputeTask.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Some delta fixes (+tests). Storing iteration and iterationToken in focus.


  Commit: 7df783ef49c5ccf3b1a0f0aea04d383a835101d5
      https://github.com/Evolveum/midpoint/commit/7df783ef49c5ccf3b1a0f0aea04d383a835101d5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    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/component/AssignablePopupContent.java

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


  Commit: 7fcbbb5836d4977070c002db08d527964a065d30
      https://github.com/Evolveum/midpoint/commit/7fcbbb5836d4977070c002db08d527964a065d30
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

  Log Message:
  -----------
  Fixing focus iteration reset on rename


Compare: https://github.com/Evolveum/midpoint/compare/fe41dddfff7a...7fcbbb5836d4