[midPoint-git] [Evolveum/midpoint] d91d1b: populate attributes (e.g. activation, parameters, ....

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: d91d1be40151d2d0f2c053fbc96170ebc0cbbc5e
      https://github.com/Evolveum/midpoint/commit/d91d1be40151d2d0f2c053fbc96170ebc0cbbc5e
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    M testing/story/pom.xml
    A testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMachineIntelligence.java
    A testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    A testing/story/src/test/resources/machineintelligence/shadow-chappie.xml
    A testing/story/src/test/resources/machineintelligence/shadow-rur.xml
    M testing/story/testng-integration.xml

  Log Message:
  -----------
  populate attributes (e.g. activation, parameters,...) for assignment in assignemntTargetSearch.. tests..


  Commit: e92437038e48387adb5f7afc5a12d880b94c5f03
      https://github.com/Evolveum/midpoint/commit/e92437038e48387adb5f7afc5a12d880b94c5f03
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

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

  Log Message:
  -----------
  additional test for query convertor..


  Commit: 14f2bfdb8db81d032cd29487c502688a633bda33
      https://github.com/Evolveum/midpoint/commit/14f2bfdb8db81d032cd29487c502688a633bda33
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    A config/sql/midpoint/3.6/h2/h2-3.6.sql
    A config/sql/midpoint/3.6/h2/h2-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-3.6.sql
    A config/sql/midpoint/3.6/mysql/mysql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-3.6.sql
    A config/sql/midpoint/3.6/oracle/oracle-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-3.6.sql
    A config/sql/midpoint/3.6/postgresql/postgresql-upgrade-3.5-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-3.6.sql
    A config/sql/midpoint/3.6/sqlserver/sqlserver-upgrade-3.5-3.6.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    M gui/admin-gui/src/main/resources/initial-objects/210-lookup-locales.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
    M gui/admin-gui/src/main/resources/localization/locale.properties
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/DefaultMatchingRule.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultStatus.java
    M infra/schema/src/main/resources/localization/schema_pt_BR.properties
    M infra/schema/src/main/resources/localization/schema_ru.properties
    M infra/schema/src/main/resources/localization/schema_tr.properties
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/RestServiceUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/mapping/resource-dummy-crimson.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/DummyResourceCollection.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RForm.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/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/OrgClosureManager.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


Compare: https://github.com/Evolveum/midpoint/compare/462fb20b7e80...14f2bfdb8db8