[midPoint-git] [Evolveum/midpoint] c1eda5: Fixed MID-2176.

Tue Feb 10 12:23:42 CET 2015

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c1eda5765b7ba04ff311f521124935d017ef1eab
      https://github.com/Evolveum/midpoint/commit/c1eda5765b7ba04ff311f521124935d017ef1eab
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java

  Log Message:
  -----------
  Fixed MID-2176.


  Commit: 8acdbe3a9743d233130cf55900d891c6172482b2
      https://github.com/Evolveum/midpoint/commit/8acdbe3a9743d233130cf55900d891c6172482b2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/resources/diff/shadow-before.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java

  Log Message:
  -----------
  Test for MID-2174 + a small fix.


  Commit: 73d25ddb1436677a319e4ff1e2e2460a94cf6e4e
      https://github.com/Evolveum/midpoint/commit/73d25ddb1436677a319e4ff1e2e2460a94cf6e4e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.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/controller/ModelUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

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


  Commit: 596b25e28df9fc0445b991f96a500993e020ebe8
      https://github.com/Evolveum/midpoint/commit/596b25e28df9fc0445b991f96a500993e020ebe8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelUtils.java

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


  Commit: 891a1c8f4a4b3c5028626250d4e7f6e77c8c562d
      https://github.com/Evolveum/midpoint/commit/891a1c8f4a4b3c5028626250d4e7f6e77c8c562d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    A config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    A config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    A config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    A config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    A config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    A config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    A config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    R config/sql/midpoint/3.1/h2/h2-3.1-closure-upgrade.sql
    R config/sql/midpoint/3.1/h2/h2-3.1.sql
    R config/sql/midpoint/3.1/mysql/mysql-3.1-closure-upgrade.sql
    R config/sql/midpoint/3.1/mysql/mysql-3.1.sql
    R config/sql/midpoint/3.1/oracle/oracle-3.1-closure-upgrade.sql
    R config/sql/midpoint/3.1/oracle/oracle-3.1.sql
    R config/sql/midpoint/3.1/postgresql/postgresql-3.1-closure-upgrade.sql
    R config/sql/midpoint/3.1/postgresql/postgresql-3.1.sql
    R config/sql/midpoint/3.1/sqlserver/sqlserver-3.1-closure-upgrade.sql
    R config/sql/midpoint/3.1/sqlserver/sqlserver-3.1.sql
    M gui/admin-gui-es-ES/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    A infra/schema/src/test/resources/common/lookup-table.xml
    M infra/schema/testng.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RLookupTableRowId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java

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


  Commit: 2c3b42d7be3302c157eb001ef96eee90b83e8701
      https://github.com/Evolveum/midpoint/commit/2c3b42d7be3302c157eb001ef96eee90b83e8701
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestSchemaMisc.java
    M model/model-intest/testng.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 8ea0f3a7d3eb49245d0ce61e6c234efb6de5cc6f
      https://github.com/Evolveum/midpoint/commit/8ea0f3a7d3eb49245d0ce61e6c234efb6de5cc6f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    M infra/schema/src/test/resources/common/lookup-table.xml

  Log Message:
  -----------
  Fixed parsing of PolyStringTypes in PrismProperties (e.g. in LookupTableRowType)


  Commit: 6df12db53aac1c1003af83519f77fc8a9705c28c
      https://github.com/Evolveum/midpoint/commit/6df12db53aac1c1003af83519f77fc8a9705c28c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java

  Log Message:
  -----------
  Upgraded activiti to current version + small fix in GUI


Compare: https://github.com/Evolveum/midpoint/compare/e6e7b7b02b86...6df12db53aac