[midPoint-git] [Evolveum/midpoint] 024638: Replacing String constants in MP form validator im...

[Radovan Semancik]

  Branch: refs/heads/ldap
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0246381c44c5c331f706e3d005b77da0dd29491b
      https://github.com/Evolveum/midpoint/commit/0246381c44c5c331f706e3d005b77da0dd29491b
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-04 (Wed, 04 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorImpl.java

  Log Message:
  -----------
  Replacing String constants in MP form validator impl. with values from schema.


  Commit: 309eb87c42e4c4d0ae44c9a8658728aca21d785f
      https://github.com/Evolveum/midpoint/commit/309eb87c42e4c4d0ae44c9a8658728aca21d785f
  Author: Jan Marcek <jan.marcek at eea.sk>
  Date:   2015-03-05 (Thu, 05 Mar 2015)

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  bugfix: midPoint Distribution - set correct dependency com.evolveum.midpoint.infra.prism and com.evolveum.midpoint.infra.schema to ${project.version}


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

  Changed paths:
    M build-system/pom.xml
    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/resources/ctx-model.xml

  Log Message:
  -----------
  Support for Pyhon expressions


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

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  Merge branch 'v3.1-fix-dependency' of https://github.com/OpenDataNode/odn-midpoint into OpenDataNode-v3.1-fix-dependency

Conflicts:
	dist/pom.xml


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

  Changed paths:
    M dist/pom.xml

  Log Message:
  -----------
  Merge branch 'OpenDataNode-v3.1-fix-dependency'


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

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java

  Log Message:
  -----------
  Fixing conntest OpenLDAP scripts


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

  Changed paths:
    M testing/conntest/pom.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/TestOpenLdap.java

  Log Message:
  -----------
  Extending OpenLDAP conntest


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

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

  Log Message:
  -----------
  Fixing getEditObjectDefinition(Shadow) problem (MID-2244)


  Commit: ba8646646a6229164237d65d17282ddca4a443bd
      https://github.com/Evolveum/midpoint/commit/ba8646646a6229164237d65d17282ddca4a443bd
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

  Log Message:
  -----------
  MID-2220 fix


  Commit: 548da2bed43142b6088d233bc67507b2b56c634a
      https://github.com/Evolveum/midpoint/commit/548da2bed43142b6088d233bc67507b2b56c634a
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M dist/pom.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M testing/conntest/pom.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/TestOpenLdap.java

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


  Commit: 91a89f46a60874bd440135f46dc2a3655b378de5
      https://github.com/Evolveum/midpoint/commit/91a89f46a60874bd440135f46dc2a3655b378de5
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    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-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    A model/model-intest/src/test/resources/orgstruct/org-temp.xml

  Log Message:
  -----------
  Fixed MID-2242


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

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

  Log Message:
  -----------
  Improvinf OpenLDAP conntest


  Commit: 5780758d5b7989206d9cebb95158e7a3d990408b
      https://github.com/Evolveum/midpoint/commit/5780758d5b7989206d9cebb95158e7a3d990408b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

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

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


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

  Changed paths:
    M build-system/pom.xml
    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 testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/common/resource-openldap.xml

  Log Message:
  -----------
  Upgrading embedded test OpenDJ to 2.6.2


  Commit: b7c4d2de2dd83f7cc5a97f1862dbcca16e077631
      https://github.com/Evolveum/midpoint/commit/b7c4d2de2dd83f7cc5a97f1862dbcca16e077631
  Author: Igor Farinic <ifarinic at evolveum.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M weblogic-build/pom.xml
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

  Log Message:
  -----------
  Fixed midPoint startup in WLS12


  Commit: 1ce72041aa2181b0e56c51ecab52912c53230896
      https://github.com/Evolveum/midpoint/commit/1ce72041aa2181b0e56c51ecab52912c53230896
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    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/util/WebMiscUtil.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/EnumDisplayableValue.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 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

  Log Message:
  -----------
  support for enum in extension schema..


  Commit: 0bf5b535ff185dc6bf619d163c13b6c46fc941c9
      https://github.com/Evolveum/midpoint/commit/0bf5b535ff185dc6bf619d163c13b6c46fc941c9
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M build-system/pom.xml
    M dist/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/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/page/PageBase.java
    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/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/users/PageUser.java
    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/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    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/java/com/evolveum/midpoint/prism/util/PrismAsserts.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 infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    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
    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-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/java/com/evolveum/midpoint/model/common/expression/script/TestPythonExpressions.java
    M model/model-common/src/test/resources/expression/groovy/expression-objectref-variables.xml
    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-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/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/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/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    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/TestOrgStruct.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/TestSecurity.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/orgstruct/org-temp.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
    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
    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/conntest/pom.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/TestOpenLdap.java
    M testing/conntest/src/test/resources/common/resource-openldap.xml
    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
    M weblogic-build/pom.xml
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

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


  Commit: e1b05535ddcc4bf5707ad05e7716b542e6831fe6
      https://github.com/Evolveum/midpoint/commit/e1b05535ddcc4bf5707ad05e7716b542e6831fe6
  Author: Igor Farinic <ifarinic at evolveum.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

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

  Log Message:
  -----------
  fix for MID-2245


  Commit: 1ba1fc81ff4af2865b19ba87f2d8117d63707d9d
      https://github.com/Evolveum/midpoint/commit/1ba1fc81ff4af2865b19ba87f2d8117d63707d9d
  Author: Igor Farinic <ifarinic at evolveum.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    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/util/WebMiscUtil.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/EnumDisplayableValue.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 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

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


  Commit: e425263a4f9a7bf180eb0ae41d39414eb9fa513f
      https://github.com/Evolveum/midpoint/commit/e425263a4f9a7bf180eb0ae41d39414eb9fa513f
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/EnumDisplayableValue.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/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

  Log Message:
  -----------
  fixing tests + setting default value according to schema


  Commit: 4686ef6fe41cbe8ca98d4a698b25502e79912e04
      https://github.com/Evolveum/midpoint/commit/4686ef6fe41cbe8ca98d4a698b25502e79912e04
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

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

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


  Commit: 8fc5fc299970de8f2a51821bb214d34d4af5cc3a
      https://github.com/Evolveum/midpoint/commit/8fc5fc299970de8f2a51821bb214d34d4af5cc3a
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-08 (Sun, 08 Mar 2015)

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

  Log Message:
  -----------
  converting schema defined default value to defined javatype


  Commit: 00e7c47ec29c830a391f2c0e829141f0be5148d5
      https://github.com/Evolveum/midpoint/commit/00e7c47ec29c830a391f2c0e829141f0be5148d5
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    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 model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java

  Log Message:
  -----------
  report configuration GUI


  Commit: f3e21c3752c490cdda7a0e290f57c3e82dbe929d
      https://github.com/Evolveum/midpoint/commit/f3e21c3752c490cdda7a0e290f57c3e82dbe929d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    A samples/tasks/bulk-actions/modify-selected-users-unassign-role.xml

  Log Message:
  -----------
  "Unassign" bulk action sample.


  Commit: 0141410bc36f2938c4134c970357271e2823dfdc
      https://github.com/Evolveum/midpoint/commit/0141410bc36f2938c4134c970357271e2823dfdc
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    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/page/admin/reports/PageReport.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/dto/JasperReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportFieldDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.java

  Log Message:
  -----------
  fixing MID-2247


  Commit: c0aadba781f00a3f08f8f35e208688aa212633cc
      https://github.com/Evolveum/midpoint/commit/c0aadba781f00a3f08f8f35e208688aa212633cc
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    A samples/tasks/bulk-actions/modify-selected-users-unassign-role.xml

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


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

  Changed paths:
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    A testing/conntest/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  OpenDJ connetst work in progress


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

  Changed paths:
    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/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/webapp/WEB-INF/web.xml
    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 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 weblogic-build/pom.xml
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

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


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

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.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 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/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/testng.xml

  Log Message:
  -----------
  A 4000-entry OpenDJ template used in conntests.


  Commit: 18023d772bd5c795b40a38a8ebb83e025f1ccbdc
      https://github.com/Evolveum/midpoint/commit/18023d772bd5c795b40a38a8ebb83e025f1ccbdc
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  Adding footer to midpoint.


  Commit: 68ea9c0056bb0b480490ccf34f9be6c68a0b6124
      https://github.com/Evolveum/midpoint/commit/68ea9c0056bb0b480490ccf34f9be6c68a0b6124
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.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 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/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/testng.xml

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


  Commit: c1f9b51b4c7f01093e65fcd305df69f1a19a2e89
      https://github.com/Evolveum/midpoint/commit/c1f9b51b4c7f01093e65fcd305df69f1a19a2e89
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java

  Log Message:
  -----------
  setting correct mime type for generated report..


  Commit: 42a98c6236ec7c25b7c0df1ebf336f213637a2d2
      https://github.com/Evolveum/midpoint/commit/42a98c6236ec7c25b7c0df1ebf336f213637a2d2
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    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/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.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 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/testng.xml

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


  Commit: 88e699e6113eea2fb6044efe7bf1f723b7dffcec
      https://github.com/Evolveum/midpoint/commit/88e699e6113eea2fb6044efe7bf1f723b7dffcec
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  RW bugfix for incorrect handling of itemPathTypes when editing resource attributes


  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


Compare: https://github.com/Evolveum/midpoint/compare/608545e1b7c1...d52850f3b0e0