[midPoint-git] [Evolveum/midpoint] 3c547e: Focal iteration support (MID-1771) work in progres...

Viliam Repan vilo.repan at evolveum.com
Fri Mar 28 14:29:50 CET 2014


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

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java

  Log Message:
  -----------
  Focal iteration support (MID-1771) work in progress


  Commit: 4f0d5636a42aa00c7b576de4313fc0ab98daf9f5
      https://github.com/Evolveum/midpoint/commit/4f0d5636a42aa00c7b576de4313fc0ab98daf9f5
  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/configuration/component/ChooseTypeDialog.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/roles/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties

  Log Message:
  -----------
  MID-1772 - fixed + some minor code cleanup based on Notes from Vilo.


  Commit: 267dfad63fcdeab12cae7ca89f01d594ab5a9b94
      https://github.com/Evolveum/midpoint/commit/267dfad63fcdeab12cae7ca89f01d594ab5a9b94
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-27 (Thu, 27 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
    A model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
    A model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Focus iteration tests (still work in progress)


  Commit: b2db4706f335f1c68b679246f49baff9ac187324
      https://github.com/Evolveum/midpoint/commit/b2db4706f335f1c68b679246f49baff9ac187324
  Author: Radovan Semancik <radovan.semancik 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/configuration/component/ChooseTypeDialog.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/roles/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java

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


  Commit: 428f21726597bb8c7ca68a4fd27f78cf9222f99b
      https://github.com/Evolveum/midpoint/commit/428f21726597bb8c7ca68a4fd27f78cf9222f99b
  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/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java

  Log Message:
  -----------
  added iterator to repo impl


  Commit: a704c2b591a741428e94fe0a3f74b0004aceab86
      https://github.com/Evolveum/midpoint/commit/a704c2b591a741428e94fe0a3f74b0004aceab86
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.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

  Log Message:
  -----------
  Focal iteration seems to work (MID-1771)


  Commit: 355ecd4b367eb73d3c9593de7d16af7f166f75d4
      https://github.com/Evolveum/midpoint/commit/355ecd4b367eb73d3c9593de7d16af7f166f75d4
  Author: garbika <garbika at evolveum.com>
  Date:   2014-03-27 (Thu, 27 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

  Log Message:
  -----------
  new iteration attribut in object template


  Commit: 85878800c9cf63e1df7cd59d84164cec8d46857d
      https://github.com/Evolveum/midpoint/commit/85878800c9cf63e1df7cd59d84164cec8d46857d
  Author: garbika <garbika at evolveum.com>
  Date:   2014-03-28 (Fri, 28 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

  Log Message:
  -----------
  upgrade databases scripts - new attribut iteration in table m_object_template


  Commit: 4ed5eef218bd3861f66a7307f18752cca34e1d42
      https://github.com/Evolveum/midpoint/commit/4ed5eef218bd3861f66a7307f18752cca34e1d42
  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-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java

  Log Message:
  -----------
  Fixing the iteration-related issues of "null name".


  Commit: 5794d9c42598e814d588e1a8ff2add9f5710c35f
      https://github.com/Evolveum/midpoint/commit/5794d9c42598e814d588e1a8ff2add9f5710c35f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java

  Log Message:
  -----------
  Work in progress


  Commit: 9e8caec74db4eafcddfae35dc95f71052820e3b1
      https://github.com/Evolveum/midpoint/commit/9e8caec74db4eafcddfae35dc95f71052820e3b1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

  Log Message:
  -----------
  Work in progress on recompte test + some schema tests


  Commit: 2c42d3866c09dca9f9299556e077a4aaf8c4e2ff
      https://github.com/Evolveum/midpoint/commit/2c42d3866c09dca9f9299556e077a4aaf8c4e2ff
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 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 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

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


  Commit: 32a718c01417883be45376a26e8d8a371ffdec05
      https://github.com/Evolveum/midpoint/commit/32a718c01417883be45376a26e8d8a371ffdec05
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

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

  Log Message:
  -----------
  Compilation fix. Sorry.


  Commit: c3204aa4c74f069a2bb80ae038d78d62e87abb1a
      https://github.com/Evolveum/midpoint/commit/c3204aa4c74f069a2bb80ae038d78d62e87abb1a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M model/workflow-impl/pom.xml

  Log Message:
  -----------
  Fixed repo-test-util dependency in workflow-impl.


  Commit: 4ad1df9eb787ebee0f1ba4cf5920d29ac31797bb
      https://github.com/Evolveum/midpoint/commit/4ad1df9eb787ebee0f1ba4cf5920d29ac31797bb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

  Log Message:
  -----------
  Added givenName change operation in model-client-sample.


  Commit: 084543c7a9950b3764ec0b6787e2f0402c1dd239
      https://github.com/Evolveum/midpoint/commit/084543c7a9950b3764ec0b6787e2f0402c1dd239
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    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/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

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


  Commit: b645e45d7192b3dfd58e489d43b5ef8fa56b2e06
      https://github.com/Evolveum/midpoint/commit/b645e45d7192b3dfd58e489d43b5ef8fa56b2e06
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd

  Log Message:
  -----------
  Iteration and iterationToken in FocusType


  Commit: 70a7d06e3c1b9d53fbd8284008ac694a15a2be7c
      https://github.com/Evolveum/midpoint/commit/70a7d06e3c1b9d53fbd8284008ac694a15a2be7c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M infra/schema/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

  Log Message:
  -----------
  TestRecomputeTask and delta tests - disabled, work in progress


  Commit: a850546a713a941aaa00be3fd8471e0f797e33a2
      https://github.com/Evolveum/midpoint/commit/a850546a713a941aaa00be3fd8471e0f797e33a2
  Author: garbika <garbika at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml

  Log Message:
  -----------
  fix MID-1801 Reconciliation report cannot be imported from XML - bad schema


  Commit: 028995d5b30babb9e2765516c087650d8153502d
      https://github.com/Evolveum/midpoint/commit/028995d5b30babb9e2765516c087650d8153502d
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
    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/configuration/component/ChooseTypeDialog.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/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.properties

  Log Message:
  -----------
  fixes for MID-1798 and MID-1776


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

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java

  Log Message:
  -----------
  updated repo impl after schema changes.


  Commit: bb704fabd1bf29c633e6813f6d8944854a1232ce
      https://github.com/Evolveum/midpoint/commit/bb704fabd1bf29c633e6813f6d8944854a1232ce
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 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

  Log Message:
  -----------
  updated main 2.3 scripts, added 2 columns based on repo changes.


  Commit: 0f8b659e1ad48fd62115fc85bc81bb8160017e01
      https://github.com/Evolveum/midpoint/commit/0f8b659e1ad48fd62115fc85bc81bb8160017e01
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 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 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 gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
    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/configuration/component/ChooseTypeDialog.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/roles/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.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/page/admin/users/PageUser.properties
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    M infra/schema/testng.xml
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.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/sync/TestRecomputeTask.java
    A model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
    A model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/workflow-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

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

Conflicts:
	repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java


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

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml

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

Conflicts:
	repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch repository
# Changes to be committed:
#
#	modified:   ../../config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/h2/h2-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/mysql/mysql-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/oracle/oracle-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
#	modified:   ../../gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.properties
#	deleted:    ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
#	deleted:    ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
#	deleted:    ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.properties
#	modified:   ../../gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
#	modified:   ../../infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
#	modified:   ../../infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
#	new file:   ../../infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
#	modified:   ../../infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
#	new file:   ../../infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
#	new file:   ../../infra/schema/src/test/resources/common/role-construction.xml
#	modified:   ../../infra/schema/testng.xml
#	modified:   ../../model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
#	new file:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
#	renamed:    ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java -> ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java
#	modified:   ../../model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
#	modified:   ../../model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
#	modified:   ../../model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
#	modified:   ../../model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
#	new file:   ../../model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
#	new file:   ../../model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
#	new file:   ../../model/model-intest/src/test/resources/iteration/user-template-iteration.xml
#	modified:   ../../model/model-intest/src/test/resources/logback-test.xml
#	modified:   ../../model/report-impl/src/test/resources/reports/reportReconciliation.xml
#	modified:   ../../model/workflow-impl/pom.xml
#	modified:   ../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
#	modified:   ../../samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   src/test/resources/basic/objects.xml
#


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


More information about the midPoint-svn mailing list