Merge branch 'master' into feature/groovy-sandbox

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java

@@ -20,7 +20,9 @@
 
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.prism.polystring.PolyString;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -61,6 +63,8 @@ public class ValueChoosePanel<T, O extends ObjectType> extends BasePanel<T> {
 	private static final long serialVersionUID = 1L;
 
 	private static final Trace LOGGER = TraceManager.getTrace(ValueChoosePanel.class);
+	private static final String DOT_CLASS = ValueChoosePanel.class.getName() + ".";
+	protected static final String OPERATION_LOAD_REFERENCE_OBJECT_DISPLAY_NAME = DOT_CLASS + "loadReferenceObjectDisplayName";
 
 	private static final String ID_TEXT_WRAPPER = "textWrapper";
 	private static final String ID_TEXT = "text";
@@ -182,20 +186,27 @@ protected IModel<String> createTextModel() {
 			@Override
 			public String getObject() {
 				T ort = (T) model.getObject();
+				if (ort == null){
+					return createStringResource("ValueChoosePanel.undefined").getString();
+				}
 
 				if (ort instanceof PrismReferenceValue) {
 					PrismReferenceValue prv = (PrismReferenceValue) ort;
-					return prv == null ? null
-							: (prv.getTargetName() != null
-									? (prv.getTargetName().getOrig() + (prv.getTargetType() != null
-											? ": " + prv.getTargetType().getLocalPart() : ""))
-									: prv.getOid());
+					ObjectReferenceType objectReferenceType = new ObjectReferenceType();
+					objectReferenceType.setupReferenceValue((PrismReferenceValue) ort);
+					String targetObjectName = WebComponentUtil.getName(objectReferenceType,
+							ValueChoosePanel.this.getPageBase(), OPERATION_LOAD_REFERENCE_OBJECT_DISPLAY_NAME);
+					return StringUtils.isNotEmpty(targetObjectName)
+									? (targetObjectName + (prv.getTargetType() != null ? ": " + prv.getTargetType().getLocalPart() : ""))
+									: prv.getOid();
 				} else if (ort instanceof ObjectReferenceType) {
 					ObjectReferenceType prv = (ObjectReferenceType) ort;
-					return prv == null ? null
-							: (prv.getTargetName() != null ? (prv.getTargetName().getOrig()
-									+ (prv.getType() != null ? ": " + prv.getType().getLocalPart() : ""))
-									: prv.getOid());
+					String targetObjectName = WebComponentUtil.getName(prv,
+							ValueChoosePanel.this.getPageBase(), OPERATION_LOAD_REFERENCE_OBJECT_DISPLAY_NAME);
+
+					return StringUtils.isNotEmpty(targetObjectName) ?
+							(targetObjectName + (prv.getType() != null ? ": " + prv.getType().getLocalPart() : ""))
+							: prv.getOid();
 				} else if (ort instanceof ObjectViewDto) {
 					return ((ObjectViewDto) ort).getName();
 				}

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

@@ -256,18 +256,7 @@ private void initAccessBehaviour(InputPanel panel) {
 
 				@Override
 				public boolean isEnabled() {
-					ValueWrapper wrapper = getModel().getObject();
-					ItemWrapper itemWrapper = wrapper.getItem();
-					if (wrapper.isReadonly()) {
-						return false;
-					}
-					// if (itemWrapper.getParent() == null) {
-					// return true; // TODO
-					// }
-					ContainerWrapper object = itemWrapper.getParent();
-					ItemDefinition def = itemWrapper.getItem().getDefinition();
-
-					return object == null || isAccessible(def, object.getStatus());
+					return isValueEditable();
 				}
 
 				@Override
@@ -282,6 +271,21 @@ public void onComponentTag(Component component, ComponentTag tag) {
 		}
 	}
 
+	private boolean isValueEditable(){
+		ValueWrapper wrapper = getModel().getObject();
+		ItemWrapper itemWrapper = wrapper.getItem();
+		if (wrapper.isReadonly()) {
+			return false;
+		}
+		// if (itemWrapper.getParent() == null) {
+		// return true; // TODO
+		// }
+		ContainerWrapper object = itemWrapper.getParent();
+		ItemDefinition def = itemWrapper.getItem().getDefinition();
+
+		return object == null || isAccessible(def, object.getStatus());
+	}
+
 	private int countUsableValues(PropertyOrReferenceWrapper<? extends Item, ? extends ItemDefinition> property) {
 		int count = 0;
 		for (ValueWrapper value : property.getValues()) {
@@ -940,7 +944,7 @@ protected ObjectFilter createCustomFilter() {
 
 				@Override
 				protected boolean isEditButtonEnabled() {
-					return PrismValuePanel.this.getModel().getObject().isEditEnabled();
+					return PrismValuePanel.this.getModel().getObject().isEditEnabled() && isValueEditable();
 				}
 
 				@Override

gui/admin-gui/src/main/resources/localization/Midpoint.properties

@@ -4388,4 +4388,5 @@ PolyStringEditorPanel.defaultLabel=default
 PolyStringEditorPanel.keyLabel=key
 PolyStringEditorPanel.showLanguages=Show languages
 PolyStringEditorPanel.hideLanguages=Hide languages
-PolyStringEditorPanel.addLanguage=Add language
+PolyStringEditorPanel.addLanguage=Add language
+ValueChoosePanel.undefined=Undefined

gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties

@@ -62,7 +62,7 @@ AssignmentEditorPanel.tenantRef=Locataire
 AssignmentEditorPanel.undefined=Non défini
 AssignmentEditorPanel.metadataBlock={0} Métadonnées
 AssignmentEditorPanel.message.loadAttributes.fatalError=Une exception s'est produite pendant le chargement des propriétés d'attributions
-AssignmentEditorPanel.message.getReference.fatalError=Couldn't get account construction resource ref.
+AssignmentEditorPanel.message.getReference.fatalError=Impossible d'obtenir la référence de la ressource où construire le compte.
 AssignmentActivationPopupPanel.title=Activation
 AssignmentActivationPopupPanel.okButton=OK
 AssignmentActivationPopupPanel.cancelButton=Annuler
@@ -1747,7 +1747,7 @@ PageInternals.encryptionChecks=Contrôler le chiffrement
 PageInternals.readEncryptionChecks=Contrôler le chiffrement en lecture
 PageInternals.detailedDebugDump=Vidage du débogage détaillé
 PageInternals.message.debugUpdatePerformed=Outil de débogage mis à jour. Nouvelle valeur : {0}
-PageInternals.message.internalsConfigUpdate=Mise à jour de la configuration interne. Contrôle de la cohérence : {0}, contrôle du chiffrement : {1}, contrôle du chiffrement en lecture : {2}, QNameUtil.tolerateUndeclaredPrefixes : {3}.
+PageInternals.message.internalsConfigUpdate=Mise à jour de la configuration du fonctionnement interne. Contrôle de la cohérence : {0}, contrôle du chiffrement : {1}, contrôle du chiffrement en lecture : {2}, QNameUtil.tolerateUndeclaredPrefixes : {3}.
 PageInternals.offset=Décalage
 PageInternals.title.debugUtil=Outil de débogage
 PageInternals.title.internalsConfig=Configuration interne
@@ -3504,7 +3504,7 @@ AssignmentPanel.newAssignmentParameters=Paramètres
 AssignmentPanel.allLabel=Tout
 AssignmentPanel.viewTargetObject=Voir l'objet cible
 AssignmentPanel.newAssignmentTitle=Nouvelle contrainte sur la modification d'une attribution
-AssignmentPanel.newInducementTitle=New inducement
+AssignmentPanel.newInducementTitle=Nouvelle induction
 SearchPanel.more=Plus...
 SearchPanel.add=Ajouter
 SearchPanel.close=Fermer
@@ -4085,7 +4085,7 @@ CsvDownloadButtonPanel.export=Exporter en CSV
 CsvDownloadButtonPanel.confirmationMessage=La taille de l'export en CSV est limitée à {0} entrées. Continuer ?
 AssignmentEditorDto.policyRuleTitle=Règle de politique
 AssignmentEditorDto.message.prepareAssignmentAttributes.fatalError=Une exception s'est produite pendant le chargement des propriétés d'attributions.
-AssignmentEditorDto.message.getReference.fatalError=Couldn't get account construction resource ref.
+AssignmentEditorDto.message.getReference.fatalError=Impossible d'obtenir la référence de la ressource où construire le compte.
 AssignmentDataTablePanel.targetColumnName=Cible
 AssignmentDataTablePanel.validityColumnName=Validité
 AssignmentDataTablePanel.organizationColumnName=Organisation
@@ -4298,7 +4298,7 @@ WorkItemNotificationActionType.details.newValue=Action de notification pour un n
 ResourceObjectAssociationType.details.newValue=New resource object association
 ResourceAttributeDefinitionType.details.newValue=New resource attribute definition
 MappingType.details.newValue=Nouvelle correspondance
-FullTextSearchIndexedItemsConfigurationType.details.newValue=New full text search indexed items
+FullTextSearchIndexedItemsConfigurationType.details.newValue=Nouvelle configuration des éléments indexés pour la recherche en texte intégral
 objectState.details=État de l'objet
 assignmentState.details=État d'attribution
 hasAssignment.details=A une attribution

infra/schema/src/main/resources/localization/schema_cs.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Knihovna funkcí
 ObjectTypes.OBJECT_COLLECTION=Sbírka objektů
 ObjectTypes.ARCHETYPE=Pravzor
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Typ nositele přiřazení
+ObjectTypes.all=Vše
 OrgType.parentOrganization=Rodičovská organizace
 ObjectType.extension=Rozšíření
 FocusType.assignmentKey=Přiřazení

infra/schema/src/main/resources/localization/schema_de.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Funktionsbibliothek
 ObjectTypes.OBJECT_COLLECTION=Objektsammlung
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=alle
 OrgType.parentOrganization=Übergeordnete Organisation
 ObjectType.extension=Erweiterung
 FocusType.assignmentKey=Aufgabe

infra/schema/src/main/resources/localization/schema_en.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=All
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Extension
 FocusType.assignmentKey=Assignment

infra/schema/src/main/resources/localization/schema_es.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Librería de funciones
 ObjectTypes.OBJECT_COLLECTION=Colección de objetos
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Todo
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Extensión
 FocusType.assignmentKey=Asignación

infra/schema/src/main/resources/localization/schema_et.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Kõik
 OrgType.parentOrganization=Emaorganisatsioon
 ObjectType.extension=Laiendus
 FocusType.assignmentKey=Omistus

infra/schema/src/main/resources/localization/schema_fi.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Kaikki
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Laajennos
 FocusType.assignmentKey=Toimeksianto

infra/schema/src/main/resources/localization/schema_fr.properties

@@ -276,7 +276,7 @@ FileConfigurationType.name=Nom
 FileConfigurationType.file=Fichier
 FullTextSearchConfigurationType.enabled=Activé
 FullTextSearchConfigurationType.indexed=Indexé
-FullTextSearchIndexedItemsConfigurationType.details=Full text search indexed items
+FullTextSearchIndexedItemsConfigurationType.details=Éléments indexés pour la recherche en texte intégral
 FullTextSearchIndexedItemsConfigurationType.objectType=Type d'objet
 FullTextSearchIndexedItemsConfigurationType.item=Objet
 FocusType.activation=Activation
@@ -354,7 +354,7 @@ InfrastructureConfigurationType.intraClusterHttpUrlPattern=Motif d'URL HTTP inte
 InfrastructureConfigurationType.remoteHostAddressHeader=Entête pour déterminer l'adresse du client
 InternalsConfigurationType.enableExperimentalCode=Activer le code expérimental
 InternalsConfigurationType.maxModelClicks=Clics max du modèle
-InternalsConfigurationType.polyStringNormalizer=Poly string normalizer
+InternalsConfigurationType.polyStringNormalizer=Normalisateur de PolyString
 InternalsConfigurationType.subresultStripThreshold=Subresult strip threshold
 ItemRefinedDefinitionType.ref=Réf.
 ItemRefinedDefinitionType.displayName=Nom d'affichage
@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Bibliothèque de fonctions
 ObjectTypes.OBJECT_COLLECTION=Collection de l'objet
 ObjectTypes.ARCHETYPE=Archétype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Type de titulaire d'attribution
+ObjectTypes.all=Tout
 OrgType.parentOrganization=Entité org. parente
 ObjectType.extension=Extension
 FocusType.assignmentKey=Attribution
@@ -812,15 +813,15 @@ ServiceType.type=Type
 ServiceType.displayOrder=Ordre d'affichage
 ServiceType.URL=URL
 SystemConfigurationType.globalSecurityPolicyRef=Politique globale de sécurité
-SystemConfigurationType.globalAccountSynchronizationSettings=Global projection policy configuration
+SystemConfigurationType.globalAccountSynchronizationSettings=Configuration de la politique globale de projection
 SystemConfigurationType.logging=Journalisation
 SystemConfigurationType.notificationConfiguration=Configuration des notifications
 SystemConfigurationType.workflowConfiguration=Configuration de flux de travaux
 SystemConfigurationType.accessCertification=Certification des accès
 SystemConfigurationType.roleManagement=Gestion des rôles
 SystemConfigurationType.profilingConfiguration=Configuration de profilage
 SystemConfigurationType.cleanupPolicy=Politique de nettoyage
-SystemConfigurationType.internals=Internals
+SystemConfigurationType.internals=Fonctionnement interne
 SystemConfigurationType.deploymentInformation=Informations de déploiement
 SystemConfigurationType.infrastructure=Infrastructure
 SystemConfigurationType.fullTextSearch=Recherche en texte intégral
@@ -1015,11 +1016,11 @@ PolicyConstraintsType.ref=Référence
 PolicyConstraintsType.ref.help=Référence une autre contrainte de police, p.e. par son nom.
 PolicyConstraintsType.objectMinAssigneesViolation=Violation du nombre minimal d'attributaires de l'objet
 PolicyConstraintsType.objectMaxAssigneesViolation=Violation du nombre maximal d'attributaires de l'objet
-ExclusionPolicyConstraintType.details=Exclusion policy constraint type
+ExclusionPolicyConstraintType.details=Contrainte de politique d'exclusion
 ExclusionPolicyConstraintType.targetRef=Cible
 ExclusionPolicyConstraintType.targetRef.help=Cible de l'exclusion : l'objet qui définit cette exclusion et l'objet défini comme cible ne peuvent pas être attribués concomitamment.
 ExclusionPolicyConstraintType.orderConstraint=Contrainte d'ordre
-ExclusionPolicyConstraintType.targetOrderConstraint=Target order constraint
+ExclusionPolicyConstraintType.targetOrderConstraint=Contrainte d'ordre de cible
 ExclusionPolicyConstraintType.policy=Politique
 PolicyActionsType.enforcement=Mise en application
 PolicyActionsType.enforcement.help=Cette action arrête l'opération, produisant une erreur.
@@ -1242,6 +1243,6 @@ Channel.RESET_PASSWORD=Réinitialisation du mot de passe
 ArchetypePolicyType.objectTemplateRef=Object template reference
 ArchetypePolicyType.display=Affichage
 ArchetypePolicyType.conflictResolution=Résolution de conflit
-ArchetypePolicyType.lifecycleStateModel=Lifecycle state model
+ArchetypePolicyType.lifecycleStateModel=Modèle d'état du cycle de vie
 ArchetypePolicyType.applicablePolicies=Politiques applicables
 ConfigurationType.configurationProperties=Propriétés de configuration

infra/schema/src/main/resources/localization/schema_hu.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Összes
 OrgType.parentOrganization=Parent Organization
 ObjectType.extension=Kiterjesztés
 FocusType.assignmentKey=Assignment

infra/schema/src/main/resources/localization/schema_it.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Libreria di funzioni
 ObjectTypes.OBJECT_COLLECTION=Collezione di oggetti
 ObjectTypes.ARCHETYPE=Archetipo
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Tipo di assegnatario dell'incarico
+ObjectTypes.all=Tutti
 OrgType.parentOrganization=Organizzazione padre
 ObjectType.extension=Estensione
 FocusType.assignmentKey=Assegnazione

infra/schema/src/main/resources/localization/schema_ja.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=関数ライブラリ
 ObjectTypes.OBJECT_COLLECTION=オブジェクトコレクション
 ObjectTypes.ARCHETYPE=アーキタイプ
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=アサイン・フォルダー・タイプ
+ObjectTypes.all=すべて
 OrgType.parentOrganization=親組織
 ObjectType.extension=拡張
 FocusType.assignmentKey=アサイン

infra/schema/src/main/resources/localization/schema_lt.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Funkcijų biblioteka
 ObjectTypes.OBJECT_COLLECTION=Objektų surinkimas
 ObjectTypes.ARCHETYPE=Prototipas
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Priskyrimų turėtojo tipas
+ObjectTypes.all=Visi
 OrgType.parentOrganization="Tėvinė" organizacija
 ObjectType.extension=Papildomi nustatymai
 FocusType.assignmentKey=Priskyrimas

infra/schema/src/main/resources/localization/schema_pl.properties

@@ -275,7 +275,7 @@ FileConfigurationType.details=Konfiguracja pliku
 FileConfigurationType.name=Nazwa
 FileConfigurationType.file=Plik
 FullTextSearchConfigurationType.enabled=Aktywny
-FullTextSearchConfigurationType.indexed=Indesowany
+FullTextSearchConfigurationType.indexed=Indeksowany
 FullTextSearchIndexedItemsConfigurationType.details=Pełnotekstowe wyszukiwanie indeksowanych pozycji
 FullTextSearchIndexedItemsConfigurationType.objectType=Typ obiektu
 FullTextSearchIndexedItemsConfigurationType.item=Pozycja
@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Biblioteka funkcji
 ObjectTypes.OBJECT_COLLECTION=Kolekcja obiektów
 ObjectTypes.ARCHETYPE=Archetyp
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Typ posiadacza przypisania
+ObjectTypes.all=Wszystko
 OrgType.parentOrganization=Organizacja nadrzędna
 ObjectType.extension=Rozszerzenie
 FocusType.assignmentKey=Przypisanie

infra/schema/src/main/resources/localization/schema_pt_BR.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Todos
 OrgType.parentOrganization=Organização pai
 ObjectType.extension=Extensao
 FocusType.assignmentKey=Atribuição

infra/schema/src/main/resources/localization/schema_ru.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Все
 OrgType.parentOrganization=Родительская организация
 ObjectType.extension=Расширение
 FocusType.assignmentKey=Назначение

infra/schema/src/main/resources/localization/schema_sk.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=Všetko
 OrgType.parentOrganization=Rodičovská organizácia
 ObjectType.extension=Rozšírenia
 FocusType.assignmentKey=Priradenie

infra/schema/src/main/resources/localization/schema_tr.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Fonksiyon sözlüğü
 ObjectTypes.OBJECT_COLLECTION=Nesne Koleksiyonu
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=HEPSİ
 OrgType.parentOrganization=Ana organizasyon
 ObjectType.extension=Uzantı
 FocusType.assignmentKey=Atama

infra/schema/src/main/resources/localization/schema_zh_CN.properties

@@ -757,6 +757,7 @@ ObjectTypes.FUNCTION_LIBRARY=Function library
 ObjectTypes.OBJECT_COLLECTION=Object collection
 ObjectTypes.ARCHETYPE=Archetype
 ObjectTypes.ASSIGNMENT_HOLDER_TYPE=Assignment holder type
+ObjectTypes.all=全部
 OrgType.parentOrganization=父级组织
 ObjectType.extension=扩展
 FocusType.assignmentKey=分配

model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java

@@ -127,7 +127,7 @@ public PrismValueDeltaSetTriple<PrismContainerValue<ShadowAssociationType>> eval
 			try {
 				segment = assignmentPath.getSegment(assignmentPathIndex);
 			} catch (IndexOutOfBoundsException e) {
-				throw new ExpressionEvaluationException("Wrong assignment path index in "+desc+"; Index "+assignmentPathIndex+" cannot be applied to a path of legth "+assignmentPath.size(), e);
+				throw new ExpressionEvaluationException("Wrong assignment path index in "+desc+"; Index "+assignmentPathIndex+" cannot be applied to a path of length "+assignmentPath.size(), e);
 			}
 
 			thisRole = (AbstractRoleType) segment.getSource();

repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/DataSourceFactory.java

@@ -91,6 +91,9 @@ private HikariConfig createConfig() {
         config.setMinimumIdle(configuration.getMinPoolSize());
         config.setMaximumPoolSize(configuration.getMaxPoolSize());
 
+        config.setMaxLifetime(configuration.getMaxLifetime());
+        config.setIdleTimeout(configuration.getIdleTimeout());
+
         config.setIsolateInternalQueries(true);
 //        config.setAutoCommit(false);