[midPoint-git] [Evolveum/midpoint] aa9426: Switch to LDAP connector prototype

Radovan Semancik radovan.semancik at evolveum.com
Fri Jun 12 10:05:33 CEST 2015


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: aa942649a4af45e2a0c201690a31a39135c67fc0
      https://github.com/Evolveum/midpoint/commit/aa942649a4af45e2a0c201690a31a39135c67fc0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M build-system/pom.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractOpenDJTest.java
    M provisioning/provisioning-impl/src/test/resources/logback-test.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml

  Log Message:
  -----------
  Switch to LDAP connector prototype


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


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

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    M config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.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/data/paging/NavigatorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.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/prism/PrismValuePanel.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/modal/MappingEditorDialog.html
    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/schemahandling/modal/MappingEditorDialog.properties
    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/page/admin/configuration/PageAbout.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    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/component/TreeTablePanel.properties
    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/session/UserProfileStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/LiteralEqualsStrategy.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.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/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/ProvisioningDiag.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectIdentification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyConstraints.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SearchHierarchyScope.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/catalog-runtime.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog.xml
    A infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    A infra/schema/src/main/resources/xml/ns/private/fake/fakeWrapper-report.wsdl
    A infra/schema/src/main/resources/xml/ns/private/report/reportWrapper.wsdl
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/resources/diff/resource-after-ns-change.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/schema/src/test/resources/diff/resource-before.xml
    A infra/schema/src/test/resources/diff/resource2-broken.xml
    A infra/schema/src/test/resources/diff/resource2-fixed.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    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 model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelDiagnosticService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelExecuteOptions.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-client/pom.xml
    M model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.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/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelOperationTaskHandler.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/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/Clockwork.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.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/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/role-judge.xml
    A model/model-intest/src/test/resources/common/user-template-org-assignment.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/rbac/role-cannibal.xml
    A model/model-intest/src/test/resources/rbac/role-governor.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/pom.xml
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
    A model/report-ds-impl/pom.xml
    A model/report-ds-impl/src/compile/resources/catalog.xml
    A model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    A model/report-ds-impl/src/main/assembly/bin.xml
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/ClientPasswordHandler.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
    M model/report-impl/pom.xml
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ClientPasswordHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointAbstractDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/resources/ctx-report.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/catalog-compile-time.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/catalog-runtime.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog-compile-time.xml
    A model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyResourceAssignment/ResourceAssignmentModification.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyRoleAssignment/AbstractRoleAssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyRoleAssignmentAspect.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestConstants.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateModifyUser.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    A model/workflow-impl/src/test/resources/user-elisabeth-modify-add-assignment-role3.xml
    A model/workflow-impl/src/test/resources/user-elisabeth.xml
    A model/workflow-impl/src/test/resources/user-jack-modify-add-assignment-dummy.xml
    M model/workflow-impl/testng.xml
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectReferenceResolver.java
    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/ucf/api/ConnectorFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.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/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    A provisioning/provisioning-impl/src/test/resources/impl/dummy-extra/resource-dummy.xml
    M provisioning/provisioning-impl/testng.xml
    A repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    R repo/repo-sql-impl-test/STATS
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.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/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    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/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExclusionPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    M 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/RReferenceOwner.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RACreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RIncludeRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RLinkRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RParentOrgRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RResourceApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RRoleApproverRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/demo/org.xml
    M samples/demo/role-fte.xml
    M samples/demo/user-template.xml
    M testing/story/src/test/resources/common/user-administrator.xml
    M testing/story/src/test/resources/trafo/role-employee.xml

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


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

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

  Log Message:
  -----------
  Post-merge fix.


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

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml

  Log Message:
  -----------
  TestUcfOpenDj partially adapted to new LDAP connector.


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

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  More adapations of TestUcfOpenDj


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

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

  Log Message:
  -----------
  Minor cleanup


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

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorImpl.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorRegistry.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/SimpleValidationError.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchQuery.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    M infra/schema/src/test/resources/common/lookup-table.xml
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestGroovyExpressions.java
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-1.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-2.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-stringify-1.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-stringify-2.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ResourceObjectEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M model/report-ds-impl/pom.xml
    A model/report-ds-impl/testng.xml
    R repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    M testing/story/src/test/resources/science/role-statistics.xml

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


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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    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/IcfUtil.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/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-bad.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-disable-simulated-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-morgan.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-disabled.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-with-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-opendj-no-sn.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search-iterative.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/group-swashbucklers.xml
    M provisioning/provisioning-impl/src/test/resources/impl/query-complex-filter.xml
    M provisioning/provisioning-impl/src/test/resources/impl/query-filter-all-accounts.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-bad.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml

  Log Message:
  -----------
  Adapting tests to new LDAP connector. Small provisioning fixes.


  Commit: 2130ac964f29b34914bde989e10cd383b0a13938
      https://github.com/Evolveum/midpoint/commit/2130ac964f29b34914bde989e10cd383b0a13938
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.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/util/validation/MidpointFormValidator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorRegistry.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/SimpleValidationError.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java

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


  Commit: 608545e1b7c1c6410ac0c71161beb2f49e81c23e
      https://github.com/Evolveum/midpoint/commit/608545e1b7c1c6410ac0c71161beb2f49e81c23e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java

  Log Message:
  -----------
  Adapting test to new LDAP connector


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

  Changed paths:
    M build-system/pom.xml
    M dist/pom.xml
    M gui/admin-gui/pom.xml
    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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/Validatable.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/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.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/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportFieldDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorImpl.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    A infra/test-util/src/main/resources/test-data/ldif/example-4000.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/cities
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/example.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/first.names
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/last.names
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/states
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/streets
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-backend.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-backend.ldif.old
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-keystore
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-keystore.pin
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-truststore
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/ads-truststore
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/ads-truststore.pin
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180837Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180838Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-2.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-3.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-4.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-5.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-6.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-7.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-8.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-9.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121334Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121447Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121449Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121523Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121529Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121757Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/buildinfo
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif.startok
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/http-config.json
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/java.properties
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-disabled.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-enabled.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-expired.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-idle-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-permanently-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-reset-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-temporarily-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-unlocked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-changed.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-expired.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-expiring.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-reset.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/00-core.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/01-pwpolicy.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/02-config.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-changelog.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-pwpolicyextension.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2713.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2714.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2739.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2926.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc3112.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc3712.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-uddiv3.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/04-rfc2307bis.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/05-rfc4876.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/05-samba.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/05-solaris.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/06-compat.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/99-user.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif.save
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tools.properties
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/upgrade/schema.ldif.-1
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/upgrade/schema.ldif.current
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/wordlist.txt
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/00000000.jdb
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.config.csv
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.info.0
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.lck
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.stat.csv
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-adminRoot.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-ads-truststore.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-backup.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-monitor.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-replicationChanges.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-schema.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-tasks.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-userRoot.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/server.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/access
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/errors
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/replication
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/server.out
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-backend.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-backend.ldif.old
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-keystore
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-keystore.pin
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-truststore
    M infra/test-util/src/main/resources/test-data/opendj.template/config/ads-truststore
    M infra/test-util/src/main/resources/test-data/opendj.template/config/ads-truststore.pin
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180837Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180838Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-2.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-3.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-4.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-5.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-6.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-7.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-8.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-9.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181208Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181505Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181507Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181728Z.gz
    M infra/test-util/src/main/resources/test-data/opendj.template/config/buildinfo
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif.startok
    A infra/test-util/src/main/resources/test-data/opendj.template/config/http-config.json
    M infra/test-util/src/main/resources/test-data/opendj.template/config/java.properties
    R infra/test-util/src/main/resources/test-data/opendj.template/config/keystore
    R infra/test-util/src/main/resources/test-data/opendj.template/config/keystore.pin
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/00-core.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/01-pwpolicy.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/02-config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/03-changelog.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template/config/schema/03-pwpolicyextension.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/05-rfc4876.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template/config/schema/05-samba.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/05-solaris.ldif
    R infra/test-util/src/main/resources/test-data/opendj.template/config/servicetag/opends.uuids.properties
    R infra/test-util/src/main/resources/test-data/opendj.template/config/snmp/security/opends-snmp.security
    M infra/test-util/src/main/resources/test-data/opendj.template/config/tasks.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/tasks.ldif.save
    M infra/test-util/src/main/resources/test-data/opendj.template/config/tools.properties
    R infra/test-util/src/main/resources/test-data/opendj.template/config/truststore
    R infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/config.ldif.6998
    A infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/schema.ldif.-1
    R infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/schema.ldif.6998
    M infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/schema.ldif.current
    M infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/00000000.jdb
    A infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/je.config.csv
    M infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/je.info.0
    A infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/je.stat.csv
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/access
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/errors
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/replication
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/server.out
    M model/model-common/pom.xml
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
    A model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestPythonExpressions.java
    M model/model-common/src/test/resources/expression/groovy/expression-objectref-variables.xml
    M model/model-common/src/test/resources/expression/javascript/expression-objectref-variables.xml
    A model/model-common/src/test/resources/expression/python/expression-func-concatname.xml
    A model/model-common/src/test/resources/expression/python/expression-func.xml
    A model/model-common/src/test/resources/expression/python/expression-list.xml
    A model/model-common/src/test/resources/expression/python/expression-objectref-variables-polystring.xml
    A model/model-common/src/test/resources/expression/python/expression-objectref-variables.xml
    A model/model-common/src/test/resources/expression/python/expression-simple.xml
    A model/model-common/src/test/resources/expression/python/expression-string-variables.xml
    A model/model-common/src/test/resources/expression/python/expression-user-extension-ship-path.xml
    A model/model-common/src/test/resources/expression/python/expression-user-extension-ship.xml
    A model/model-common/src/test/resources/expression/python/expression-user-given-name.xml
    A model/model-common/src/test/resources/expression/python/expression-user-stringify-full-name.xml
    M model/model-common/src/test/resources/expression/xpath/expression-objectref-variables.xml
    A model/model-common/src/test/resources/logback-test.xml
    M model/model-common/testng.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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    A model/model-intest/src/test/resources/orgstruct/org-temp.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    A samples/tasks/bulk-actions/modify-selected-users-unassign-role.xml
    M testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    A testing/conntest/src/test/resources/common/resource-opendj.xml
    M testing/conntest/src/test/resources/common/resource-openldap.xml
    M testing/conntest/testng.xml
    M weblogic-build/pom.xml
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

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


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

  Changed paths:
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-create.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-delete.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-read.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-update.xml

  Log Message:
  -----------
  Converting more resource files to new LDAP connector


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

  Changed paths:
    M build-system/pom.xml

  Log Message:
  -----------
  Switch to ConnId 1.4.2.0-SNAPSHOT


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

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/logback-test.xml
    A provisioning/provisioning-impl/src/test/resources/logging.properties
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  Logging, minor fixes


  Commit: 9f38522b48bf22ba6d9a2963b88e531a13edb572
      https://github.com/Evolveum/midpoint/commit/9f38522b48bf22ba6d9a2963b88e531a13edb572
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    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/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-initialized.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java

  Log Message:
  -----------
  Provisioning tests almost fixed


  Commit: 760f11685d761b06b38c18536436b8f94cfe7de0
      https://github.com/Evolveum/midpoint/commit/760f11685d761b06b38c18536436b8f94cfe7de0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java

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


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

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Provisioning tests work


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

  Changed paths:
    M build-system/pom.xml
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml

  Log Message:
  -----------
  Bumping LDAP connector version to 1.4.2.0-SNAPSHOT


  Commit: 987876713aeb772fab0f11edb174df9daad600e5
      https://github.com/Evolveum/midpoint/commit/987876713aeb772fab0f11edb174df9daad600e5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    M config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchQuery.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/SqlRepositoryServiceImpl.java
    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/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/Container.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RLookupTableRowId.java
    M 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/util/PrismIdentifierGenerator.java

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


  Commit: cc3ff18509b5ce06952becd79009a7eb57f30e1f
      https://github.com/Evolveum/midpoint/commit/cc3ff18509b5ce06952becd79009a7eb57f30e1f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 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/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
    M 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/wizard/resource/component/capability/CapabilityActivationPanel.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/PageTemplate.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    A infra/schema/src/main/resources/META-INF/jax-ws-catalog-report.xml
    M infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M infra/test-util/pom.xml
    M infra/test-util/src/test/java/com/evolveum/midpoint/test/util/DerbyControllerTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/RoleSelectionSpecification.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/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/resources/common/lookup-languages.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/gensync/lookup-role-type.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-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportService.java
    M model/report-ds-impl/pom.xml
    R model/report-ds-impl/src/compile/resources/catalog.xml
    R model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutorFactory.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutorFactory.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
    A model/report-ds-impl/src/main/resources/jasperreports.properties
    M model/report-impl/pom.xml
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSourceProvider.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutorFactory.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/resources/jasperreports.properties
    M model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: b28a7b7567a709d858290cd3d7a614b6a9707784
      https://github.com/Evolveum/midpoint/commit/b28a7b7567a709d858290cd3d7a614b6a9707784
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/common/resource-opendj.xml
    M testing/conntest/src/test/resources/common/resource-openldap.xml
    M testing/conntest/src/test/resources/logging.properties

  Log Message:
  -----------
  Fixing conntest


  Commit: 22c142940f5323c243477e8da9fcbfa2706982f7
      https://github.com/Evolveum/midpoint/commit/22c142940f5323c243477e8da9fcbfa2706982f7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif

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


  Commit: 1b7f0bbd6a8e8e06b33410e54f8daf866148dd7a
      https://github.com/Evolveum/midpoint/commit/1b7f0bbd6a8e8e06b33410e54f8daf866148dd7a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/common/system-configuration.xml
    M testing/conntest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Fixing opendj conntest


  Commit: 7e0f53e6e0d6899690e48b5ba9536f4c610f3f13
      https://github.com/Evolveum/midpoint/commit/7e0f53e6e0d6899690e48b5ba9536f4c610f3f13
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-17 (Tue, 17 Mar 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/EntitlementConverter.java

  Log Message:
  -----------
  Support for association shortcut


  Commit: 77ba61b37918bd9ed1ed85db430d094e9362c591
      https://github.com/Evolveum/midpoint/commit/77ba61b37918bd9ed1ed85db430d094e9362c591
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/monitor/InternalMonitor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/common/resource-opendj.xml
    M testing/conntest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Tests for association shortcut, support for additional connector capabilities (paging), support for allowPartialResults.


  Commit: e5110703516feb0b6eb94c5f67e7ea50fde82368
      https://github.com/Evolveum/midpoint/commit/e5110703516feb0b6eb94c5f67e7ea50fde82368
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Extended the tests


  Commit: ed4b45f45309fddaa6d260cbbb1ff6e417490848
      https://github.com/Evolveum/midpoint/commit/ed4b45f45309fddaa6d260cbbb1ff6e417490848
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif.startok
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif.save
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/00000000.jdb
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.config.csv
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.info.0
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.stat.csv
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/access
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/errors
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/replication
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/server.out

  Log Message:
  -----------
  Fixed embedded OpenDJ index configuration.


  Commit: 1b3a9487bd90c1f6109645df5e77239092636e03
      https://github.com/Evolveum/midpoint/commit/1b3a9487bd90c1f6109645df5e77239092636e03
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  Fixes tests for OpenDJ


  Commit: d12c94b7893887121530e41694eae5ebe9a1effe
      https://github.com/Evolveum/midpoint/commit/d12c94b7893887121530e41694eae5ebe9a1effe
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-19 (Thu, 19 Mar 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/prism/ObjectWrapper.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/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/ModelTUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    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/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    A samples/model-client-sample/src/main/bin/upload.bat
    A samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Upload.java
    A samples/tasks/task-user-recompute-selected-users-only.xml

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


  Commit: 9060ff616fc9241034be2dd5d786a2c113753b25
      https://github.com/Evolveum/midpoint/commit/9060ff616fc9241034be2dd5d786a2c113753b25
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    A testing/conntest/src/test/resources/common/resource-389ds-localhost.xml
    M testing/conntest/src/test/resources/common/resource-opendj.xml
    M testing/conntest/src/test/resources/common/resource-openldap.xml

  Log Message:
  -----------
  Hacking conntests


  Commit: 18d382c289522e2635af1221d3b146530240fb99
      https://github.com/Evolveum/midpoint/commit/18d382c289522e2635af1221d3b146530240fb99
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-27 (Mon, 27 Apr 2015)

  Changed paths:
    M .gitignore
    M INSTALL
    M INSTALL-dist
    M NEWS
    M README
    M build-system/pom.xml
    A cli/common/pom.xml
    A cli/common/src/main/java/com/evolveum/midpoint/cli/common/ConsoleFilter.java
    A cli/common/src/main/java/com/evolveum/midpoint/cli/common/DefaultCommand.java
    A cli/common/src/main/java/com/evolveum/midpoint/cli/common/ToolsUtils.java
    A cli/common/src/main/java/com/evolveum/midpoint/cli/common/UrlConverter.java
    A cli/common/testng.xml
    A cli/ninja/README.MD
    A cli/ninja/pom.xml
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/Main.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/Action.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/BulkAction.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/DeleteAction.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ExportAction.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ImportAction.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/action/ModifyAction.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Bulk.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Command.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Delete.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Export.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Import.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/Modify.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/command/ObjectTypeConverter.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ClientPasswordHandler.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/LogWriter.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/ObjectType.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectHandler.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlObjectMetadata.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParser.java
    A cli/ninja/src/main/java/com/evolveum/midpoint/cli/ninja/util/XmlParserException.java
    A cli/ninja/src/main/resources/describe.properties
    A cli/ninja/src/main/resources/logback-ninja.xml
    A cli/ninja/src/main/resources/logback.xml
    A cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/AbstractNinjaTest.java
    A cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/BulkActionTest.java
    A cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/DeleteActionTest.java
    A cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ExportActionTest.java
    A cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ImportActionTest.java
    A cli/ninja/src/test/java/com/evolveum/midpoint/cli/ninja/ModifyActionTest.java
    A cli/ninja/src/test/resources/logback-test.xml
    A cli/ninja/src/test/resources/user.xml
    A cli/ninja/testng.xml
    A cli/pom.xml
    A cli/seppuku/README.MD
    A cli/seppuku/pom.xml
    A cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/Main.java
    A cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/action/Action.java
    A cli/seppuku/src/main/java/com/evolveum/midpoint/cli/seppuku/command/Command.java
    A cli/seppuku/src/main/resources/ctx-main.xml
    A cli/seppuku/src/main/resources/describe.properties
    A cli/seppuku/src/main/resources/logback-seppuku.xml
    A cli/seppuku/src/main/resources/logback.xml
    A cli/seppuku/src/test/resources/logback-test.xml
    A cli/seppuku/testng.xml
    A config/initial-objects/010-value-policy.xml
    A config/initial-objects/020-system-configuration.xml
    A config/initial-objects/030-role-superuser.xml
    A config/initial-objects/040-role-enduser.xml
    A config/initial-objects/050-user-administrator.xml
    A config/initial-objects/060-task-cleanup.xml
    A config/initial-objects/070-task-validity.xml
    A config/initial-objects/080-task-trigger.xml
    A config/initial-objects/090-report-audit.xml
    A config/initial-objects/100-report-reconciliation.xml
    A config/initial-objects/110-report-user-list.xml
    A config/initial-objects/111-report-reconciliation-shadow-owner.xml
    R config/sql/_all/h2-3.1-all.sql
    A config/sql/_all/h2-3.1.1-all.sql
    R config/sql/_all/mysql-3.1-all.sql
    A config/sql/_all/mysql-3.1.1-all.sql
    A config/sql/_all/mysql-upgrade-3.1-3.1.1.sql
    R config/sql/_all/oracle-3.1-all.sql
    A config/sql/_all/oracle-3.1.1-all.sql
    A config/sql/_all/oracle-upgrade-3.1-3.1.1.sql
    R config/sql/_all/postgresql-3.1-all.sql
    A config/sql/_all/postgresql-3.1.1-all.sql
    A config/sql/_all/postgresql-upgrade-3.1-3.1.1.sql
    R config/sql/_all/sqlserver-3.1-all.sql
    A config/sql/_all/sqlserver-3.1.1-all.sql
    A config/sql/_all/sqlserver-upgrade-3.1-3.1.1.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    R config/sql/activiti/activiti.mysql55.create.engine.sql
    R 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
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    R config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/PageBase_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/login/PageLogin_en_US.utf8.properties
    M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/page/PageTemplate_es_ES.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/PageBase_sk_SK.utf8.properties
    M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel_tr_TR.utf8.properties
    M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/PageBase_tr_TR.utf8.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties
    R gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_tr_TR.utf8.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_tr_TR.utf8.properties
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java
    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/assignment/AssignmentSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/GenericMultiValueLabelEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/AutoCompleteTextPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/AutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DatePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/SecurityQuestionPAnel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.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/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.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/prism/ValueWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FutureUpdateBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.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/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.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/SynchronizationStep.html
    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/MappingTypeDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyPasswordQuestionsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyPasswordQuestionsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordQuestionsDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/SecurityQuestionAnswerDTO.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageNewReport.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/JasperReportConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.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/content/PageAccount.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyDialog.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/MultiplicityPolicyDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgPopupContent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgPopupContent.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/dto/QuestionDTO.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/dto/SecretQuestionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.properties
    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/resources/initial-objects/010-value-policy.xml
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    R gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    R gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    R gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M gui/admin-gui/src/main/resources/logback.xml
    A gui/admin-gui/src/main/webapp/PageSecurityQuestions.html
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M gui/pom.xml
    M infra/common/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.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/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/prism/.gitignore
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PartiallyResolvedItem.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PartiallyResolvedDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ReferenceDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.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
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessorEvaluationMode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.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/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismContainerArrayList.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/.gitignore
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainer.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ParamsTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/private/fake/fake-1.wsdl
    A infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/fault-3.wsdl
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-3.xsd
    A infra/schema/src/main/resources/xml/ns/public/report/extension-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSerialization.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/schema/src/test/resources/common/lookup-table.xml
    M infra/schema/src/test/resources/common/role.xml
    M infra/schema/testng.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    A infra/test-util/src/main/java/com/evolveum/midpoint/test/util/LogfileTestTailer.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif
    M infra/util/.gitignore
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/SerializationUtil.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/Validator.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/exception/AuthorizationException.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/exception/ConsistencyViolationException.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/exception/NoFocusNameSchemaException.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/ModelService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedConstruction.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-common/pom.xml
    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/ExpressionEvaluationContext.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ItemDeltaItem.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ObjectDeltaObject.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Source.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/SourceTriple.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AsIsExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AsIsExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/LiteralExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/LiteralExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingComplex.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelConstants.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelObjectResolver.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/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebServiceRaw.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/SystemConfigurationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandler.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/importer/ObjectImporter.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/AssignmentPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathVariables.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/Clockwork.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/EvaluatedAbstractRoleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensDebugListener.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.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/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluationHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluatorHelperParams.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingExtractor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingInitializer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/DiscoverConnectorsExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallback.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/PasswordCallbackException.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SecurityHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/WsFaultListener.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-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.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/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorAddUser.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockLensDebugListener.java
    M model/model-impl/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.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/TestMultiConnector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.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/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/AbstractGenericSyncTest.java
    M 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
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/BadImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportRefTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.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/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java
    M model/model-intest/src/test/resources/common/lookup-languages.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
    A model/model-intest/src/test/resources/common/security-policy.xml
    M model/model-intest/src/test/resources/common/system-configuration-with-template.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/gensync/lookup-languages-replacement.xml
    M model/model-intest/src/test/resources/gensync/lookup-role-type.xml
    A model/model-intest/src/test/resources/gensync/role-prisoner.xml
    A model/model-intest/src/test/resources/gensync/user-otis.xml
    M model/model-intest/src/test/resources/importer/import-ref.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/schema/piracy.xsd
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    R model/model-test/src/main/java/com/evolveum/midpoint/model/test/LogfileTestTailer.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/WorkflowListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/workflow/DefaultWorkflowEventCreator.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/BaseHelper.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportConstants.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportManager.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportService.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointClientConfiguration.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    A model/report-ds-impl/src/main/resources/client.properties
    A model/report-ds-impl/src/main/resources/ctx-report-ds-context.xml
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfConfiguration.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WfHook.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/addrole/AddRoleVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalLevelImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyAssignment/AssignmentModification.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyResourceAssignment/ResourceAssignmentModification.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/modifyRoleAssignment/AbstractRoleAssignmentModification.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExpressionHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GeneralChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/WfPrepareRootOperationTaskHandler.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAbstractRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAbstractRoleResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserAbstractRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AddUserResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/AssignmentHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAbstractRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAbstractRoleResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserAbstractRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ModifyUserResourceAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/ResourceAssignmentHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/assignments/RoleAssignmentHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddAbstractRoleAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddObjectAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddResourceAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/objects/AddUserAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/other/ChangePasswordAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ChangePasswordAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyResourceAssignmentAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyRoleAssignmentAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/PrimaryUserChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/JaxbValueContainer.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SerializationSafeContainer.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/SingleItemSerializationSafeContainerImpl.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/AbstractWfTest.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestCreateOrg.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/common/system-configuration.xml
    A model/workflow-impl/src/test/resources/org-test1.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    M model/workflow-impl/testng.xml
    M pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    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
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/ProvisioningTestUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyPrioritiesAndReadReplace.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventStage.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/CarefulAnt.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/ResourceCarefulAntUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyAssignmentTest.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/java/com/evolveum/midpoint/repo/sql/ResourceModifyTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/UserPhotoTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml
    M repo/repo-sql-impl-test/src/test/resources/config-test.xml
    M repo/repo-sql-impl-test/src/test/resources/logback-test.xml
    A repo/repo-sql-impl-test/src/test/resources/logging.properties
    A repo/repo-sql-impl-test/src/test/resources/photo/t001-add-employeeType.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t002-remove-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t003-re-add-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t004-change-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t005-add-photo-by-add.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t006-add-photo-by-add-other.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t007-remove-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t008-remove-other-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/user.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    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/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtBoolean.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/Container.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtBooleanId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAssignmentExtensionId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RContainerId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtBooleanId.java
    M 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/query/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/GetObjectResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.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/AuthorizationConstants.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M repo/system-init/pom.xml
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockSingleTaskHandler.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M samples/demo-generic synchronization/resource-GenSync-CSV.xml
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/demo-rs/resource-csv-source.xml
    M samples/demo-rs/resource-csv-xxx.xml
    M samples/demo-rs/resource-ldap-opendj.xml
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/common-3.xsd
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    A samples/objects/lookup-employee-type.xml
    A samples/objects/lookup-languages.xml
    A samples/objects/lookup-role-types.xml
    M samples/objects/object-template-role.xml
    A samples/objects/object-template-user-structured.xml
    M samples/objects/security-policy.xml
    A samples/objects/user-jack-with-password-no-oid.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/ad/ad-resource-groups-advanced.xml
    M samples/resources/ad/ad-resource-groups-basic.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    M samples/resources/csvfile/localhost-csvfile-resource-import.xml
    M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.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/piracy/opendj-localhost-resource-sync-extension-pirates.xml
    M samples/resources/openldap/config.ldif
    M samples/resources/openldap/example.ldif
    M samples/resources/openldap/openldap-localhost-medium.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-nosync.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-simple.xml
    M samples/rest/opendj-resource-sync.xml
    M testing/consistency-mechanism/.gitignore
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
    A testing/consistency-mechanism/src/test/resources/request/usersOu.ldif
    A testing/minipoint/pom.xml
    A testing/minipoint/src/main/java/com/evolveum/midpoint/testing/minipoint/Main.java
    A testing/minipoint/src/main/resources/ctx-minipoint-main.xml
    A testing/minipoint/src/main/resources/ctx-minipoint.xml
    A testing/minipoint/testng.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/rest/src/test/resources/logback-test.xml
    A testing/rest/src/test/resources/repo/role-adder.xml
    A testing/rest/src/test/resources/repo/role-modifier.xml
    A testing/rest/src/test/resources/repo/role-reader.xml
    A testing/rest/src/test/resources/repo/role-rest.xml
    A testing/rest/src/test/resources/repo/role-superuser.xml
    M testing/rest/src/test/resources/repo/system-configuration.xml
    M testing/rest/src/test/resources/repo/user-administrator.xml
    A testing/rest/src/test/resources/repo/user-cyclops.xml
    A testing/rest/src/test/resources/repo/user-darthadder.xml
    A testing/rest/src/test/resources/repo/user-nobody.xml
    A testing/rest/src/test/resources/repo/user-nopassword.xml
    A testing/rest/src/test/resources/repo/user-somebody.xml
    A testing/rest/src/test/resources/req/modification-assign-role-modifier.xml
    A testing/rest/src/test/resources/req/modification-disable.xml
    A testing/rest/src/test/resources/req/modification-enable.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    A testing/wstest/pom.xml
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/ClientPasswordHandler.java
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSanity.java
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSecurity.java
    A testing/wstest/src/test/resources/common/resource-opendj.xml
    A testing/wstest/src/test/resources/common/role-adder.xml
    A testing/wstest/src/test/resources/common/role-modifier.xml
    A testing/wstest/src/test/resources/common/role-reader.xml
    A testing/wstest/src/test/resources/common/role-ws.xml
    A testing/wstest/src/test/resources/common/user-cyclops.xml
    A testing/wstest/src/test/resources/common/user-darthadder.xml
    A testing/wstest/src/test/resources/common/user-jack.xml
    A testing/wstest/src/test/resources/common/user-nobody.xml
    A testing/wstest/src/test/resources/common/user-nopassword.xml
    A testing/wstest/src/test/resources/common/user-somebody.xml
    A testing/wstest/src/test/resources/ctx-wstest-main.xml
    A testing/wstest/src/test/resources/ctx-wstest.xml
    A testing/wstest/src/test/resources/logback-test.xml
    A testing/wstest/src/test/resources/logging.properties
    A testing/wstest/testng.xml
    M tools/repo-ninja/src/test/resources/midpoint-home/config.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

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


  Commit: 3295315b93564b8a491f7df521ce2ebeeb92424b
      https://github.com/Evolveum/midpoint/commit/3295315b93564b8a491f7df521ce2ebeeb92424b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

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

  Log Message:
  -----------
  Fixing NPE


  Commit: 813166c6bcf8c737c6fe8b20c43b17dde66fd593
      https://github.com/Evolveum/midpoint/commit/813166c6bcf8c737c6fe8b20c43b17dde66fd593
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M model/model-intest/src/test/resources/importer/import-ref.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/request/account-angelika.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml

  Log Message:
  -----------
  Fixing some tests.


  Commit: efeae529eb30f3c9facf66dbbb2a43679a45bce2
      https://github.com/Evolveum/midpoint/commit/efeae529eb30f3c9facf66dbbb2a43679a45bce2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Test cosmetics


  Commit: e4a98e374113543b8f44dde638fcf19c5147e2a2
      https://github.com/Evolveum/midpoint/commit/e4a98e374113543b8f44dde638fcf19c5147e2a2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java

  Log Message:
  -----------
  Fixing OpenDJ test. Which makes it fail. As it should.


  Commit: 11f2b38a1e2a1a80b1179bfa454b9b285f86400b
      https://github.com/Evolveum/midpoint/commit/11f2b38a1e2a1a80b1179bfa454b9b285f86400b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml

  Log Message:
  -----------
  Extended the test, fixing resource definition.


  Commit: 131b8eb5046dd405f5097b02abf7d6bf46422c05
      https://github.com/Evolveum/midpoint/commit/131b8eb5046dd405f5097b02abf7d6bf46422c05
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/logback-test.xml
    M testing/sanity/src/test/resources/repo/resource-opendj.xml

  Log Message:
  -----------
  Fixing sanity


  Commit: 8f7986f6d3dfa0ad3d26d15b619c0d7b93d8a216
      https://github.com/Evolveum/midpoint/commit/8f7986f6d3dfa0ad3d26d15b619c0d7b93d8a216
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.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/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-bind-dn.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-credentials.xml
    M testing/conntest/src/test/resources/common/resource-openldap.xml

  Log Message:
  -----------
  Tests for LDAP bind errors


  Commit: d2c6eaf5e8eeb0e7f3284d47eb53a6e4e4bb0b27
      https://github.com/Evolveum/midpoint/commit/d2c6eaf5e8eeb0e7f3284d47eb53a6e4e4bb0b27
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    A samples/resources/openldap/barbossa-disable.ldif
    A samples/resources/openldap/barbossa-enable.ldif
    A samples/resources/openldap/midpoint-schema-example-mod.ldif
    A samples/resources/openldap/midpoint.schema
    A samples/resources/openldap/olcAccess.ldif

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


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    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/ucf/api/ConnectorInstance.java
    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/IcfUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M samples/resources/openldap/olcAccess.ldif
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  better handling of connector security exceptions


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

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java

  Log Message:
  -----------
  Fixing LDAP conntests


  Commit: 99284ddbd42a9bd2e25001eb71d59c69aceda401
      https://github.com/Evolveum/midpoint/commit/99284ddbd42a9bd2e25001eb71d59c69aceda401
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultMetadata.java
    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/ucf/impl/ConnectorInstanceIcfImpl.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java

  Log Message:
  -----------
  partialResults in SearchResultMetadata


  Commit: cdd5273bed990b3ae533a865f85e3a2ab387df75
      https://github.com/Evolveum/midpoint/commit/cdd5273bed990b3ae533a865f85e3a2ab387df75
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java

  Log Message:
  -----------
  Sizelimit test


  Commit: 21bb734ee11aff5548da498fc8e9383aa3ced993
      https://github.com/Evolveum/midpoint/commit/21bb734ee11aff5548da498fc8e9383aa3ced993
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InfraInitialSetup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
    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/ACAttributePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/LabeledBookmarkableLink.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/TopMenuBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OperationResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ContainerValueDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/DeltaDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ModificationsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionContent.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionContent.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionItem.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionItem.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionPanel.js
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/option/OptionPanelHidde.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorHostTypeComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorTypeComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SynchronizationActionTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfigurationLogging.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordAccountDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UserProfileStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A samples/resources/liferay/liferay-localhost-medium.xml
    A samples/resources/liferay/liferay-localhost-sync.xml

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


  Commit: eb594e4568efff67cd858bbe5bd1d5a69867aa7e
      https://github.com/Evolveum/midpoint/commit/eb594e4568efff67cd858bbe5bd1d5a69867aa7e
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-22 (Fri, 22 May 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java

  Log Message:
  -----------
  Modify and rename test


  Commit: 7ab2b8f78ad67734b8bcd98f8a06bffe7dcb323b
      https://github.com/Evolveum/midpoint/commit/7ab2b8f78ad67734b8bcd98f8a06bffe7dcb323b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-25 (Mon, 25 May 2015)

  Changed paths:
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    A testing/conntest/src/test/resources/389ds/resource-localhost.xml
    A testing/conntest/src/test/resources/389ds/task-sync.xml
    R testing/conntest/src/test/resources/common/resource-389ds-localhost.xml
    R testing/conntest/src/test/resources/common/resource-opendj.xml
    R testing/conntest/src/test/resources/common/resource-openldap.xml
    A testing/conntest/src/test/resources/opendj/resource.xml
    A testing/conntest/src/test/resources/opendj/task-sync.xml
    A testing/conntest/src/test/resources/openldap/resource.xml
    A testing/conntest/src/test/resources/openldap/task-sync.xml

  Log Message:
  -----------
  Refactore conntest files. Sync tests (in progress)


  Commit: eb1f9fe813928b37ae81063aa959843e356bac94
      https://github.com/Evolveum/midpoint/commit/eb1f9fe813928b37ae81063aa959843e356bac94
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    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/CapabilityStep.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/capability/CapabilityActivationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    A samples/demo-rs/org-extern.xml

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


  Commit: 8940a0ae15f3ab0c3301a76765e9d4422135c304
      https://github.com/Evolveum/midpoint/commit/8940a0ae15f3ab0c3301a76765e9d4422135c304
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/opendj/resource.xml

  Log Message:
  -----------
  More sync tests


  Commit: 276a4b345ef5638c79ecb2de357d2e37270990e3
      https://github.com/Evolveum/midpoint/commit/276a4b345ef5638c79ecb2de357d2e37270990e3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-26 (Tue, 26 May 2015)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/resources/389ds/resource-localhost.xml
    M testing/conntest/src/test/resources/common/system-configuration.xml
    M testing/conntest/src/test/resources/logback-test.xml
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/conntest/src/test/resources/openldap/resource.xml

  Log Message:
  -----------
  Improved sync tests


  Commit: a571a7b2c4a2591b3a598e550196c3636d40bec6
      https://github.com/Evolveum/midpoint/commit/a571a7b2c4a2591b3a598e550196c3636d40bec6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluator.java
    A model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ReferenceSearchExpressionEvaluatorFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/actions/RecomputeExecutor.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStructMeta.java
    M model/model-intest/src/test/resources/orgstruct/object-template-org.xml
    A model/model-intest/src/test/resources/orgstruct/org-fictional.xml
    A samples/tasks/bulk-actions/recompute-selected-orgs.xml

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


  Commit: f977d8d3a6cafb0976d7412d90bdd32778885cfb
      https://github.com/Evolveum/midpoint/commit/f977d8d3a6cafb0976d7412d90bdd32778885cfb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java

  Log Message:
  -----------
  Fixing test to tolerate OpenDJ VLV bug


  Commit: 1eca6453aacc84dbab028059e4e983e665b582fc
      https://github.com/Evolveum/midpoint/commit/1eca6453aacc84dbab028059e4e983e665b582fc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-28 (Thu, 28 May 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/resources/common/system-configuration.xml
    A testing/conntest/src/test/resources/opendj/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/openldap/task-sync-inetorgperson.xml

  Log Message:
  -----------
  More progress on conntests


  Commit: 047595896b398a39f7a312f39862e4c16cdf1010
      https://github.com/Evolveum/midpoint/commit/047595896b398a39f7a312f39862e4c16cdf1010
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/resources/opendj/resource.xml

  Log Message:
  -----------
  Extended synchronization tests


  Commit: 822b70ff46505f21ae87c757c2c987ad47e87395
      https://github.com/Evolveum/midpoint/commit/822b70ff46505f21ae87c757c2c987ad47e87395
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-05-29 (Fri, 29 May 2015)

  Changed paths:
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    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/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/TestDummy.java

  Log Message:
  -----------
  Support for synchronization of ANY object class in provisioning (MID-2384)


  Commit: 120b6396c2c22aba7c1292ebd9995314c525c3fb
      https://github.com/Evolveum/midpoint/commit/120b6396c2c22aba7c1292ebd9995314c525c3fb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

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

  Log Message:
  -----------
  Fixing NPE


  Commit: 26bfbeecdedf107c230cdf678a962e4908dc4ffc
      https://github.com/Evolveum/midpoint/commit/26bfbeecdedf107c230cdf678a962e4908dc4ffc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    A testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    A testing/sanity/src/test/resources/repo/resource-opendj-legacy.xml
    A testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
    A testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
    A testing/sanity/src/test/resources/request/account-angelika-legacy.xml

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


  Commit: 8539902ea6830ab5372361438c6cd4edacaab7a2
      https://github.com/Evolveum/midpoint/commit/8539902ea6830ab5372361438c6cd4edacaab7a2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M build-system/pom.xml
    M testing/sanity/pom.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/sanity/src/test/resources/repo/resource-opendj-legacy.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
    M testing/sanity/testng.xml

  Log Message:
  -----------
  Fixing parts of TestSanityLegacy


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

  Changed paths:
    A testing/sanity/src/test/resources/request/user-modify-add-account-legacy.xml

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


  Commit: 8033b7f3dedfed08fcf917f9c9ccb8f1af2a19f7
      https://github.com/Evolveum/midpoint/commit/8033b7f3dedfed08fcf917f9c9ccb8f1af2a19f7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java

  Log Message:
  -----------
  Fixing legacy sanity


  Commit: 3f1f13f10ed3ca73a8cac93a17da156a4a9e9b27
      https://github.com/Evolveum/midpoint/commit/3f1f13f10ed3ca73a8cac93a17da156a4a9e9b27
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-02 (Tue, 02 Jun 2015)

  Changed paths:
    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:
  -----------
  Fixing OpenDJ samples


  Commit: 44b9fb7a06b5e74f85deca977f3eb5f2f4531503
      https://github.com/Evolveum/midpoint/commit/44b9fb7a06b5e74f85deca977f3eb5f2f4531503
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Support for nativeAttributeName and frameworkAttributeName


  Commit: 185f846a5ddd63b529f03ce14f1b37c7ebdcc0c6
      https://github.com/Evolveum/midpoint/commit/185f846a5ddd63b529f03ce14f1b37c7ebdcc0c6
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Fixing secondary identifiers, improving the tests


  Commit: 51929c067686ad4323aa390b6941808c59ce530b
      https://github.com/Evolveum/midpoint/commit/51929c067686ad4323aa390b6941808c59ce530b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.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/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/FilterInterpreter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/ProvisioningTestUtil.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/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-bad.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-disable-simulated-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-morgan.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-disabled.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-with-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-opendj-no-sn.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search-iterative.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/group-swashbucklers.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-complex-filter.xml
    R provisioning/provisioning-impl/src/test/resources/impl/query-complex-filter.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-create.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-delete.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-read.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-update.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Support for native attribute names (in progress)


  Commit: 299e33d82ae3baf5d80d4cc0bf80f5f47bdbeff5
      https://github.com/Evolveum/midpoint/commit/299e33d82ae3baf5d80d4cc0bf80f5f47bdbeff5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-05 (Fri, 05 Jun 2015)

  Changed paths:
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_en_US.utf8.properties
    M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions_tr_TR.utf8.properties
    M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_tr_TR.utf8.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword_tr_TR.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageShowPassword.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.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/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ShadowConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DebugReconciliationTaskResultListener.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/sync/resource-dummy-uuid.xml
    A model/model-intest/src/test/resources/sync/task-reconcile-dummy-uuid.xml
    M model/model-intest/testng.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M samples/objects/security-policy.xml

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


  Commit: 9ffcbdca8d54f73569557cc6e557fbd81539addc
      https://github.com/Evolveum/midpoint/commit/9ffcbdca8d54f73569557cc6e557fbd81539addc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-08 (Mon, 08 Jun 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd

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


  Commit: 4455df50d5a2ebce4c9896648182787973772ddf
      https://github.com/Evolveum/midpoint/commit/4455df50d5a2ebce4c9896648182787973772ddf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-08 (Mon, 08 Jun 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/ProvisioningTestUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.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/TestCsvFile.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnore.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnoreUpcaseName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNoActivation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyPrioritiesAndReadReplace.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyReadReplaceForAll.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummySchemaless.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuid.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestSynchronization.java
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-initialized.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Fixes for nicer attribute names. Some test cleanup.


  Commit: b369437d2aaf1bee5b51f8027eeda71107e95bfc
      https://github.com/Evolveum/midpoint/commit/b369437d2aaf1bee5b51f8027eeda71107e95bfc
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M testing/sanity/src/test/resources/repo/resource-opendj.xml

  Log Message:
  -----------
  Fixing provisioning tests


  Commit: 11be7a8e58e89cf164be3426e0f2d311c6c09f24
      https://github.com/Evolveum/midpoint/commit/11be7a8e58e89cf164be3426e0f2d311c6c09f24
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/request/account-angelika.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml

  Log Message:
  -----------
  Fixing sanity


  Commit: 34a766e23cbe06048190f5feb4d57487d1888d64
      https://github.com/Evolveum/midpoint/commit/34a766e23cbe06048190f5feb4d57487d1888d64
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java

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


  Commit: 3ff0fd9aa552aa3ffc24d9b511b9b113ce193717
      https://github.com/Evolveum/midpoint/commit/3ff0fd9aa552aa3ffc24d9b511b9b113ce193717
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/conntest/src/test/resources/openldap/resource.xml

  Log Message:
  -----------
  Some conntest fixes


  Commit: 10af5ac2c2d540d273883c7a65e1e86f50af9ab7
      https://github.com/Evolveum/midpoint/commit/10af5ac2c2d540d273883c7a65e1e86f50af9ab7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/resources/common/system-configuration.xml

  Log Message:
  -----------
  Support for ANY object classes in sync (MID-2384) in progress


  Commit: 24f45becff15d5d2409e55177a17ed90b7377df2
      https://github.com/Evolveum/midpoint/commit/24f45becff15d5d2409e55177a17ed90b7377df2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SingleButtonPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DirectlyEditablePropertyColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/MultiButtonColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/SingleButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageAdminCertification.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDtoProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandler.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/CertGuiHandlerRegistry.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/handlers/DirectAssignmentCertGuiHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/WebModelUtils.java
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/test/resources/ctx-test.xml
    A infra/common/src/main/java/com/evolveum/midpoint/common/SystemConfigurationHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.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/query/AllFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NoneFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.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/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismContainerArrayList.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ActivationUtil.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CertCampaignTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    A model/certification-api/pom.xml
    A model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationApiConstants.java
    A model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/AccessCertificationEventListener.java
    A model/certification-api/src/main/java/com/evolveum/midpoint/certification/api/CertificationManager.java
    A model/certification-api/testng.xml
    A model/certification-impl/pom.xml
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertEventHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertGeneralHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertQueryHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertResponseComputationHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertReviewersHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertUpdateHelper.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageApproachingTriggerHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationCloseStageTriggerHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationConstants.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccessCertificationRemediationTaskHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/CertificationManagerImpl.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/BaseCertificationHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/CertificationHandler.java
    A model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/handlers/DirectAssignmentCertificationHandler.java
    A model/certification-impl/src/main/resources/ctx-certification.xml
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/BasicCertificationTest.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/CriticalRolesCertificationTest.java
    A model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/RoleInducementCertificationTest.java
    A model/certification-impl/src/test/resources/common/certification-of-critical-roles.xml
    A model/certification-impl/src/test/resources/common/certification-of-eroot-user-assignments.xml
    A model/certification-impl/src/test/resources/common/certification-of-role-inducements.xml
    A model/certification-impl/src/test/resources/common/metarole-cxo.xml
    A model/certification-impl/src/test/resources/common/orgs-and-users.xml
    A model/certification-impl/src/test/resources/common/resource-dummy-black.xml
    A model/certification-impl/src/test/resources/common/resource-dummy.xml
    A model/certification-impl/src/test/resources/common/role-ceo.xml
    A model/certification-impl/src/test/resources/common/role-coo.xml
    A model/certification-impl/src/test/resources/common/role-superuser.xml
    A model/certification-impl/src/test/resources/common/system-configuration.xml
    A model/certification-impl/src/test/resources/common/user-administrator.xml
    A model/certification-impl/src/test/resources/common/user-assignment-more-reviewers-certification.xml
    A model/certification-impl/src/test/resources/common/user-jack.xml
    A model/certification-impl/src/test/resources/ctx-model-test-main.xml
    A model/certification-impl/src/test/resources/logback-test.xml
    A model/certification-impl/testng.xml
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/AccessCertificationService.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/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.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/TestOrgStruct.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/AccessCertificationEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertCampaignEvent.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertCampaignStageEvent.java
    A model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/CertReviewEvent.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/AccountOperationListener.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/CertificationListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/SimpleObjectRefImpl.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/cert/CertEventFactory.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/BaseHelper.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/CertHelper.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountPasswordNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/GeneralNotifier.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignNotifier.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleCampaignStageNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleFocalObjectNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleResourceObjectNotifier.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleReviewerNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleWorkflowNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/UserPasswordNotifier.java
    M model/pom.xml
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationCampaign.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAccessCertificationDefinition.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/AbstractIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskCategory.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    A samples/certification/def-all-user-assignments.xml
    A samples/certification/def-role-inducements.xml

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

Conflicts:
	infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java


  Commit: 44ecf1f915421ec7d2b30f4a51bf62fe7e4efd28
      https://github.com/Evolveum/midpoint/commit/44ecf1f915421ec7d2b30f4a51bf62fe7e4efd28
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/test/resources/common/task-reconcile-dummy.xml
    M provisioning/provisioning-impl/pom.xml
    M testing/conntest/pom.xml
    M testing/longtest/pom.xml
    M testing/sanity/pom.xml
    M testing/story/pom.xml

  Log Message:
  -----------
  Fixed test logging, fixed recon handler to check for objectclass, fixed TestScriptRecon


  Commit: e4093f574e38454550981bfb8703388991f81911
      https://github.com/Evolveum/midpoint/commit/e4093f574e38454550981bfb8703388991f81911
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-10 (Wed, 10 Jun 2015)

  Changed paths:
    M build-system/pom.xml
    M model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
    M model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
    M model/model-intest/src/test/resources/common/task-dumy-livesync.xml
    M model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
    M model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
    M model/model-intest/src/test/resources/common/task-reconcile-dummy.xml
    M model/model-intest/src/test/resources/sync/task-dummy-byzantine-livesync.xml
    M model/model-intest/src/test/resources/sync/task-dummy-byzantine-recon.xml
    M model/model-intest/src/test/resources/sync/task-dummy-emerald-livesync.xml
    M model/model-intest/src/test/resources/sync/task-dummy-emerald-recon.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-lime.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-single.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-uuid.xml

  Log Message:
  -----------
  Fixing model-intest


  Commit: e164508cda4f19aad27771e1116ef84200a2a9b9
      https://github.com/Evolveum/midpoint/commit/e164508cda4f19aad27771e1116ef84200a2a9b9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M testing/sanity/src/test/resources/repo/task-derby-reconciliation.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
    M testing/story/src/test/resources/orgsync/resource-opendj.xml
    M testing/story/src/test/resources/orgsync/task-reconcile-opendj-default-single.xml

  Log Message:
  -----------
  Fixing sanity test


  Commit: 3e95f54becb944d4f15965248f9b7a3038404d06
      https://github.com/Evolveum/midpoint/commit/3e95f54becb944d4f15965248f9b7a3038404d06
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/resources/common/resource-opendj-complex.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/common/resource-opendj-university.xml
    M testing/longtest/src/test/resources/common/resource-opendj-vlv.xml
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/longtest/src/test/resources/ldap/role-pirate.xml
    M testing/longtest/src/test/resources/logging.properties
    M testing/story/pom.xml
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    M testing/story/src/test/resources/uuid/resource-opendj.xml
    M testing/story/src/test/resources/uuid/role-client.xml
    M testing/story/src/test/resources/village/resource-opendj.xml

  Log Message:
  -----------
  Fixing parts of long and story tests


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

  Changed paths:
    A samples/demo/PageLogin.html
    A samples/demo/PageTemplate.html
    A samples/demo/lookup-empl-type.xml
    A samples/demo/orgs-metaRole.xml
    A samples/demo/orgs-objectTemplate.xml
    A samples/demo/orgs-objectType.xml
    A samples/demo/orgs-sync.xml
    A samples/demo/orgs.ldif
    A samples/demo/projects-metaRole.xml
    A samples/demo/projects-objectTemplate.xml
    A samples/demo/projects-objectType.xml
    A samples/demo/projects.ldif
    M samples/demo/user-template.xml
    A samples/demo/web.xml
    A samples/resources/liferay/extension-accountAuthorization.xsd
    A samples/resources/liferay/liferay-localhost-advanced.xml
    M samples/resources/liferay/liferay-localhost-medium.xml
    A samples/resources/liferay/liferay-localhost-metarole-orgs.xml
    A samples/resources/liferay/liferay-localhost-metarole-roles.xml

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


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

  Changed paths:
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java

  Log Message:
  -----------
  Fixing TestGenericSynchronization


Compare: https://github.com/Evolveum/midpoint/compare/a7eba6b97998...ca0cc8aa53ca


More information about the midPoint-svn mailing list