[midPoint-git] [Evolveum/midpoint] b3f614: Some cosmetic changes (message when no sysconfig, ...

[Radovan Semancik]

  Branch: refs/heads/ldap
  Home:   https://github.com/Evolveum/midpoint
  Commit: b3f6145368426157201027761f98a5493864c8b1
      https://github.com/Evolveum/midpoint/commit/b3f6145368426157201027761f98a5493864c8b1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    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/util/Utils.java

  Log Message:
  -----------
  Some cosmetic changes (message when no sysconfig, avoiding empty deltas when filter reevaluation)


  Commit: d5e0ce3a677f839d69bc7d32a8d50928490b2572
      https://github.com/Evolveum/midpoint/commit/d5e0ce3a677f839d69bc7d32a8d50928490b2572
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  fixing activation handling in resource wizard


  Commit: c45c59fc416223f09138fe276e1fc9ee22928d86
      https://github.com/Evolveum/midpoint/commit/c45c59fc416223f09138fe276e1fc9ee22928d86
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

  Log Message:
  -----------
  fix for MID-2159


  Commit: 57c016903ed0a7e740fd01f48207efb712ed0d9d
      https://github.com/Evolveum/midpoint/commit/57c016903ed0a7e740fd01f48207efb712ed0d9d
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  fix for MID-2158


  Commit: 97494c7f8031a62f980f290eb2d8d335b02f7d65
      https://github.com/Evolveum/midpoint/commit/97494c7f8031a62f980f290eb2d8d335b02f7d65
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-24 (Sat, 24 Jan 2015)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

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


  Commit: 77c337ad214921ec9278b58af594f6842e5a7690
      https://github.com/Evolveum/midpoint/commit/77c337ad214921ec9278b58af594f6842e5a7690
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-24 (Sat, 24 Jan 2015)

  Changed paths:
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml

  Log Message:
  -----------
  Fixed a typo.


  Commit: 61e14cbffaa20f4ecb32005e224da565f37466c2
      https://github.com/Evolveum/midpoint/commit/61e14cbffaa20f4ecb32005e224da565f37466c2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/opendj/opendj-localhost-basic.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/opendj/opendj-resource-genericsync.xml

  Log Message:
  -----------
  Disabling filtered results handler for LDAP samples (except for those that have caseInsensitiveFilter=true)


  Commit: 6be84c06f0f5b82254669f50d936d427624128d7
      https://github.com/Evolveum/midpoint/commit/6be84c06f0f5b82254669f50d936d427624128d7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java

  Log Message:
  -----------
  Some unimportant fixes


  Commit: cc436791343a8a20401c623e78c71363a309633f
      https://github.com/Evolveum/midpoint/commit/cc436791343a8a20401c623e78c71363a309633f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml

  Log Message:
  -----------
  MR case ignore for icfs:name and ri:uid for OpenDJ sample


  Commit: 9505f26c0f1307f243e1c32b36078aa63cfa1ad9
      https://github.com/Evolveum/midpoint/commit/9505f26c0f1307f243e1c32b36078aa63cfa1ad9
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java

  Log Message:
  -----------
  fix for MID-2166 - upper links in RW now behave as they should before.


  Commit: 5b785098d6f628362f224aca3f9b7d163734b1ac
      https://github.com/Evolveum/midpoint/commit/5b785098d6f628362f224aca3f9b7d163734b1ac
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

  Log Message:
  -----------
  fix for MID-2159 with associations


  Commit: 64973a1354cde34df8b77b97b7572254aeb6ecb1
      https://github.com/Evolveum/midpoint/commit/64973a1354cde34df8b77b97b7572254aeb6ecb1
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

  Log Message:
  -----------
  fix for MID-2161


  Commit: 4e18d683b8d1ee8d1f92668928bad25d584ec478
      https://github.com/Evolveum/midpoint/commit/4e18d683b8d1ee8d1f92668928bad25d584ec478
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

  Log Message:
  -----------
  fix for MID-2033, issue 17


  Commit: aebcb37e0afe730fa0600c88e85786a350ac7cd7
      https://github.com/Evolveum/midpoint/commit/aebcb37e0afe730fa0600c88e85786a350ac7cd7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties

  Log Message:
  -----------
  Ability to reset artificially set midPoint time in Internals config


  Commit: ac29dd3ce0ef16c38da88ad2d65305bb10da6c61
      https://github.com/Evolveum/midpoint/commit/ac29dd3ce0ef16c38da88ad2d65305bb10da6c61
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java

  Log Message:
  -----------
  A couple of typos and logging improvements


  Commit: a11d8c602959812e9e5404cc86d488f6df40eb24
      https://github.com/Evolveum/midpoint/commit/a11d8c602959812e9e5404cc86d488f6df40eb24
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

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


  Commit: bc8f7eb76a172151004b69e9d8717adcd334c81c
      https://github.com/Evolveum/midpoint/commit/bc8f7eb76a172151004b69e9d8717adcd334c81c
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceSynchronizationDto.java

  Log Message:
  -----------
  fix for MID-2033, issue 20 - these strange objectClass values no longer generate


  Commit: ce5b75b738e47883e0e8f433b994214cf1758fd7
      https://github.com/Evolveum/midpoint/commit/ce5b75b738e47883e0e8f433b994214cf1758fd7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml

  Log Message:
  -----------
  Fixing samples.


  Commit: 274d4b9038cbed3085c2759f80d325441dd7fb5c
      https://github.com/Evolveum/midpoint/commit/274d4b9038cbed3085c2759f80d325441dd7fb5c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-26 (Mon, 26 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceSynchronizationDto.java

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


  Commit: d85395351891a3879bbecae8543c6205dbb60124
      https://github.com/Evolveum/midpoint/commit/d85395351891a3879bbecae8543c6205dbb60124
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java

  Log Message:
  -----------
  Attempt to fix MID-2170


  Commit: 1e6fcfb4e6f56ebcd52c19d420a3e224bef17e84
      https://github.com/Evolveum/midpoint/commit/1e6fcfb4e6f56ebcd52c19d420a3e224bef17e84
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java

  Log Message:
  -----------
  Attempt to fix MID-2174


  Commit: 91397e84094f57a603300edb6618670c24b7b8b7
      https://github.com/Evolveum/midpoint/commit/91397e84094f57a603300edb6618670c24b7b8b7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M samples/roles/approvals-complete.xml
    M samples/roles/users-for-approval-processes.xml

  Log Message:
  -----------
  Fixing workflow samples.


  Commit: 928d56dd9d74cfad810fbcac492835ab25032341
      https://github.com/Evolveum/midpoint/commit/928d56dd9d74cfad810fbcac492835ab25032341
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java

  Log Message:
  -----------
  Changing 'no task owner' message.


  Commit: a95f9a28b4a0633e5342aaec58439f6f4112df41
      https://github.com/Evolveum/midpoint/commit/a95f9a28b4a0633e5342aaec58439f6f4112df41
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java

  Log Message:
  -----------
  fix for handling multiValue objects (not all yet) in wizard concerning mappings, attributes, associations etc.


  Commit: 27ee93cdfa8e8a7e004648d5093a32ad3ebea2ad
      https://github.com/Evolveum/midpoint/commit/27ee93cdfa8e8a7e004648d5093a32ad3ebea2ad
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java

  Log Message:
  -----------
  Bringing back Save button functionality when correcting errors in a form


  Commit: b7bed60e41ef529de7b696bfa639134d25730f1e
      https://github.com/Evolveum/midpoint/commit/b7bed60e41ef529de7b696bfa639134d25730f1e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java

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


  Commit: 8ef81dd3f9e957c12c82c7195f34913fff5abf30
      https://github.com/Evolveum/midpoint/commit/8ef81dd3f9e957c12c82c7195f34913fff5abf30
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml

  Log Message:
  -----------
  Fixing a sample


  Commit: cdd9f36cf1b4dc966e53f7cf5484ce8edf20145b
      https://github.com/Evolveum/midpoint/commit/cdd9f36cf1b4dc966e53f7cf5484ce8edf20145b
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  Improving remaining multi value components on RW - prevents saving empty objects.


  Commit: 8f8afa9422db73f3e3cb68d0560ff3422da927c8
      https://github.com/Evolveum/midpoint/commit/8f8afa9422db73f3e3cb68d0560ff3422da927c8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M provisioning/provisioning-impl/pom.xml

  Log Message:
  -----------
  Removing old scannotation dependency.


  Commit: 9096cd3465d45d72392e9539563fc9678bf6f7b1
      https://github.com/Evolveum/midpoint/commit/9096cd3465d45d72392e9539563fc9678bf6f7b1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Dependency check plugins, commented out for now.


  Commit: 2c770c2c60ec976c336823587e46f3d88dedaefe
      https://github.com/Evolveum/midpoint/commit/2c770c2c60ec976c336823587e46f3d88dedaefe
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Removing obsolete version of c3p0


  Commit: 42aa79234b248a4ab661b9cc944dd5e8ca4296b5
      https://github.com/Evolveum/midpoint/commit/42aa79234b248a4ab661b9cc944dd5e8ca4296b5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M build-system/pom.xml

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


  Commit: fdc8f02e8957d732fe74b71e4e72db36e5ea29e1
      https://github.com/Evolveum/midpoint/commit/fdc8f02e8957d732fe74b71e4e72db36e5ea29e1
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.properties

  Log Message:
  -----------
  adding warning, that deprecated part of schema (action ref in sync reaction) is not supported in resource wizard (MID-2183)


  Commit: 9b0981bc92c8173095d45ed6913f0504c24eec6f
      https://github.com/Evolveum/midpoint/commit/9b0981bc92c8173095d45ed6913f0504c24eec6f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem_sk_SK.utf8.properties

  Log Message:
  -----------
  Button label fix


  Commit: 7f5c79350d033582df653fae9c88ada54b197421
      https://github.com/Evolveum/midpoint/commit/7f5c79350d033582df653fae9c88ada54b197421
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M samples/roles/approvals-complete.xml
    M samples/roles/users-for-approval-processes.xml

  Log Message:
  -----------
  Fixing schema problems in wf samples


  Commit: c15a0c06871644d817e28128af22d046f3394a76
      https://github.com/Evolveum/midpoint/commit/c15a0c06871644d817e28128af22d046f3394a76
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java

  Log Message:
  -----------
  fix for MID-2184


  Commit: c4210d84194933afe39ec3c1d2f18da9e76a5e13
      https://github.com/Evolveum/midpoint/commit/c4210d84194933afe39ec3c1d2f18da9e76a5e13
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java

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


  Commit: 15c3b9f942f878feceb624717acbd43668391785
      https://github.com/Evolveum/midpoint/commit/15c3b9f942f878feceb624717acbd43668391785
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    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/dto/SimpleUserResourceProvider.java

  Log Message:
  -----------
  fix for MID-2180 - adding partial error handling to resource provider when selecting resource to add account to on PageUser.


  Commit: b56c5948691cbcbcfa302102f2d819c9cdabc055
      https://github.com/Evolveum/midpoint/commit/b56c5948691cbcbcfa302102f2d819c9cdabc055
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  Temporarily disabled filling-in createApproverRef/modifyApproverRef because of MID-2178.


  Commit: 5de254c99b74d020bfba8cf282810b2510228787
      https://github.com/Evolveum/midpoint/commit/5de254c99b74d020bfba8cf282810b2510228787
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    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/dto/SimpleUserResourceProvider.java

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


  Commit: 88ac7e2761930947dcee44fc714c15bb65d6c9c8
      https://github.com/Evolveum/midpoint/commit/88ac7e2761930947dcee44fc714c15bb65d6c9c8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    R config/sql/_all/h2-3.0-all.sql
    A config/sql/_all/h2-3.1-all.sql
    R config/sql/_all/mysql-3.0-all.sql
    A config/sql/_all/mysql-3.1-all.sql
    R config/sql/_all/oracle-3.0-all.sql
    A config/sql/_all/oracle-3.1-all.sql
    R config/sql/_all/postgresql-3.0-all.sql
    A config/sql/_all/postgresql-3.1-all.sql
    R config/sql/_all/sqlserver-3.0-all.sql
    A config/sql/_all/sqlserver-3.1-all.sql
    R config/sql/activiti/activiti.db2.create.engine.sql
    R config/sql/activiti/activiti.db2.create.history.sql
    R config/sql/activiti/activiti.db2.create.identity.sql
    R config/sql/activiti/activiti.db2.drop.engine.sql
    R config/sql/activiti/activiti.db2.drop.history.sql
    R config/sql/activiti/activiti.db2.drop.identity.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    R config/sql/activiti/activiti.h2.drop.engine.sql
    R config/sql/activiti/activiti.h2.drop.history.sql
    R config/sql/activiti/activiti.h2.drop.identity.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    R config/sql/activiti/activiti.mssql.drop.engine.sql
    R config/sql/activiti/activiti.mssql.drop.history.sql
    R config/sql/activiti/activiti.mssql.drop.identity.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    R config/sql/activiti/activiti.mysql.drop.engine.sql
    R config/sql/activiti/activiti.mysql.drop.history.sql
    R config/sql/activiti/activiti.mysql.drop.identity.sql
    A config/sql/activiti/activiti.mysql55.create.engine.sql
    A config/sql/activiti/activiti.mysql55.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    R config/sql/activiti/activiti.oracle.drop.engine.sql
    R config/sql/activiti/activiti.oracle.drop.history.sql
    R config/sql/activiti/activiti.oracle.drop.identity.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R config/sql/activiti/activiti.postgres.drop.engine.sql
    R config/sql/activiti/activiti.postgres.drop.history.sql
    R config/sql/activiti/activiti.postgres.drop.identity.sql
    R config/sql/midpoint/2.2/h2/h2-2.2.sql
    R config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/mysql/mysql-2.2.sql
    R config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/oracle/oracle-2.2.sql
    R config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-2.2.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/sqlserver/sqlserver-2.2.sql
    R config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/3.0/h2/h2-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/h2/h2-3.0.sql
    R config/sql/midpoint/3.0/mysql/mysql-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/mysql/mysql-3.0.sql
    R config/sql/midpoint/3.0/oracle/oracle-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/oracle/oracle-3.0.sql
    R config/sql/midpoint/3.0/postgresql/postgresql-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/postgresql/postgresql-3.0.sql
    R config/sql/midpoint/3.0/sqlserver/sqlserver-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/sqlserver/sqlserver-3.0.sql
    A config/sql/midpoint/3.1/h2/h2-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/h2/h2-3.1.sql
    A config/sql/midpoint/3.1/mysql/mysql-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/mysql/mysql-3.1.sql
    A config/sql/midpoint/3.1/oracle/oracle-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/oracle/oracle-3.1.sql
    A config/sql/midpoint/3.1/postgresql/postgresql-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/postgresql/postgresql-3.1.sql
    A config/sql/midpoint/3.1/sqlserver/sqlserver-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/sqlserver/sqlserver-3.1.sql

  Log Message:
  -----------
  Updated activiti db scripts (5.13->5.15.1). Renamed 3.0 scripts to 3.1. Deleted obsolete 2.2 scripts.


  Commit: 3b748674cfe579c21b085400118f703ee8c2bfa1
      https://github.com/Evolveum/midpoint/commit/3b748674cfe579c21b085400118f703ee8c2bfa1
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

  Log Message:
  -----------
  fix for MID-2189 - issue 2.


  Commit: 1eeba6bdea54f29b402e4ae9c282a4a68bcaf897
      https://github.com/Evolveum/midpoint/commit/1eeba6bdea54f29b402e4ae9c282a4a68bcaf897
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java

  Log Message:
  -----------
  MID-2189 - issue 3 improvement.


  Commit: 377850d15ed43c4f39e9b1da5cf67ab0558e3fcb
      https://github.com/Evolveum/midpoint/commit/377850d15ed43c4f39e9b1da5cf67ab0558e3fcb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-01-30 (Fri, 30 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java

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


  Commit: b5bb35882ed0782da1dd76ea163d3d44732e8014
      https://github.com/Evolveum/midpoint/commit/b5bb35882ed0782da1dd76ea163d3d44732e8014
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-01-31 (Sat, 31 Jan 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.properties

  Log Message:
  -----------
  fix for MID-2189 - issue 1 - reload achema operation on Schema Step.


  Commit: 2786f698609c6d4c591029b2b45a2afe26b78c6e
      https://github.com/Evolveum/midpoint/commit/2786f698609c6d4c591029b2b45a2afe26b78c6e
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java

  Log Message:
  -----------
  fix for resource wizard - handling outbounds/inbounds in attribute, association and credentials editor.


  Commit: 0c047c98686f2256203218d33989d0f3625b3485
      https://github.com/Evolveum/midpoint/commit/0c047c98686f2256203218d33989d0f3625b3485
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/mysql/mysql-3.1-closure-upgrade.sql
    M config/sql/midpoint/3.1/mysql/mysql-3.1.sql

  Log Message:
  -----------
  updated mysql scripts


  Commit: d12a08c91cd20176dbadee8daf7346f37b3b9ab0
      https://github.com/Evolveum/midpoint/commit/d12a08c91cd20176dbadee8daf7346f37b3b9ab0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/oracle/oracle-3.1-closure-upgrade.sql
    M config/sql/midpoint/3.1/oracle/oracle-3.1.sql

  Log Message:
  -----------
  updated oracle scripts


  Commit: e87ef335a38c71ddcd68a93a475a3dcab793b1e6
      https://github.com/Evolveum/midpoint/commit/e87ef335a38c71ddcd68a93a475a3dcab793b1e6
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/postgresql/postgresql-3.1-closure-upgrade.sql
    M config/sql/midpoint/3.1/postgresql/postgresql-3.1.sql

  Log Message:
  -----------
  updated postgresql scripts


  Commit: 71294d3f0cdf277e2a6ff7309add433a4416fa30
      https://github.com/Evolveum/midpoint/commit/71294d3f0cdf277e2a6ff7309add433a4416fa30
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/sqlserver/sqlserver-3.1-closure-upgrade.sql
    M config/sql/midpoint/3.1/sqlserver/sqlserver-3.1.sql

  Log Message:
  -----------
  updated sql server scripts


  Commit: 5e2ea853237a73bfef5a2e5bd50ab0f08a24418c
      https://github.com/Evolveum/midpoint/commit/5e2ea853237a73bfef5a2e5bd50ab0f08a24418c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-01 (Sun, 01 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/h2/h2-3.1-closure-upgrade.sql
    M config/sql/midpoint/3.1/h2/h2-3.1.sql

  Log Message:
  -----------
  updated h2 scripts.


  Commit: 3ae71b38c7dfc13693495e9ddef24f79d99c188f
      https://github.com/Evolveum/midpoint/commit/3ae71b38c7dfc13693495e9ddef24f79d99c188f
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M config/sql/_all/h2-3.1-all.sql
    M config/sql/_all/mysql-3.1-all.sql
    M config/sql/_all/oracle-3.1-all.sql
    M config/sql/_all/postgresql-3.1-all.sql
    M config/sql/_all/sqlserver-3.1-all.sql

  Log Message:
  -----------
  updated all sql scripts.


  Commit: bb1c4d52ab470761ee496be8731c78e619f3a9a5
      https://github.com/Evolveum/midpoint/commit/bb1c4d52ab470761ee496be8731c78e619f3a9a5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M NEWS
    M README

  Log Message:
  -----------
  Updating the release text files


  Commit: b2f654d911c8f183ed80bb127bc787d38ef48912
      https://github.com/Evolveum/midpoint/commit/b2f654d911c8f183ed80bb127bc787d38ef48912
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui-sk-SK/pom.xml
    M gui/admin-gui-tr-TR/pom.xml
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M infra/ws-util/pom.xml
    M model/model-api/pom.xml
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M samples/model-client-sample/pom.xml
    M samples/pom.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml
    M tools/gui-i18n/pom.xml
    M tools/pom.xml
    M tools/repo-ninja/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

  Log Message:
  -----------
  Release 3.1


  Commit: 18d2f75773d55c2b63986449d12b06bf16a3fbb0
      https://github.com/Evolveum/midpoint/commit/18d2f75773d55c2b63986449d12b06bf16a3fbb0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui-sk-SK/pom.xml
    M gui/admin-gui-tr-TR/pom.xml
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M infra/ws-util/pom.xml
    M model/model-api/pom.xml
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M samples/model-client-sample/pom.xml
    M samples/pom.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml
    M tools/gui-i18n/pom.xml
    M tools/pom.xml
    M tools/repo-ninja/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

  Log Message:
  -----------
  Start of 3.2 development


  Commit: 4c717bf322a48316453ed6c850747e8ece2ee871
      https://github.com/Evolveum/midpoint/commit/4c717bf322a48316453ed6c850747e8ece2ee871
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.properties

  Log Message:
  -----------
  MID-2162 implementation


  Commit: 311e60c69fff2136466130bdaed143a8d637392d
      https://github.com/Evolveum/midpoint/commit/311e60c69fff2136466130bdaed143a8d637392d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml

  Log Message:
  -----------
  Disabling tolerateDuplicateValues in hope that test will fail. It did not. MID-2193


  Commit: 0f10098d974ac1be0590acc314aad1212f6bb5e8
      https://github.com/Evolveum/midpoint/commit/0f10098d974ac1be0590acc314aad1212f6bb5e8
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java

  Log Message:
  -----------
  fix for MID-2194.


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

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fixing MID-2164.


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    A model/model-impl/src/test/resources/lens/assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/assignment-role-manager.xml
    A model/model-impl/src/test/resources/lens/assignment-role-visitor.xml
    A model/model-impl/src/test/resources/lens/role-corp-contractor.xml
    A model/model-impl/src/test/resources/lens/role-corp-customer.xml
    A model/model-impl/src/test/resources/lens/role-corp-employee.xml
    A model/model-impl/src/test/resources/lens/role-corp-engineer.xml
    A model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-job-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-manager.xml
    A model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-set-cost-center.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Fixing MID-2190, writing a handful of tests for assignment evaluator.


  Commit: 2ae84fbb9b91c3d2df0c67950a33912f61994454
      https://github.com/Evolveum/midpoint/commit/2ae84fbb9b91c3d2df0c67950a33912f61994454
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M NEWS
    M README
    M build-system/pom.xml
    R config/sql/_all/h2-3.0-all.sql
    A config/sql/_all/h2-3.1-all.sql
    R config/sql/_all/mysql-3.0-all.sql
    A config/sql/_all/mysql-3.1-all.sql
    R config/sql/_all/oracle-3.0-all.sql
    A config/sql/_all/oracle-3.1-all.sql
    R config/sql/_all/postgresql-3.0-all.sql
    A config/sql/_all/postgresql-3.1-all.sql
    R config/sql/_all/sqlserver-3.0-all.sql
    A config/sql/_all/sqlserver-3.1-all.sql
    R config/sql/activiti/activiti.db2.create.engine.sql
    R config/sql/activiti/activiti.db2.create.history.sql
    R config/sql/activiti/activiti.db2.create.identity.sql
    R config/sql/activiti/activiti.db2.drop.engine.sql
    R config/sql/activiti/activiti.db2.drop.history.sql
    R config/sql/activiti/activiti.db2.drop.identity.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    R config/sql/activiti/activiti.h2.drop.engine.sql
    R config/sql/activiti/activiti.h2.drop.history.sql
    R config/sql/activiti/activiti.h2.drop.identity.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    R config/sql/activiti/activiti.mssql.drop.engine.sql
    R config/sql/activiti/activiti.mssql.drop.history.sql
    R config/sql/activiti/activiti.mssql.drop.identity.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    R config/sql/activiti/activiti.mysql.drop.engine.sql
    R config/sql/activiti/activiti.mysql.drop.history.sql
    R config/sql/activiti/activiti.mysql.drop.identity.sql
    A config/sql/activiti/activiti.mysql55.create.engine.sql
    A config/sql/activiti/activiti.mysql55.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    R config/sql/activiti/activiti.oracle.drop.engine.sql
    R config/sql/activiti/activiti.oracle.drop.history.sql
    R config/sql/activiti/activiti.oracle.drop.identity.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R config/sql/activiti/activiti.postgres.drop.engine.sql
    R config/sql/activiti/activiti.postgres.drop.history.sql
    R config/sql/activiti/activiti.postgres.drop.identity.sql
    R config/sql/midpoint/2.2/h2/h2-2.2.sql
    R config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/mysql/mysql-2.2.sql
    R config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/oracle/oracle-2.2.sql
    R config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-2.2.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/2.2/sqlserver/sqlserver-2.2.sql
    R config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.2.1.sql
    R config/sql/midpoint/3.0/h2/h2-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/h2/h2-3.0.sql
    R config/sql/midpoint/3.0/mysql/mysql-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/mysql/mysql-3.0.sql
    R config/sql/midpoint/3.0/oracle/oracle-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/oracle/oracle-3.0.sql
    R config/sql/midpoint/3.0/postgresql/postgresql-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/postgresql/postgresql-3.0.sql
    R config/sql/midpoint/3.0/sqlserver/sqlserver-3.0-closure-upgrade.sql
    R config/sql/midpoint/3.0/sqlserver/sqlserver-3.0.sql
    A config/sql/midpoint/3.1/h2/h2-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/h2/h2-3.1.sql
    A config/sql/midpoint/3.1/mysql/mysql-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/mysql/mysql-3.1.sql
    A config/sql/midpoint/3.1/oracle/oracle-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/oracle/oracle-3.1.sql
    A config/sql/midpoint/3.1/postgresql/postgresql-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/postgresql/postgresql-3.1.sql
    A config/sql/midpoint/3.1/sqlserver/sqlserver-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1/sqlserver/sqlserver-3.1.sql
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui-sk-SK/pom.xml
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem_sk_SK.utf8.properties
    M gui/admin-gui-tr-TR/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueDropDownPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/progress/ProgressReporter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ResourceSynchronizationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.properties
    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/dto/SimpleUserResourceProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M infra/ws-util/pom.xml
    M model/model-api/pom.xml
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    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/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-intest/pom.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M samples/model-client-sample/pom.xml
    M samples/pom.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/opendj/opendj-localhost-basic.xml
    M samples/resources/opendj/opendj-localhost-medium.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/opendj/opendj-resource-genericsync.xml
    M samples/roles/approvals-complete.xml
    M samples/roles/users-for-approval-processes.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml
    M tools/gui-i18n/pom.xml
    M tools/pom.xml
    M tools/repo-ninja/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

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


  Commit: ccb1049c9194c4a63cd6a93709e12d25e5754913
      https://github.com/Evolveum/midpoint/commit/ccb1049c9194c4a63cd6a93709e12d25e5754913
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  Marking '_' char as break-line character in association popover.


  Commit: 4cf8045e1e1afd962fd602077163a321730047b7
      https://github.com/Evolveum/midpoint/commit/4cf8045e1e1afd962fd602077163a321730047b7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java

  Log Message:
  -----------
  MID-2191, part 1: Configurable handling of undeclared xmlns prefixes (warning/fatal)


  Commit: 833d436947e3e82db30fd03d6055d5c8a8c0de04
      https://github.com/Evolveum/midpoint/commit/833d436947e3e82db30fd03d6055d5c8a8c0de04
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

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

  Log Message:
  -----------
  First hack on LookupTableType


  Commit: 41c48adfab25eea412a0ff33ad11b59358ff9ca5
      https://github.com/Evolveum/midpoint/commit/41c48adfab25eea412a0ff33ad11b59358ff9ca5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

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


  Commit: 01e4acc6d17fb1c82ee0c3a8631d888905833e58
      https://github.com/Evolveum/midpoint/commit/01e4acc6d17fb1c82ee0c3a8631d888905833e58
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

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

  Log Message:
  -----------
  Fixing two authorization NPE problems


  Commit: fc2161062f451a087734af56840c2c2e8389fb0d
      https://github.com/Evolveum/midpoint/commit/fc2161062f451a087734af56840c2c2e8389fb0d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

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

  Log Message:
  -----------
  Refactoring schemaHandling and ObjectTemplate, part 1


  Commit: 98e7899d69e45e7179cfbfc67324fe891ee38349
      https://github.com/Evolveum/midpoint/commit/98e7899d69e45e7179cfbfc67324fe891ee38349
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

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


  Commit: 8fe9e7cb26d7daf3e3241b05463089ba05a4a595
      https://github.com/Evolveum/midpoint/commit/8fe9e7cb26d7daf3e3241b05463089ba05a4a595
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

  Log Message:
  -----------
  midPoint - CAS integration (using Jasig CAS Client libraries, spring ctx)


  Commit: b0fbf33dcf51e571a6ad24b0648dad881a5858e1
      https://github.com/Evolveum/midpoint/commit/b0fbf33dcf51e571a6ad24b0648dad881a5858e1
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  disabling CAS SSO integration (by default use standard authentication)


  Commit: 06fc76c1e73dde64640efcddd972ef083254de1b
      https://github.com/Evolveum/midpoint/commit/06fc76c1e73dde64640efcddd972ef083254de1b
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M NEWS
    M README
    M build-system/pom.xml
    M custom/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui-sk-SK/pom.xml
    M gui/admin-gui-tr-TR/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.properties
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/query-3.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-3.xsd
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/capabilities-3.xsd
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M infra/ws-util/pom.xml
    M model/model-api/pom.xml
    M model/model-client/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    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/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    A model/model-impl/src/test/resources/lens/assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/assignment-role-manager.xml
    A model/model-impl/src/test/resources/lens/assignment-role-visitor.xml
    A model/model-impl/src/test/resources/lens/role-corp-contractor.xml
    A model/model-impl/src/test/resources/lens/role-corp-customer.xml
    A model/model-impl/src/test/resources/lens/role-corp-employee.xml
    A model/model-impl/src/test/resources/lens/role-corp-engineer.xml
    A model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-job-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-manager.xml
    A model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-set-cost-center.xml
    M model/model-intest/pom.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-test/pom.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M samples/model-client-sample/pom.xml
    M samples/pom.xml
    M samples/samples-test/pom.xml
    M testing/conntest/pom.xml
    M testing/consistency-mechanism/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml
    M tools/gui-i18n/pom.xml
    M tools/pom.xml
    M tools/repo-ninja/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml
    M weblogic-build/pom.xml

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


  Commit: 814547cb0371bd6313d6bdfe5e3ce68a63bb3ab8
      https://github.com/Evolveum/midpoint/commit/814547cb0371bd6313d6bdfe5e3ce68a63bb3ab8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java

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


  Commit: 325ef3851265ae900c98e62a6bff82b2da86597c
      https://github.com/Evolveum/midpoint/commit/325ef3851265ae900c98e62a6bff82b2da86597c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

  Log Message:
  -----------
  Refacting the ResourceItemItemDefinition - for the use in ObjectTemplateType.


  Commit: 3811dfdb0c7f88de612a917ae46b4e13187ca61e
      https://github.com/Evolveum/midpoint/commit/3811dfdb0c7f88de612a917ae46b4e13187ca61e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-common/src/test/resources/expression/groovy/expression-user-extension-ship-path.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/test/resources/lens/assignment-direct-expression.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-fake.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/common/resource-dummy-schemaless-no-schema.xml
    M model/model-intest/src/test/resources/common/resource-dummy-upcase.xml
    M model/model-intest/src/test/resources/common/resource-dummy-white.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/account-delete-object-change.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M samples/resources/ad/ad-resource-simple.xml
    M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
    M samples/resources/mysqluser/mysqluser-localhost-simple.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java

  Log Message:
  -----------
  Configurable treatment of undeclared prefixes (MID-2191). Temporarily fixing missing XMLNS declarations when serializing RawTypes (MID-2196).


  Commit: a6810ecfa4bf3adfe4cc2c04f398982a009aa254
      https://github.com/Evolveum/midpoint/commit/a6810ecfa4bf3adfe4cc2c04f398982a009aa254
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

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


  Commit: 5939e14f867610da63d3c19e178cf88f3cac4e4a
      https://github.com/Evolveum/midpoint/commit/5939e14f867610da63d3c19e178cf88f3cac4e4a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    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:
  -----------
  created lookup table entity


  Commit: 9383ff2766df82ff6c9a80d469dcfd98e35fce45
      https://github.com/Evolveum/midpoint/commit/9383ff2766df82ff6c9a80d469dcfd98e35fce45
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParsePasswordPolicy.java
    A infra/schema/src/test/resources/common/password-policy.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.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/mapping/Mapping.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Default namespace is no longer used when parsing and serializing QNames. Plus a bunch of related fixes and tests.
Introduced "safe mode" that turns on tolerance to undeclared prefixes.


  Commit: 862e3aca867a424aced79f0e12dfdd7dcd370df7
      https://github.com/Evolveum/midpoint/commit/862e3aca867a424aced79f0e12dfdd7dcd370df7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java

  Log Message:
  -----------
  updated column names for lookup table row.


  Commit: b20da867992cd23f44bfa2df5cf5d579fd7ea071
      https://github.com/Evolveum/midpoint/commit/b20da867992cd23f44bfa2df5cf5d579fd7ea071
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/mysql/mysql-3.1.sql
    A config/sql/midpoint/3.1/mysql/mysql-upgrade-3.1-3.1.1.sql

  Log Message:
  -----------
  updated mysql scripts.


  Commit: c21e9018518a2ba7f2c437a55d1522cb5cc507df
      https://github.com/Evolveum/midpoint/commit/c21e9018518a2ba7f2c437a55d1522cb5cc507df
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M repo/repo-sql-impl-test/testng.xml

  Log Message:
  -----------
  updated scripts for sql server


  Commit: b5cc96f8d592e07621f6c51f77afb21d2831ddc8
      https://github.com/Evolveum/midpoint/commit/b5cc96f8d592e07621f6c51f77afb21d2831ddc8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/postgresql/postgresql-3.1.sql
    A config/sql/midpoint/3.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1/sqlserver/sqlserver-3.1.sql
    A config/sql/midpoint/3.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M repo/repo-sql-impl-test/testng.xml

  Log Message:
  -----------
  reverted testng, updated scripts for sql server and postgres.


  Commit: 043bd280a81f5d17d3e2c140f30cf0f153b12117
      https://github.com/Evolveum/midpoint/commit/043bd280a81f5d17d3e2c140f30cf0f153b12117
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M config/sql/midpoint/3.1/h2/h2-3.1.sql
    A config/sql/midpoint/3.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1/oracle/oracle-3.1.sql
    A config/sql/midpoint/3.1/oracle/oracle-upgrade-3.1-3.1.1.sql

  Log Message:
  -----------
  updated h2 and oracle scripts


  Commit: 8307b9a633c482c407c03fccf846a63ef983f507
      https://github.com/Evolveum/midpoint/commit/8307b9a633c482c407c03fccf846a63ef983f507
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    A config/sql/midpoint/3.1.1/h2/h2-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/h2/h2-3.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-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/mysql/mysql-3.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-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/oracle/oracle-3.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-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/postgresql/postgresql-3.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-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.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/h2/h2-upgrade-3.1-3.1.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/mysql/mysql-upgrade-3.1-3.1.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/oracle/oracle-upgrade-3.1-3.1.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/postgresql/postgresql-upgrade-3.1-3.1.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
    R config/sql/midpoint/3.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql

  Log Message:
  -----------
  moved 3.1 scripts to 3.1.1


  Commit: d837061d263953f3b84e80cd9bc619faa52685c0
      https://github.com/Evolveum/midpoint/commit/d837061d263953f3b84e80cd9bc619faa52685c0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    R config/sql/midpoint/3.1.1/h2/h2-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    R config/sql/midpoint/3.1.1/h2/h2-3.1.sql
    R config/sql/midpoint/3.1.1/mysql/mysql-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    R config/sql/midpoint/3.1.1/mysql/mysql-3.1.sql
    R config/sql/midpoint/3.1.1/oracle/oracle-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    R config/sql/midpoint/3.1.1/oracle/oracle-3.1.sql
    R config/sql/midpoint/3.1.1/postgresql/postgresql-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    R config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.sql
    R config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1-closure-upgrade.sql
    A config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    R config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.sql

  Log Message:
  -----------
  renamed scripts, removed obsolete


  Commit: 453a5fa5e142a929ae45ac7d54112baf8719b256
      https://github.com/Evolveum/midpoint/commit/453a5fa5e142a929ae45ac7d54112baf8719b256
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

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

  Log Message:
  -----------
  LoggingUtils.logUnexpectedException that always shows stack trace


  Commit: 5d314ae5e3ad56f6a404f6cd4eef0327baa80345
      https://github.com/Evolveum/midpoint/commit/5d314ae5e3ad56f6a404f6cd4eef0327baa80345
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java

  Log Message:
  -----------
  Cosmetics


  Commit: f072a11d1086b6c06d468e0064cd6519d9452e71
      https://github.com/Evolveum/midpoint/commit/f072a11d1086b6c06d468e0064cd6519d9452e71
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParsePasswordPolicy.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/password-policy.xml
    M infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.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/mapping/Mapping.java
    M model/model-common/src/test/resources/expression/groovy/expression-user-extension-ship-path.xml
    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/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/assignment-direct-expression.xml
    A model/model-impl/src/test/resources/lens/assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/assignment-role-manager.xml
    A model/model-impl/src/test/resources/lens/assignment-role-visitor.xml
    A model/model-impl/src/test/resources/lens/role-corp-contractor.xml
    A model/model-impl/src/test/resources/lens/role-corp-customer.xml
    A model/model-impl/src/test/resources/lens/role-corp-employee.xml
    A model/model-impl/src/test/resources/lens/role-corp-engineer.xml
    A model/model-impl/src/test/resources/lens/role-corp-generic-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-job-metarole.xml
    A model/model-impl/src/test/resources/lens/role-corp-manager.xml
    A model/model-impl/src/test/resources/lens/role-corp-visitor.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-role-engineer.xml
    A model/model-impl/src/test/resources/lens/user-jack-modify-set-cost-center.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-fake.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/common/resource-dummy-schemaless-no-schema.xml
    M model/model-intest/src/test/resources/common/resource-dummy-upcase.xml
    M model/model-intest/src/test/resources/common/resource-dummy-white.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/account-delete-object-change.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/resources/ad/ad-resource-simple.xml
    M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
    M samples/resources/mysqluser/mysqluser-localhost-simple.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

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


  Commit: 63e5ce91cb32e58729108044e780b380e918e147
      https://github.com/Evolveum/midpoint/commit/63e5ce91cb32e58729108044e780b380e918e147
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml

  Log Message:
  -----------
  fixing CAS SSO integration - bad reference on the user details service


  Commit: 3d28144c3335be0b1d4b0ff61149bb643e03f181
      https://github.com/Evolveum/midpoint/commit/3d28144c3335be0b1d4b0ff61149bb643e03f181
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParsePasswordPolicy.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/password-policy.xml
    M infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.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/mapping/Mapping.java
    M model/model-common/src/test/resources/expression/groovy/expression-user-extension-ship-path.xml
    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/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/test/resources/lens/assignment-direct-expression.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-fake.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/common/resource-dummy-schemaless-no-schema.xml
    M model/model-intest/src/test/resources/common/resource-dummy-upcase.xml
    M model/model-intest/src/test/resources/common/resource-dummy-white.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/account-delete-object-change.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/resources/ad/ad-resource-simple.xml
    M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
    M samples/resources/mysqluser/mysqluser-localhost-simple.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

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


  Commit: e033b8b25e7f99bdc14f2038807b9a99afd733d8
      https://github.com/Evolveum/midpoint/commit/e033b8b25e7f99bdc14f2038807b9a99afd733d8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml

  Log Message:
  -----------
  Preliminary fixing MID-2198 (abundant xmlns declarations) by putting frequently used ones on root element of each document


  Commit: 557bbccd8083e8b73d41fbcfb5025cf20fd5fa03
      https://github.com/Evolveum/midpoint/commit/557bbccd8083e8b73d41fbcfb5025cf20fd5fa03
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml

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


  Commit: 78e9f39b1e81809169337c316ae0c46b5b767e27
      https://github.com/Evolveum/midpoint/commit/78e9f39b1e81809169337c316ae0c46b5b767e27
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelUtils.java

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


  Commit: f444ba6ca87c61b10854ca63629cef683e2965bc
      https://github.com/Evolveum/midpoint/commit/f444ba6ca87c61b10854ca63629cef683e2965bc
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java

  Log Message:
  -----------
  few small fixes in wizard.


  Commit: 023bd3e51e1be8512739a7cd4daa5d3eb4cbeb27
      https://github.com/Evolveum/midpoint/commit/023bd3e51e1be8512739a7cd4daa5d3eb4cbeb27
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java

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


  Commit: 019a6e42724e3e40409f0c964355500840ca8c45
      https://github.com/Evolveum/midpoint/commit/019a6e42724e3e40409f0c964355500840ca8c45
  Author: Viliam Repan <1azyman at users.noreply.github.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  fixed schema/prism version in dist


  Commit: 9f2d2c4a0526437aa2ec80e3ca59531c70d67076
      https://github.com/Evolveum/midpoint/commit/9f2d2c4a0526437aa2ec80e3ca59531c70d67076
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  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/RLookupTable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java

  Log Message:
  -----------
  updated lookup table entities


  Commit: a00f5b41e5e57d9146a0c5d86427a2e833aab924
      https://github.com/Evolveum/midpoint/commit/a00f5b41e5e57d9146a0c5d86427a2e833aab924
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M dist/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParsePasswordPolicy.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    A infra/schema/src/test/resources/common/password-policy.xml
    M infra/schema/src/test/resources/common/resource-opendj-no-xmlns.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M infra/util/src/test/java/com/evolveum/midpoint/util/DOMUtilTest.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.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/mapping/Mapping.java
    M model/model-common/src/test/resources/expression/groovy/expression-user-extension-ship-path.xml
    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/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/resources/lens/assignment-direct-expression.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestModelWebServiceNegative.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-fake.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-orange.xml
    M model/model-intest/src/test/resources/common/resource-dummy-schemaless-no-schema.xml
    M model/model-intest/src/test/resources/common/resource-dummy-upcase.xml
    M model/model-intest/src/test/resources/common/resource-dummy-white.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/account-delete-object-change.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/resources/ad/ad-resource-simple.xml
    M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
    M samples/resources/mysqluser/mysqluser-localhost-simple.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

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

Conflicts:
	repo/repo-sql-impl-test/src/test/resources/basic/objects.xml


  Commit: d5df87dfc8c8e7c0b1ce4aa34effeed0e19c7f29
      https://github.com/Evolveum/midpoint/commit/d5df87dfc8c8e7c0b1ce4aa34effeed0e19c7f29
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java

  Log Message:
  -----------
  adjusting wizard to attribute ref. type change from QName to ItemPathType


  Commit: 1ef358c37591d06e8e7293c7a3fc7940e6182edb
      https://github.com/Evolveum/midpoint/commit/1ef358c37591d06e8e7293c7a3fc7940e6182edb
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M dist/pom.xml

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


  Commit: d40370ca4cc64181dd71aac6871754de61158262
      https://github.com/Evolveum/midpoint/commit/d40370ca4cc64181dd71aac6871754de61158262
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml

  Log Message:
  -----------
  switching back to development mode


  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: f4cf73c8eca5d4d32465b6f278057d5c4427a502
      https://github.com/Evolveum/midpoint/commit/f4cf73c8eca5d4d32465b6f278057d5c4427a502
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-09 (Mon, 09 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/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-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  Refactor to allow universal refined schema


  Commit: a3b297a0b708355e86ae19fb9ef343e10a29d295
      https://github.com/Evolveum/midpoint/commit/a3b297a0b708355e86ae19fb9ef343e10a29d295
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.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:
  -----------
  More footwork for universal refined schema


  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: 27a2909c74687ca1071634977fed5a5fd90f41b3
      https://github.com/Evolveum/midpoint/commit/27a2909c74687ca1071634977fed5a5fd90f41b3
  Author: Radovan Semancik <radovan.semancik 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:
  -----------
  Fixing NPE


  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: 903e04f8d2da72592965b9d903975328a2ad58b4
      https://github.com/Evolveum/midpoint/commit/903e04f8d2da72592965b9d903975328a2ad58b4
  Author: Viliam Repan <vilo.repan 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/input/QNameEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    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 github.com:Evolveum/midpoint


  Commit: 8c4b45404d5917cb61fafd87da56941b76fe7545
      https://github.com/Evolveum/midpoint/commit/8c4b45404d5917cb61fafd87da56941b76fe7545
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M gui/admin-gui-es-ES/pom.xml

  Log Message:
  -----------
  typo fix in module name.


  Commit: 98c1a49c9550e8a1213823d528e70eb6a6c01233
      https://github.com/Evolveum/midpoint/commit/98c1a49c9550e8a1213823d528e70eb6a6c01233
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    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

  Log Message:
  -----------
  failing test for lookup table.


  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: e1bca58a307f67ee46e956ee79aadc395e3e387c
      https://github.com/Evolveum/midpoint/commit/e1bca58a307f67ee46e956ee79aadc395e3e387c
  Author: Radovan Semancik <radovan.semancik 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

  Log Message:
  -----------
  Test&fix for deepClone stack overflow


  Commit: bf25179b32ded66f239427d9f336a695f76987d3
      https://github.com/Evolveum/midpoint/commit/bf25179b32ded66f239427d9f336a695f76987d3
  Author: Radovan Semancik <radovan.semancik 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 github.com:Evolveum/midpoint


  Commit: e6e7b7b02b867315088ec4c9869f82babdbc2f2d
      https://github.com/Evolveum/midpoint/commit/e6e7b7b02b867315088ec4c9869f82babdbc2f2d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    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:
  -----------
  Minor test package and name refactor


  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


  Commit: e165863885484b41fa9bae8f06547088e678f101
      https://github.com/Evolveum/midpoint/commit/e165863885484b41fa9bae8f06547088e678f101
  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/page/admin/workflow/dto/ProcessInstanceDto.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd

  Log Message:
  -----------
  Fix for MID-2177, removed obsolete wfAnswer from WfProcessInstanceType


  Commit: 29ac92e9a93ed4d168bd7d01efa0b78d32443932
      https://github.com/Evolveum/midpoint/commit/29ac92e9a93ed4d168bd7d01efa0b78d32443932
  Author: Radovan Semancik <radovan.semancik 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/ModelController.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestSchemaMisc.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.xml
    M model/model-intest/testng.xml

  Log Message:
  -----------
  More test moving. Basic refined schema impl (still in progress). Some basic tests.


  Commit: 3a9a656976740d82779645144253494b90dc23c3
      https://github.com/Evolveum/midpoint/commit/3a9a656976740d82779645144253494b90dc23c3
  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/pom.xml
    M model/report-impl/pom.xml

  Log Message:
  -----------
  Excluded jackson dependencies from jasperreports (MID-2205), remains to be tested


  Commit: 25fb53c43d3004b1573e6a6c82833dba521d2a9b
      https://github.com/Evolveum/midpoint/commit/25fb53c43d3004b1573e6a6c82833dba521d2a9b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  Support for <item> in object template.


  Commit: a5d1a507564df7e50be02e7640ccf2ae177bf9fb
      https://github.com/Evolveum/midpoint/commit/a5d1a507564df7e50be02e7640ccf2ae177bf9fb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java

  Log Message:
  -----------
  valueEnumerationRef


  Commit: e82e5fce13cd7a3fce1608faf28dda632bb26f65
      https://github.com/Evolveum/midpoint/commit/e82e5fce13cd7a3fce1608faf28dda632bb26f65
  Author: Erik Suta <erik.suta 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/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java

  Log Message:
  -----------
  MID-2175 - adding option to setrelation between user and org. unit - user can be made manager from UI.


  Commit: f847cf3eae0586f3dcf4c81f34a61358e56dfb58
      https://github.com/Evolveum/midpoint/commit/f847cf3eae0586f3dcf4c81f34a61358e56dfb58
  Author: Radovan Semancik <radovan.semancik 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/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java

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


  Commit: f7f9302221e67ffa4a9bf1b6df57fa839088e69d
      https://github.com/Evolveum/midpoint/commit/f7f9302221e67ffa4a9bf1b6df57fa839088e69d
  Author: Radovan Semancik <radovan.semancik 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/prism/src/main/java/com/evolveum/midpoint/prism/PrismObjectDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Fixing circular type definition, reworked deep clone, this fixes broken security tests


  Commit: 3845bc544f42637255f3fd262d74e1c03c98c04e
      https://github.com/Evolveum/midpoint/commit/3845bc544f42637255f3fd262d74e1c03c98c04e
  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/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.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/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.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/lens/projector/ObjectTemplateProcessor.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.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/AbstractGenericSyncTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestSchemaMisc.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/testng.xml
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


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

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java

  Log Message:
  -----------
  Test for MID-2178 (failing, so disabled)


  Commit: 5c645b991391bd43bf099d0cb560c5be33de4f31
      https://github.com/Evolveum/midpoint/commit/5c645b991391bd43bf099d0cb560c5be33de4f31
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java

  Log Message:
  -----------
  valueEnumerationRef in ItemRefinedDefinitionType


  Commit: 94be96a500cec75f609bafb5fa634263333d34ef
      https://github.com/Evolveum/midpoint/commit/94be96a500cec75f609bafb5fa634263333d34ef
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/report-impl/pom.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java

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


  Commit: 7c17ab13c80944a48d814790bc4df817b8b7839e
      https://github.com/Evolveum/midpoint/commit/7c17ab13c80944a48d814790bc4df817b8b7839e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  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/RLookupTable.java

  Log Message:
  -----------
  lookup table test disabled.


  Commit: 2d7d3513c8107e838059d36d64d5fb9717af1003
      https://github.com/Evolveum/midpoint/commit/2d7d3513c8107e838059d36d64d5fb9717af1003
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml

  Log Message:
  -----------
  DisplayOrder override in schemaHandling (work in progress), rudimentary implemnetation of valueEnumerationRef.


  Commit: c75352062b1777ccbc39c75cd5f3585670c52811
      https://github.com/Evolveum/midpoint/commit/c75352062b1777ccbc39c75cd5f3585670c52811
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd

  Log Message:
  -----------
  More displayOrder work


  Commit: 6a980c98320a1e7393e0fed2e02779f5e7951944
      https://github.com/Evolveum/midpoint/commit/6a980c98320a1e7393e0fed2e02779f5e7951944
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  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/RLookupTable.java

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


  Commit: efce0fc339b6b625a0c164e68cc8826ed3796e57
      https://github.com/Evolveum/midpoint/commit/efce0fc339b6b625a0c164e68cc8826ed3796e57
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java

  Log Message:
  -----------
  Logging libraries upgrade


  Commit: db8251d5d987150895f8aab45f8fc1773aed1aa3
      https://github.com/Evolveum/midpoint/commit/db8251d5d987150895f8aab45f8fc1773aed1aa3
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    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/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/report-impl/pom.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    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/RLookupTable.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: 8db758bf5e78eb91a8670e26aab8f02fcf04dae2
      https://github.com/Evolveum/midpoint/commit/8db758bf5e78eb91a8670e26aab8f02fcf04dae2
  Author: Viliam Repan <1azyman at users.noreply.github.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java

  Log Message:
  -----------
  disable lookuptable entity for now


  Commit: 8ec761f7dc0964310aa2ebd561909296cf5baf38
      https://github.com/Evolveum/midpoint/commit/8ec761f7dc0964310aa2ebd561909296cf5baf38
  Author: Viliam Repan <1azyman at users.noreply.github.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java

  Log Message:
  -----------
  disable lookuptable entity for now


  Commit: 9255dbb64fa544d3d5123b7fa4c036824ac4bf15
      https://github.com/Evolveum/midpoint/commit/9255dbb64fa544d3d5123b7fa4c036824ac4bf15
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd

  Log Message:
  -----------
  Fixing displayName which I broke yesterday.


  Commit: 5d065709d48efcbcbaac5db4f64b4c8a0b9a7c39
      https://github.com/Evolveum/midpoint/commit/5d065709d48efcbcbaac5db4f64b4c8a0b9a7c39
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  Fixed stupid bug preventing showing activation, password, extension containers in GUI


  Commit: d4ea8bb981aeab567f7aeee37af6f3df4ae2f3d8
      https://github.com/Evolveum/midpoint/commit/d4ea8bb981aeab567f7aeee37af6f3df4ae2f3d8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java

  Log Message:
  -----------
  Adapted notification test to a change in schema.


  Commit: 4d1b9619cad47bc9a55999bb46e02707d50eb0c1
      https://github.com/Evolveum/midpoint/commit/4d1b9619cad47bc9a55999bb46e02707d50eb0c1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java

  Log Message:
  -----------
  Explicitly generating displayOrder in resource ICF schema.


  Commit: c8a0d9a078510a01848156c1d932c0f073d514e3
      https://github.com/Evolveum/midpoint/commit/c8a0d9a078510a01848156c1d932c0f073d514e3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  Fixing displayOrder in resource schema


  Commit: 7c80a3cef87db05a3dbd481eb3bcb838a3bcad56
      https://github.com/Evolveum/midpoint/commit/7c80a3cef87db05a3dbd481eb3bcb838a3bcad56
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTableDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java

  Log Message:
  -----------
  MID-2175 - Manager of org. unit are displayed with different icon than classic members.


  Commit: b2b2a0569c34f9447ef698529224c2b729f2fe55
      https://github.com/Evolveum/midpoint/commit/b2b2a0569c34f9447ef698529224c2b729f2fe55
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

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


  Commit: a9032e7679f50feaa85d4491d97c62ab868b0da5
      https://github.com/Evolveum/midpoint/commit/a9032e7679f50feaa85d4491d97c62ab868b0da5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java

  Log Message:
  -----------
  isManager library function


  Commit: b58c5a6cbb8989d8467148df794e46d00393befb
      https://github.com/Evolveum/midpoint/commit/b58c5a6cbb8989d8467148df794e46d00393befb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java

  Log Message:
  -----------
  *managerByOrgType library functions


  Commit: 14de840dcda45847a4acb79a9f8203bf45052152
      https://github.com/Evolveum/midpoint/commit/14de840dcda45847a4acb79a9f8203bf45052152
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java

  Log Message:
  -----------
  fix for removing inducement attributes from construction in GUI


  Commit: c11dcf6650528fe647119399a67fb9073a14272d
      https://github.com/Evolveum/midpoint/commit/c11dcf6650528fe647119399a67fb9073a14272d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    A samples/model-client-sample/src/main/resources/role-sea-superuser.xml

  Log Message:
  -----------
  Sample for role inducement modification + user reconciliation


  Commit: d15d248b96ec513c85cbb6d906710a83cb71b6f5
      https://github.com/Evolveum/midpoint/commit/d15d248b96ec513c85cbb6d906710a83cb71b6f5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java

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


  Commit: 885b0deed4fb8cac1ef33591ef116cb3428222e5
      https://github.com/Evolveum/midpoint/commit/885b0deed4fb8cac1ef33591ef116cb3428222e5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/model-client-sample/src/main/resources/role-sea-superuser.xml

  Log Message:
  -----------
  Sample for adding attribute construction in resource inducement


  Commit: 38aed868afa78c922d04701b611998491d3fa6aa
      https://github.com/Evolveum/midpoint/commit/38aed868afa78c922d04701b611998491d3fa6aa
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.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/TestOrgStruct.java
    A model/model-intest/src/test/resources/orgstruct/role-defender.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

  Log Message:
  -----------
  Fix for MID-2212.


  Commit: b7e2f2e89ab863970d929355fcabbdf0eb466af5
      https://github.com/Evolveum/midpoint/commit/b7e2f2e89ab863970d929355fcabbdf0eb466af5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

  Log Message:
  -----------
  Limited parentOrgRef reconciliation to necessary situations


  Commit: 57b127f756c07edfe0c1c04f2663d0b6f0bfbed1
      https://github.com/Evolveum/midpoint/commit/57b127f756c07edfe0c1c04f2663d0b6f0bfbed1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.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/TestOrgStruct.java
    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:
  -----------
  Fixing getManagers lib function (+tests)


  Commit: bc41bcc053b6b7c82c7f70601dadbb3254dcfc25
      https://github.com/Evolveum/midpoint/commit/bc41bcc053b6b7c82c7f70601dadbb3254dcfc25
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

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

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


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

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java

  Log Message:
  -----------
  Fixed relation with TestOrgStructMeta


  Commit: 0618f95878c853e2aa229b11998cb93632deb27c
      https://github.com/Evolveum/midpoint/commit/0618f95878c853e2aa229b11998cb93632deb27c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Fixed missing extension container in org editor


  Commit: 7cdcfb223df0604d1f39e3a175d9bd075b92ba8a
      https://github.com/Evolveum/midpoint/commit/7cdcfb223df0604d1f39e3a175d9bd075b92ba8a
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Fix for saving extension attributes on PageOrgUnit


  Commit: ffc44901781a6ae148f01524cdea59801768999e
      https://github.com/Evolveum/midpoint/commit/ffc44901781a6ae148f01524cdea59801768999e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-static-schema.xml

  Log Message:
  -----------
  Fixing provisioning test failures


  Commit: 8ba2c733b65131c8b2ee70495b72132f6ccc5b7b
      https://github.com/Evolveum/midpoint/commit/8ba2c733b65131c8b2ee70495b72132f6ccc5b7b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M build-system/pom.xml
    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 dist/pom.xml
    M gui/admin-gui-es-ES/pom.xml
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ObjectWrapperUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.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/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTableDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    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/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    A infra/schema/src/test/resources/common/lookup-table.xml
    A infra/schema/src/test/resources/diff/shadow-before.xml
    M infra/schema/src/test/resources/object-template/object-template.xml
    M infra/schema/src/test/resources/object-template/user-template.xml
    M infra/schema/testng.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.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/controller/ModelUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.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/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.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/AbstractGenericSyncTest.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/common/user-template.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/orgstruct/role-defender.xml
    M model/model-intest/testng.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/impl/TestTextFormatter.java
    M model/report-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-schemaless/resource-dummy-schemaless-static-schema.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    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
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    A samples/model-client-sample/src/main/resources/role-sea-superuser.xml

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

Conflicts:
	build-system/pom.xml


  Commit: 0ef960cf533a0187b1ba20b4bdf349fe1c7c9ebb
      https://github.com/Evolveum/midpoint/commit/0ef960cf533a0187b1ba20b4bdf349fe1c7c9ebb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml

  Log Message:
  -----------
  LDAP connector experiments


Compare: https://github.com/Evolveum/midpoint/compare/aa942649a4af...0ef960cf533a