From 7729666b2cf76521e53f89f7253bb763ee207927 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Thu, 28 Feb 2019 18:41:18 +0100
Subject: [PATCH 01/12] fix for MID-5088 (accounts column in the popup)

---
 .../api/component/AbstractPopupTabPanel.java  | 15 +++++++
 .../component/data/column/ColumnUtils.java    | 44 ++++++++++---------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
index ccdd3045d59..bb6e833cb79 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
@@ -21,8 +21,10 @@
 import com.evolveum.midpoint.prism.query.OrFilter;
 import com.evolveum.midpoint.prism.query.RefFilter;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.web.component.data.column.ColumnUtils;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentHolderType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
@@ -30,6 +32,7 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.model.IModel;
@@ -37,6 +40,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -74,6 +78,17 @@ true, getPageBase()) {
 
             private static final long serialVersionUID = 1L;
 
+            @Override
+            protected List<IColumn<SelectableBean<O>, String>> createColumns() {
+                if (AbstractRoleType.class.isAssignableFrom(getType())){
+                    List<IColumn<SelectableBean<O>, String>> columns = new ArrayList<>();
+                    columns.addAll((Collection)ColumnUtils.getDefaultAbstractRoleColumns(false));
+                    return columns;
+                } else {
+                    return super.createColumns();
+                }
+            }
+
             @Override
             protected void onUpdateCheckbox(AjaxRequestTarget target, IModel<SelectableBean<O>> rowModel) {
                 onSelectionPerformed(target, rowModel);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
index 947bfbc3d92..61eb4f3d90e 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -342,7 +342,7 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<>();
 
 
-		columns.addAll((Collection)getDefaultAbstractRoleColumns(RoleType.COMPLEX_TYPE));
+		columns.addAll((Collection)getDefaultAbstractRoleColumns(true));
 
 		return columns;
 	}
@@ -350,7 +350,7 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
 	public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultServiceColumns() {
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<>();
 
-		columns.addAll((Collection)getDefaultAbstractRoleColumns(ServiceType.COMPLEX_TYPE));
+		columns.addAll((Collection)getDefaultAbstractRoleColumns(true));
 
 		return columns;
 	}
@@ -358,12 +358,12 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
 	public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultOrgColumns() {
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<>();
 
-		columns.addAll((Collection)getDefaultAbstractRoleColumns(OrgType.COMPLEX_TYPE));
+		columns.addAll((Collection)getDefaultAbstractRoleColumns(true));
 
 		return columns;
 	}
 
-	private static <T extends AbstractRoleType> List<IColumn<SelectableBean<T>, String>> getDefaultAbstractRoleColumns(QName type) {
+	public static <T extends AbstractRoleType> List<IColumn<SelectableBean<T>, String>> getDefaultAbstractRoleColumns(boolean showAccounts) {
 
 		String sortByDisplayName = null;
 		String sortByIdentifer = null;
@@ -381,28 +381,30 @@ private static <T extends AbstractRoleType> List<IColumn<SelectableBean<T>, Stri
 
 		);
 		List<IColumn<SelectableBean<T>, String>> columns = createColumns(columnsDefs);
-		
-		IColumn<SelectableBean<T>, String> column = new AbstractExportableColumn<SelectableBean<T>, String>(
-				createStringResource("pageUsers.accounts")) {
 
-			@Override
-			public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
-					String componentId, IModel<SelectableBean<T>> model) {
-				cellItem.add(new Label(componentId,
-						model.getObject().getValue() != null ?
-								model.getObject().getValue().getLinkRef().size() : null));
-			}
+		if (showAccounts) {
+			IColumn<SelectableBean<T>, String> column = new AbstractExportableColumn<SelectableBean<T>, String>(
+					createStringResource("pageUsers.accounts")) {
 
-			@Override
-			public IModel<String> getDataModel(IModel<SelectableBean<T>> rowModel) {
-				return Model.of(rowModel.getObject().getValue() != null ?
-						Integer.toString(rowModel.getObject().getValue().getLinkRef().size()) : "");
-			}
+				@Override
+				public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
+										 String componentId, IModel<SelectableBean<T>> model) {
+					cellItem.add(new Label(componentId,
+							model.getObject().getValue() != null ?
+									model.getObject().getValue().getLinkRef().size() : null));
+				}
 
+				@Override
+				public IModel<String> getDataModel(IModel<SelectableBean<T>> rowModel) {
+					return Model.of(rowModel.getObject().getValue() != null ?
+							Integer.toString(rowModel.getObject().getValue().getLinkRef().size()) : "");
+				}
 
-		};
 
-		columns.add(column);
+			};
+
+			columns.add(column);
+		}
 		return columns;
 
 	}

From 6b27f218a545d1d3731ee35b080191dca50ead52 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Fri, 1 Mar 2019 09:02:08 +0100
Subject: [PATCH 02/12] assignment holder types list for org members panel

---
 .../MultiTypesMemberPopupTabPanel.java        |  2 +-
 .../gui/api/util/WebComponentUtil.java        | 36 +++++++++++++++++++
 .../admin/users/component/OrgMemberPanel.java |  3 +-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
index 68a7ea5dc0f..7157adc55f1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
@@ -92,7 +92,7 @@ protected ObjectDelta prepareDelta(){
     }
 
     protected List<ObjectTypes> getSupportedTypesList(){
-        List<ObjectTypes> supportedTypes = new ArrayList<>(Arrays.asList(ObjectTypes.values()));
+        List<ObjectTypes> supportedTypes = WebComponentUtil.createAssignmentHolderTypesList();
         supportedTypes.remove(ObjectTypes.USER);
         supportedTypes.remove(ObjectTypes.ROLE);
         supportedTypes.remove(ObjectTypes.SERVICE);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index 86f00f42920..1d120e00970 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -687,6 +687,42 @@ public static List<QName> createObjectTypeList() {
 
 	}
 
+	public static List<QName> createAssignmentHolderTypeQnamesList() {
+
+		List<ObjectTypes> objectTypes = createAssignmentHolderTypesList();
+		List<QName> types = new ArrayList<>();
+		objectTypes.forEach(objectType -> {
+			types.add(objectType.getTypeQName());
+		});
+
+		return types.stream().sorted((type1, type2) -> {
+				Validate.notNull(type1);
+				Validate.notNull(type2);
+
+				return String.CASE_INSENSITIVE_ORDER.compare(QNameUtil.qNameToUri(type1), QNameUtil.qNameToUri(type2));
+
+
+		}).collect(Collectors.toList());
+
+	}
+
+	public static List<ObjectTypes> createAssignmentHolderTypesList(){
+		List<ObjectTypes> objectTypes = new ArrayList<>();
+		for (ObjectTypes t : ObjectTypes.values()) {
+			if (AssignmentHolderType.class.isAssignableFrom(t.getClassDefinition())) {
+				objectTypes.add(t);
+			}
+		}
+		return objectTypes.stream().sorted((type1, type2) -> {
+			Validate.notNull(type1);
+			Validate.notNull(type2);
+
+			return String.CASE_INSENSITIVE_ORDER.compare(QNameUtil.qNameToUri(type1.getTypeQName()), QNameUtil.qNameToUri(type2.getTypeQName()));
+
+
+		}).collect(Collectors.toList());
+	}
+
 	// TODO: move to schema component
 	public static List<QName> createFocusTypeList() {
 		return createFocusTypeList(false);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
index 0491550d63a..df0ccabb986 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
@@ -112,9 +112,10 @@ protected void unassignMembersPerformed(QName objectType, QueryScope scope, Coll
 
 	@Override
 	protected List<QName> getSupportedObjectTypes(boolean includeAbstractTypes) {
-		List<QName> objectTypes = WebComponentUtil.createObjectTypeList();
+		List<QName> objectTypes = WebComponentUtil.createAssignmentHolderTypeQnamesList();
 		objectTypes.remove(ShadowType.COMPLEX_TYPE);
 		objectTypes.remove(ObjectType.COMPLEX_TYPE);
+		objectTypes.remove(AssignmentHolderType.COMPLEX_TYPE);
 		return objectTypes;
 	}
 

From 0ddbf58c873830400ec89b8afa945758a44252fa Mon Sep 17 00:00:00 2001
From: skublik <lskublik@evolveum.com>
Date: Fri, 1 Mar 2019 12:31:05 +0100
Subject: [PATCH 03/12] increase number of users

---
 ...stractInitializedModelIntegrationTest.java |  2 +-
 .../intest/security/AbstractSecurityTest.java |  3 +-
 .../intest/sync/AbstractInboundSyncTest.java  | 38 +++++++++----------
 .../AbstractSynchronizationStoryTest.java     |  6 +--
 .../intest/sync/TestInboundLiveSyncTask.java  |  4 +-
 .../src/test/resources/common/user-will.xml   |  1 -
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
index c0662faa1b0..ca3d0ce0500 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
@@ -68,7 +68,7 @@ public class AbstractInitializedModelIntegrationTest extends AbstractConfiguredM
 
 	protected static final Trace LOGGER = TraceManager.getTrace(AbstractInitializedModelIntegrationTest.class);
 
-	private static final int NUMBER_OF_IMPORTED_USERS = 4;
+	private static final int NUMBER_OF_IMPORTED_USERS = 5;
 	private static final int NUMBER_OF_IMPORTED_ROLES = 16;
 
 	@Autowired protected MappingFactory mappingFactory;
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
index 6561647db3f..4203790587e 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
@@ -369,7 +369,7 @@ public abstract class AbstractSecurityTest extends AbstractInitializedModelInteg
 	protected static final XMLGregorianCalendar JACK_VALID_FROM_LONG_AGO = XmlTypeConverter.createXMLGregorianCalendar(10000L);
 	protected static final XMLGregorianCalendar JACK_VALID_TO_LONG_AGEAD = XmlTypeConverter.createXMLGregorianCalendar(10000000000000L);
 
-	protected static final int NUMBER_OF_ALL_USERS = 11;
+	protected static final int NUMBER_OF_ALL_USERS = 12;
 	protected static final int NUMBER_OF_IMPORTED_ROLES = 69;
 	protected static final int NUMBER_OF_ALL_ORGS = 11;
 
@@ -604,6 +604,7 @@ protected void cleanupAutzTest(String userOid, int expectedAssignments) throws O
         cleanupDelete(UserType.class, USER_RAPP_OID, task, result);
         cleanupDelete(UserType.class, USER_MANCOMB_OID, task, result);
         cleanupDelete(UserType.class, USER_CAPSIZE_OID, task, result);
+        cleanupDelete(UserType.class, USER_WILL_OID, task, result);
         cleanupAdd(USER_LARGO_FILE, task, result);
         cleanupAdd(USER_LECHUCK_FILE, task, result);
         cleanupAdd(USER_ESTEVAN_FILE, task, result);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
index ebafe4bba35..5ff8757ef35 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
@@ -69,7 +69,7 @@ public abstract class AbstractInboundSyncTest extends AbstractInitializedModelIn
 	protected static final Date ACCOUNT_MANCOMB_VALID_TO_DATE = MiscUtil.asDate(2066, 5, 4, 3, 2, 1);
 
 	protected static final String ACCOUNT_POSIXUSER_DUMMY_USERNAME = "posixuser";
-
+	
 	protected static String userWallyOid;
 
 	protected boolean allwaysCheckTimestamp = false;
@@ -131,7 +131,7 @@ public void test110AddDummyEmeraldAccountMancomb() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(5);
+        assertUsers(6);
 
         DummyAccount account = new DummyAccount(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 		account.setEnabled(true);
@@ -171,7 +171,7 @@ public void test110AddDummyEmeraldAccountMancomb() throws Exception {
 
         assertLinked(userMancomb, accountMancomb);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -189,7 +189,7 @@ public void test120ModifyDummyEmeraldAccountMancombSeepbad() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
         DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
@@ -226,7 +226,7 @@ public void test120ModifyDummyEmeraldAccountMancombSeepbad() throws Exception {
 
         PrismAsserts.assertPropertyValue(userAfter, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Mancomb Seepbad"));
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -244,7 +244,7 @@ public void test122ModifyDummyEmeraldAccountMancombSeepNULL() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
         DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
@@ -281,7 +281,7 @@ public void test122ModifyDummyEmeraldAccountMancombSeepNULL() throws Exception {
 
         PrismAsserts.assertNoItem(userAfter, UserType.F_FULL_NAME);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -299,7 +299,7 @@ public void test124ModifyDummyEmeraldAccountMancombSeepevil() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
         DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
@@ -336,7 +336,7 @@ public void test124ModifyDummyEmeraldAccountMancombSeepevil() throws Exception {
 
         PrismAsserts.assertPropertyValue(userAfter, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Mancomb Seepevil"));
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -354,7 +354,7 @@ public void test126ModifyDummyEmeraldAccountMancombTitlePirate() throws Exceptio
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
         DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
@@ -392,7 +392,7 @@ public void test126ModifyDummyEmeraldAccountMancombTitlePirate() throws Exceptio
         PrismAsserts.assertPropertyValue(userAfter, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Mancomb Seepevil"));
         PrismAsserts.assertPropertyValue(userAfter, UserType.F_TITLE, PrismTestUtil.createPolyString("Pirate"));
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -410,7 +410,7 @@ public void test127ModifyDummyEmeraldAccountMancombTitlePirateNull() throws Exce
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
         DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
@@ -448,7 +448,7 @@ public void test127ModifyDummyEmeraldAccountMancombTitlePirateNull() throws Exce
         PrismAsserts.assertPropertyValue(userAfter, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Mancomb Seepevil"));
         PrismAsserts.assertNoItem(userAfter, UserType.F_TITLE);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -466,7 +466,7 @@ public void test129ModifyDummyEmeraldAccountMancombSeepgood() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
         DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
@@ -503,7 +503,7 @@ public void test129ModifyDummyEmeraldAccountMancombSeepgood() throws Exception {
 
         PrismAsserts.assertPropertyValue(userAfter, UserType.F_FULL_NAME, PrismTestUtil.createPolyString("Mancomb Seepgood"));
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -531,7 +531,7 @@ public void test300AddDummyEmeraldAccountPosixUser() throws Exception {
 		prepareNotifications();
 
 		// Preconditions
-		assertUsers(6);
+		assertUsers(7);
 
 		DummyAccount account = new DummyAccount(ACCOUNT_POSIXUSER_DUMMY_USERNAME);
 		account.setEnabled(true);
@@ -567,7 +567,7 @@ public void test300AddDummyEmeraldAccountPosixUser() throws Exception {
 		assertAdministrativeStatusEnabled(userPosixUser);
 		assertLinked(userPosixUser, accountPosixUser);
 
-		assertUsers(7);
+		assertUsers(8);
 
 		// notifications
 		notificationManager.setDisabled(true);
@@ -589,7 +589,7 @@ public void test310ModifyDummyEmeraldAccountPosixUserUidNumber() throws Exceptio
 		prepareNotifications();
 
 		// Preconditions
-		assertUsers(7);
+		assertUsers(8);
 
 		DummyAccount account = dummyResourceEmerald.getAccountByUsername(ACCOUNT_POSIXUSER_DUMMY_USERNAME);
 
@@ -620,7 +620,7 @@ public void test310ModifyDummyEmeraldAccountPosixUserUidNumber() throws Exceptio
 
 		assertLinked(userAfter, accountAfter);
 
-		assertUsers(7);
+		assertUsers(8);
 
 		// notifications
 		notificationManager.setDisabled(true);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
index 6408971c8ee..0f1c041a9ff 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
@@ -143,7 +143,7 @@ public void test110AddDummyGreenAccountMancomb() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(5);
+        assertUsers(6);
 
         DummyAccount account = new DummyAccount(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 		account.setEnabled(true);
@@ -181,7 +181,7 @@ public void test110AddDummyGreenAccountMancomb() throws Exception {
 
         assertLinked(userMancomb, accountMancomb);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
 		displayAllNotifications();
@@ -251,7 +251,7 @@ public void test210AddDummyGreenAccountWally() throws Exception {
         assertUser(userWally, userWallyOid, ACCOUNT_WALLY_DUMMY_USERNAME, "Wally Feed", null, null);
         assertLinks(userWally, 1);
 
-        assertUsers(7);
+        assertUsers(8);
 
         assertLinked(userWally, accountWallyGreen);
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundLiveSyncTask.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundLiveSyncTask.java
index 1fcb198d0e5..88424156f38 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundLiveSyncTask.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundLiveSyncTask.java
@@ -80,7 +80,7 @@ public void test199DeleteDummyEmeraldAccountMancomb() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
 		/// WHEN
         displayWhen(TEST_NAME);
@@ -112,7 +112,7 @@ public void test199DeleteDummyEmeraldAccountMancomb() throws Exception {
 
         assertNoDummyAccount(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
diff --git a/model/model-intest/src/test/resources/common/user-will.xml b/model/model-intest/src/test/resources/common/user-will.xml
index d2c309a1a6a..c552243300a 100644
--- a/model/model-intest/src/test/resources/common/user-will.xml
+++ b/model/model-intest/src/test/resources/common/user-will.xml
@@ -24,7 +24,6 @@
 		xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
     <name>will</name>
 	<!-- No full name -->
-	<subtype>PIRATE</subtype>
     <givenName>Will</givenName>
     <familyName>Turner</familyName>
     <assignment>

From 7a09c56d2723ea525fdc3e7a1c978b96afa41922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= <petr.gasparik@ami.cz>
Date: Fri, 1 Mar 2019 12:40:25 +0100
Subject: [PATCH 04/12] Translation, WIP

---
 .../localization/Midpoint_cs.properties       |  6 +-
 .../localization/Midpoint_fr.properties       | 64 +++++++++----------
 .../localization/Midpoint_it.properties       |  6 +-
 .../localization/Midpoint_ja.properties       | 26 ++++----
 .../localization/Midpoint_pl.properties       |  2 +-
 .../localization/schema_fr.properties         | 18 +++---
 6 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
index 989560c5347..0b97954ddab 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -3456,15 +3456,15 @@ PageAdmin.menu.top.roles.edit=Upravit roli
 PageAdmin.menu.top.users.org.edit=Upravit organizaci
 PageSelfCredentials.tabs.password=Heslo
 PageSelfCredentials.title=Změna hesla
-PageSelfCredentials.oldPasswordLabel=Staré heslo
+PageSelfCredentials.oldPasswordLabel=Stávající heslo
 PageSelfCredentials.passwordLabel1=Nové heslo
 PageSelfCredentials.passwordLabel2=Potvrdit heslo
 PageSelfCredentials.accountMidpoint=Správce identit
 PageSelfCredentials.resourceMidpoint=Repozitář identit
 PageSelfCredentials.noAccountSelected=Heslo nebylo změněno. Nebyl vybrán žádný účet.
 PageSelfCredentials.emptyPasswordFiled=Je třeba vyplnit položky pro nové heslo.
-PageSelfCredentials.incorrectOldPassword=Heslo nebylo změněno. Staré heslo není správně.
-PageSelfCredentials.specifyOldPasswordMessage=Zadejte staré heslo
+PageSelfCredentials.incorrectOldPassword=Heslo nebylo změněno. Stávající heslo není správně zadáno.
+PageSelfCredentials.specifyOldPasswordMessage=Zadejte stávající heslo
 ChangePasswordPanel.accountsTable.header=Propagace hesla
 ChangePasswordPanel.name=Název
 ChangePasswordPanel.resourceName=Aplikace
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
index 706ce51efc0..91916fbecbb 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_fr.properties
@@ -652,7 +652,7 @@ ObjectPolicyDialog.property.placeholder=Insérer un chemin de propriété
 ObjectPolicyDialog.subtype=Sous-type d'objet
 ObjectPolicyDialog.template=Gabarit d'objet
 ObjectPolicyDialog.type=Type d'objet
-ObjectPolicyDialogDto.message.preparePolicyConfig.warning=Skipping setting property constraint, no path was defined.
+ObjectPolicyDialogDto.message.preparePolicyConfig.warning=Aucune contrainte sur la propriété n'est établie car aucun chemin n'a été défini.
 ObjectPolicyConfigurationTabPanel.type=Type
 ObjectPolicyConfigurationTabPanel.subtype=Sous-type
 ObjectPolicyConfigurationTabPanel.objectTemplate=Gabarit d'objet
@@ -1104,8 +1104,8 @@ PageAdmin.menu.top.configuration.expressionEvaluator=Évaluateur d'expression
 PageAdmin.menu.top.configuration.importObject=Importer un objet
 PageAdmin.menu.top.configuration.internals=Configuration interne
 PageAdmin.menu.top.configuration.objectPolicy=Politique des objets
-PageAdmin.menu.top.configuration.globalPolicyRule=Règle globale de politique
-PageAdmin.menu.top.configuration.globalAccountSynchronization=Synchronisation globale des comptes
+PageAdmin.menu.top.configuration.globalPolicyRule=Règles de politique globale
+PageAdmin.menu.top.configuration.globalAccountSynchronization=Synchronisation des comptes
 PageAdmin.menu.top.configuration.cleanupPolicy=Politique de nettoyage
 PageAdmin.menu.top.configuration.workflow=Configuration de flux de travaux
 PageAdmin.menu.top.configuration.roleManagement=Gestion des rôles
@@ -1116,7 +1116,7 @@ PageAdmin.menu.top.configuration.logging=Journalisation
 PageAdmin.menu.top.configuration.deploymentInformation=Information de déploiement
 PageAdmin.menu.top.configuration.notifications=Notifications
 PageAdmin.menu.top.configuration.profiling=Profilage
-PageAdmin.menu.top.configuration.adminGui=Interface graphique d'administration
+PageAdmin.menu.top.configuration.adminGui=Interface graphique d'admin.
 PageAdmin.menu.top.configuration.repositoryObjects=Objets du dépôt
 PageAdmin.menu.top.configuration.repositoryObjectsList=Tous les objets
 PageAdmin.menu.top.configuration.security=Sécurité
@@ -2081,7 +2081,7 @@ PageRoles.title=Tous les rôles
 pageSecurityQuestions.message.WrongAnswer=Questions non répondues correctement
 pageSecurityQuestions.message.noPolicySet=Aucune politique des mots de passe n'est définie
 PageSecurityQuestions.title=Questions de sécurité
-PageShowPassword.message=Votre nouveau mot de passe est :
+PageShowPassword.message=Votre nouveau mot de passe est :
 PageShowPassword.success=Le nouveau mot de passe a été créé avec succès
 PageShowPassword.title=Nouveau Mot de Passe
 PageSizePopover.title=Lignes par page
@@ -2093,10 +2093,10 @@ pageSystemConfiguration.assignmentPolicyEnforcement.value.positive=Positive
 pageSystemConfiguration.logging.title=Journalisation
 pageSystemConfiguration.notifications.title=Notifications
 pageSystemConfiguration.profiling.title=Profilage
-pageSystemConfiguration.adminGui.title=Admin GUI
+pageSystemConfiguration.adminGui.title=Interface graphique d'admin.
 pageSystemConfiguration.system.title=Système
 pageSystemConfiguration.objectPolicy.title=Politique des objets
-pageSystemConfiguration.globalPolicyRule.title=Règle globale de politique
+pageSystemConfiguration.globalPolicyRule.title=Règles de politique globale
 pageSystemConfiguration.globalAccountSynchronization.title=Synchronisation globale des comptes
 pageSystemConfiguration.cleanupPolicy.title=Politique de nettoyage
 pageSystemConfiguration.roleManagement.title=Gestion des rôles
@@ -2792,7 +2792,7 @@ ResourceCredentialsEditor.label=Modifier les informations d'identification de la
 ResourceCredentialsEditor.label.fetchStrategy=Stratégie d'obtention
 ResourceCredentialsEditor.label.inbound=Entrant
 ResourceCredentialsEditor.label.outbound=Sortant
-ResourceCredentialsEditor.label.passwordPolicyRef=Stratégie de mot de passe
+ResourceCredentialsEditor.label.passwordPolicyRef=Politique de mot de passe
 ResourceDependencyEditor.label.button.add=Ajouter une dépendance de ressource
 ResourceDependencyEditor.label=Modifier les dépendances
 ResourceDependencyEditor.label.intent=Finalité de la dépendance
@@ -3425,7 +3425,7 @@ PageAdmin.menu.profile=Profil
 PageAdmin.menu.assignments=Attributions
 PageAdmin.menu.credentials=Informations d'identification
 PageAdmin.menu.request=Demander un rôle
-PageTemplate.version=Version:
+PageTemplate.version=Version :
 PageTemplate.copy=<strong>Copyright &copy; 2010-2018 <a href="https://www.evolveum.com/" target="_blank">Evolveum</a>&reg; et ses partenaires.&nbsp;</strong>
 PageTemplate.toggleNavigation=Toggle navigation
 PageTemplate.user=utilisateur
@@ -3437,7 +3437,7 @@ TableConfigurationPanel.pageSize=Lignes par page
 TableConfigurationPanel.tableColumns=Table columnsCountToolbar.label.unknownCount=Displaying {0,number,integer} to {1,number,integer}, nombre inconnu de résultats correspondants.
 MyRequestsPanel.started=Démarré
 MyRequestsPanel.rejected=Rejeté
-MyRequestsPanel.skipped=Passé
+MyRequestsPanel.skipped=Ignoré
 MyRequestsPanel.approved=Validé
 MyRequestsPanel.inProgress=En cours
 MyRequestsPanel.unknown=Inconnu
@@ -3873,9 +3873,9 @@ AssignmentConflictPanel.undoAction=Annuler
 PageAssignmentConflicts.title=Conflits entre attributions
 PageAssignmentConflicts.back=Retour
 PageAssignmentConflicts.submit=Soumettre
-PageAssignmentsList.conflictsWarning=Unable to calculate assignment conflicts due to authorization problem. Reason:
+PageAssignmentsList.conflictsWarning=Impossible de calculer les conflits d'attribution dus à des problèmes d'autorisation. Cause :
 AbstractShoppingCartTabPanel.addAllButton=Les ajouter tou(te)s
-AbstractShoppingCartTabPanel.goToShoppingCartButton=Go to shopping cart
+AbstractShoppingCartTabPanel.goToShoppingCartButton=Voir le panier
 AbstractShoppingCartTabPanel.requestingForLabel=Demande pour
 AbstractShoppingCartTabPanel.availableRelationsLabel=Relations disponibles
 AssignmentCatalogPanel.selectTargetUser=Sélectionner l'utilisateur cible
@@ -4155,8 +4155,8 @@ PolicyConstraintsType.objectMinAssigneesViolation=Violation du nombre minimal d'
 PolicyConstraintsType.objectMaxAssigneesViolation=Violation du nombre maximal d'attributaires de l'objet
 PolicyConstraintsType.modification=Modification
 PolicyConstraintsType.assignment=Attribution 
-PolicyConstraintsType.objectTimeValidity=Object time validity
-PolicyConstraintsType.assignmentTimeValidity=Validité du temps d'attribution
+PolicyConstraintsType.objectTimeValidity=Durée de validité de l'objet
+PolicyConstraintsType.assignmentTimeValidity=Durée de validité des attributions
 PolicyConstraintsType.situation=Situation
 PolicyConstraintsType.transition=Transition
 PolicyConstraintsType.ref=Réf
@@ -4168,11 +4168,11 @@ ExpressionValuePanel.literalValueTitle=Valeur littérale
 ExpressionValuePanel.associationTargetSearchTitle=Filtre pour la recherche de la cible de l'association
 ExpressionValuePanel.path=Chemin
 ExpressionValuePanel.value=Valeur
-ExpressionValuePanel.specifyExpression=Specify expression
-ExpressionValuePanel.addValueButtonDefaultTitle=Add shadow reference value
+ExpressionValuePanel.specifyExpression=Spécifier l'expression
+ExpressionValuePanel.addValueButtonDefaultTitle=Ajouter une valeur de référence du reflet
 ExpressionValuePanel.addValueButtonTargetSearchTitle=Ajouter une recherche de cible de l'association
 ExpressionValuePanel.addLiteralValueButton=Ajouter une valeur littérale
-ExpressionValuePanel.associationDefenitionsNotDefined=Association definitions are not defined for the current resource with selected kind/intent parameters.
+ExpressionValuePanel.associationDefenitionsNotDefined=Aucune définition d'association n'est définie pour la ressource actuelle avec les paramètres sorte et finalité sélectionnés.
 ConstructionType.attribute=Attribut
 ConstructionType.association=Association
 operation.Recompute.ALL.members=Recalculer tous les membres
@@ -4259,32 +4259,32 @@ ItemPathPanel.button.reset=Réinitialiser le chemin
 ApprovalPolicyActionType.details.newValue=Nouvelle action de politique de validation
 LifecycleStateType.details.newValue=État du nouveau cycle de vie
 NotificationPolicyActionType.details.newValue=Nouvelle action de politique de notification
-PropertyConstraintType.details.newValue=Nouvelle contrainte de propriété
-objectState.details.newValue=New object state
-assignmentState.details.newValue=Nouvel état d'attribution
-hasAssignment.details.newValue=New has assignment
-hasNoAssignment.details.newValue=New has no assignment
+PropertyConstraintType.details.newValue=Nouvelle contrainte sur une propriété
+objectState.details.newValue=Nouvelle contrainte relative à l'état de l'objet
+assignmentState.details.newValue=Nouvelle contrainte relative à l'état de l'attribution
+hasAssignment.details.newValue=Nouvelle contrainte relative à la présence d'attributions
+hasNoAssignment.details.newValue=Nouvelle contrainte relative à l'absence d'attributions
 exclusion.details.newValue=Nouvelle exclusion
 minAssignees.details.newValue=Nouveau nombre minimal d'attributaires
 maxAssignees.details.newValue=Nouveau nombre maximal d'attributaires
-modification.details.newValue=Nouvelle modification
-assignment.details.newValue=Nouvelle attribution
-objectTimeValidity.details.newValue=New object time validity
-assignmentTimeValidity.details.newValue=New assignment time validity
-situation.details.newValue=Nouvelle situation de politique
+modification.details.newValue=Nouvelle contrainte sur la modification de l'objet
+assignment.details.newValue=Nouvelle contrainte sur la modification d'une attribution
+objectTimeValidity.details.newValue=Nouvelle contrainte sur la durée de validité de l'objet
+assignmentTimeValidity.details.newValue=Nouvelle contrainte sur la durée de validité des attributions
+situation.details.newValue=Nouvelle contrainte relative à une situation de politique
 transition.details.newValue=Nouvelle transition
 ref.details.newValue=Nouvelle référence
 objectMaxAssigneesViolation.details.newValue=Violation du nombre maximal d'attributaires du nouvel objet
 objectMinAssigneesViolation.details.newValue=Violation du nombre minimal d'attributaires du nouvel objet
-PolicyConstraintReferenceType.details.newValue=New policy constraint reference
+PolicyConstraintReferenceType.details.newValue=Nouvelle référence à une contrainte de politique
 RichHyperlinkType.details.newValue=New rich hyperlink
 UserInterfaceFeatureType.details.newValue=New user interface feature
 GuiObjectDetailsPageType.details.newValue=Page de détails du nouvel objet gui
-ObjectFormType.details.newValue=Formulaire pour un nouvel objet
+ObjectFormType.details.newValue=Nouveau formulaire d'objet
 GuiObjectColumnType.details.newValue=Colonne du nouvel objet gui
 GuiObjectListViewType.details.newValue=Vue de la liste d'objets du nouvel objet gui
 DashboardWidgetType.details.newValue=Nouvelle vignette de tableau de bord
-RelationDefinitionType.details.newValue=Définition d'une nouvelle relation
+RelationDefinitionType.details.newValue=Nouvelle définition de relation
 GuiActionType.details.newValue=Nouvelle action GUI
 ApprovalStageDefinitionType.details.newValue=Nouvelle définition de phase de validation
 WorkItemTimedActionsType.details.newValue=Actions programmées pour un nouveau travail
@@ -4302,8 +4302,8 @@ minAssignees.details=Nombre minimal d'attributaires
 maxAssignees.details=Nombre maximal d'attributaires
 modification.details=Modification
 assignment.details=Attribution
-objectTimeValidity.details=Object time validity
-assignmentTimeValidity.details=Validité du temps d'attribution
+objectTimeValidity.details=Durée de validité de l'objet
+assignmentTimeValidity.details=Durée de validité des attributions
 situation.details=Situation de politique
 transition.details=Transition
 ref.details=Référence
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_it.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
index 6a949c698d9..754b18512da 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_it.properties
@@ -1666,12 +1666,12 @@ pageDebugList.dialog.title.confirmDelete=Conferma cancellazione
 pageDebugList.dialog.title.deleteAll=Elimini Tutti gli Oggetti
 pageDebugList.menu.deleteAllIdentities=Elimina tutte le identità
 pageDebugList.menu.deleteAllType=Elimina tutto il tipo selezionato
-pageDebugList.menu.deleteSelected=Delete selected/filtered
+pageDebugList.menu.deleteSelected=Elimina selezionato/filtrato
 pageDebugList.menu.deleteShadowsOnResource=Elimina tutti gli shadow nella risorsa
 pageDebugList.menu.exportShadowsOnResource=Esporta tutti gli shadows nella risorsa
 pageDebugList.menu.exportAll=Esporta tutti gli oggetti
 pageDebugList.menu.exportAllSelectedType=Esporta tutto il tipo selezionato
-pageDebugList.menu.exportSelected=Export selected/filtered
+pageDebugList.menu.exportSelected=Esporta selezionato/filtrato
 pageDebugList.message.countSearchProblem=Impossibile eseguire operazioni di ricerca su utenti /shadow/unita' organizzative
 pageDebugList.message.createFileException=Impossibile creare il file per il download.
 pageDebugList.message.deleteAllType=Vuoi davvero cancellare tutti gli oggetti di tipo "{0}"?
@@ -4172,7 +4172,7 @@ ExpressionValuePanel.specifyExpression=Specifica espressione
 ExpressionValuePanel.addValueButtonDefaultTitle=Aggiungi il valore del riferimento shadow
 ExpressionValuePanel.addValueButtonTargetSearchTitle=Aggiungi ricerca target di associazione
 ExpressionValuePanel.addLiteralValueButton=Aggiungi valore letterale
-ExpressionValuePanel.associationDefenitionsNotDefined=Association definitions are not defined for the current resource with selected kind/intent parameters.
+ExpressionValuePanel.associationDefenitionsNotDefined=Le definizioni di associazione non sono definite per la risorsa corrente con i parametri di tipo/Intent selezionati.
 ConstructionType.attribute=Attributo
 ConstructionType.association=Associazione
 operation.Recompute.ALL.members=Ricalcola tutti i membri
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
index fb0a07e4c9e..1f0357a8cbb 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties
@@ -1148,7 +1148,7 @@ PageAdmin.menu.top.users=ユーザー
 PageAdmin.menu.top.valuePolicies.list= バリュー・ポリシー一覧
 PageAdmin.menu.top.valuePolicies.new = 新しいバリュー・ポリシー
 PageAdmin.menu.top.valuePolicies= バリュー・ポリシー
-PageAdmin.menu.top.workItems.listClaimable=私の主張するアイテム
+PageAdmin.menu.top.workItems.listClaimable=私が要求できるアイテム
 PageAdmin.menu.top.workItems.list=私のアイテム
 PageAdmin.menu.top.workItems.listAll=すべてのアイテム
 PageAdmin.menu.top.workItems.listProcessInstancesAll=全リクエスト
@@ -1666,12 +1666,12 @@ pageDebugList.dialog.title.confirmDelete=削除の確認
 pageDebugList.dialog.title.deleteAll=すべてのオブジェクトの削除
 pageDebugList.menu.deleteAllIdentities=すべての識別子の削除
 pageDebugList.menu.deleteAllType=選択したすべてのタイプを削除
-pageDebugList.menu.deleteSelected=Delete selected/filtered
+pageDebugList.menu.deleteSelected=選択/フィルターされたものを削除
 pageDebugList.menu.deleteShadowsOnResource=リソース上のすべてのシャドウを削除
 pageDebugList.menu.exportShadowsOnResource=リソース上のすべてのシャドウをエクスポート
 pageDebugList.menu.exportAll=すべてのオブジェクトのエクスポート
 pageDebugList.menu.exportAllSelectedType=選択したすべてのタイプをエクスポート
-pageDebugList.menu.exportSelected=Export selected/filtered
+pageDebugList.menu.exportSelected=選択/フィルターされたものをエクスポート
 pageDebugList.message.countSearchProblem=ユーザー/シャドウ/組織単位に対する検索操作を実行できませんでした。
 pageDebugList.message.createFileException=ダウンロードするファイルを作成できませんでした。
 pageDebugList.message.deleteAllType=本当にタイプ"{0}"のすべてのオブジェクトを削除しますか？
@@ -2601,7 +2601,7 @@ pageWorkItems.button.approve=承認
 pageWorkItems.button.claim=クレーム
 pageWorkItems.button.reject=却下
 pageWorkItems.button.release=リリース
-PageWorkItemsClaimable.title=私がクレーム可能な作業アイテム
+PageWorkItemsClaimable.title=私が要求できる作業アイテム
 pageWorkItems.item.created=Created on
 pageWorkItems.item.name=名前
 pageWorkItems.item.owner=オーナー
@@ -2612,7 +2612,7 @@ pageWorkItems.message.success.approved=業務アイテムが正常に承認さ
 pageWorkItems.message.partialError.approved=予期しない例外のために作業アイテムを承認/却下できませんでした。
 pageWorkItems.message.success.rejected=業務アイテムが正常に拒否されました。
 pageWorkItems.message.success.claimed=業務アイテムが正常に要求されました。
-pageWorkItems.message.partialError.claimed=予期しない例外のために作業アイテムを請求できませんでした。
+pageWorkItems.message.partialError.claimed=予期しない例外のために作業アイテムを要求できませんでした。
 pageWorkItems.message.success.released={0}個の業務アイテムが正常にリリースされました。
 pageWorkItems.message.partialError.released=予期しない例外のために作業アイテムを解放できませんでした。
 PageWorkItemsAll.title=すべての作業アイテム
@@ -2842,8 +2842,8 @@ ResourceWizard.expression.tooltip.type=式のタイプ。 これは式がスク
 ResourceWizard.help.capabilityStep=<p>リソース<i>機能</i>はリソースができることです。すべてのリソースが機能的に同じというわけではありません。例えば、 1つのリソースはアカウントの有効化（アカウントの有効化と無効化）をサポートしますが、その他はサポートしません。 1つのリソースが読み書きアクセスを提供し、他のリソースが読み取り専用アクセスをサポートできます。一方のリソースはリアルタイム同期をサポートしますが、他方はサポートしません。<i>機能</i>は、リソースがサポートする機能を定義し、システムがそれに応じて動作できるようにします。</p><p>すべての機能を<i>無効</i>にする（つまりオフにする）ことができます。この機能を無効にすると、システムはコネクターとリソースのその部分を使用しません。これらの機能に問題があると、機能は通常無効になります。例えば、コネクターまたはリソースにバグがある場合、適切な機能が無効になっているとバグが回避される可能性があります。しかし、管理上の理由からも機能が無効になっている可能性があります。例えば、<tt>作成</tt>、<tt>更新</tt>、<tt>削除</tt>機能を無効にすると、リソースは効率的に読み取り専用になります。</p><p>一部の機能は<i>シミュレート</i>できます。つまり、システムにはリソースがなくてもリソースに特定の機能があると見せかけることができます。例えば、特定のアカウント属性を特定の値に設定してアカウントを無効にすることで、<i>アクティブ化</i>機能をシミュレートできます。そのようなシミュレートされた機能は通常何らかの設定を必要とします。これはこのページでも設定できます。</p><p>詳細は<a href="https://wiki.evolveum.com/display/midPoint/Resource+Capabilities">Resource Capabilities wikiページ</a>を参照してください。</p>
 ResourceWizard.help.configurationStep=<p>ウィザードのこのステージで、コネクター設定プロパティを設定します。 それらは通常、ホスト名やポート番号などのリソースへのアクセスに使用されるネットワーク・パラメーターを定義します。 操作ネットワークのタイムアウトや接続プーリングの設定など、追加の接続パラメータをここで指定できます。</p><p>コネクター設定プロパティは各コネクターに固有です。 特定の構成プロパティーのセットは、コネクター構成スキーマによって決まります。 したがって、このページの内容は前のページで選択されたコネクターの種類によって異なります。</p>
 ResourceWizard.help.nameStep=<p>ウィザードのこのステージでは、リソースの基本的なプロパティを設定します。 リソース名と説明を設定するために使用できます。 コネクター名は必須であり、一意である必要があります。 リソースへのアクセスに使用されるコネクターも設定する必要があります。 コネクターはコネクター・ホストにデプロイされます。 コネクター・ホストを空のままにすると、システム・インスタンスに直接デプロイされたコネクターが使用されます。</p><p>リソース設定の詳細な説明については、<a href="https://wiki.evolveum.com/display/midPoint/Resource+Configuration">リソース設定のWikiページ</a>を参照してください。</p>
-ResourceWizard.help.schemaHandlingStep=<p>This step is used to provide <b>configuration</b> for handling of resource schema. The configuration displayed on this page tells system <b>what to do</b> with resource object classes and attributes. It contains the configuration of mappings between user properties and account attributes, configuration of account types, groups, provisioning dependencies, password mapping and so on.</p><p>The configuration is grouped into <b>object types</b>. Each object type defines the behavior for specific account type, entitlement type, OU, etc. The object type is uniquely identified by the combination of <i>kind</i> and <i>intent</i>. The <i>kind</i> defines what kind of the object it is:<ul><li>kind=<tt>account</tt> means that the object is an account, i.e. that it represents a user.</li><li>kind=<tt>entitlement</tt> is applied to groups, roles, privileges, ACIs and similar objects that can be associated with accounts and which give privileges or access rights to the account.</li><li>kind=<tt>generic</tt> applies to other objects such as organizational units (OUs), domains, etc.</li></ul>Intent is a plain string that can be used to distinguish several object types. E.g. it can be used to define several account types, e.g. "default user account", "administration account", "testing account" and so on. See <a href="https://wiki.evolveum.com/display/midPoint/Kind%2C+Intent+and+ObjectClass">Kind, Intent and ObjectClass wiki page</a> for more details.</p><p>More details about schema handling configuration are provided on <a href="https://wiki.evolveum.com/display/midPoint/Resource+Schema+Handling">Resource Schema Handling wiki page</a>.
-ResourceWizard.help.schemaStep=<p>This page shows resource schema. The resource schema defines <i>object classes</i> that the connector can manage, e.g. accounts, groups, organizational units and so on. The schema defines a set of <i>attributes</i> for each object class. The schema is presented here in read-only form so you can inspect it and familiarize yourself with the data model that the resource provides.</p><p>The resource schema presented at this page is usually retrieved from the resource and automatically generated by system. Resource schema defines what the resource <b>can do</b>, i.e. what object classes it defines and what attributes are used in the object classes. Therefore the schema is read-only. It is <b>not</b> a configuration. It does <b>not</b> defines how system uses the object classes and attributes. That is configured in next steps of the wizard.</p><p>See <a href="https://wiki.evolveum.com/display/midPoint/Resource+Schema">Resource Schema wiki page</a> for detailed explanation of resource schema concepts</p>
+ResourceWizard.help.schemaHandlingStep=<p>このステップは、リソース・スキーマを処理するための<b>設定</b>を提供するために使用されます。このページに表示される設定は、リソース・オブジェクトのクラスと属性を<b>どう処理するか</b>をシステムに指示します。ユーザー・プロパティとアカウント属性間のマッピングの設定、アカウント・タイプの設定、グループ、プロビジョニングの依存関係、パスワード・マッピングなどが含まれます。</p><p>設定は<b>オブジェクト・タイプ</b>に分類されます。各オブジェクト・タイプは、特定のアカウント・タイプ、エンタイトルメント・タイプ、OUなどの動作を定義します。オブジェクト・タイプは、<i>種類</i>と<i>用途</i>の組み合わせによって一意に識別されます。 <i>種類</i>はどの種類のオブジェクトであるかを定義します。<ul><li>kind = <tt>account</tt>はオブジェクトがアカウントであることを意味します。つまり、ユーザーを表します。</li><li>kind= <tt>entitlement</tt>はグループ、ロール、特権、ACI、および関連することができる同様のオブジェクトに適用されます。 accountおよびaccountに特権またはアクセス権を付与する。</li><li>kind= <tt>generic</tt>は、組織単位（OU）、ドメインなどの他のオブジェクトに適用されます。</li></ul>用途は、いくつかのオブジェクト・タイプを区別するために使用できるプレーンな文字列です。例えば、それはいくつかのアカウント・タイプを定義するために使用することができます。 「デフォルトのユーザー・アカウント」、「管理者アカウント」、「テスト用アカウント」など。詳細については、<a href="https://wiki.evolveum.com/display/midPoint/Kind%2C+Intent+and+ObjectClass">種類、用途、オブジェクト・クラスのWikiページ</a>を参照してください。</p><p>スキーマ処理設定の詳細については、<a href="https://wiki.evolveum.com/display/midPoint/Resource+Schema+Handling">リソース・スキーマ・ハンドリングのWikiページ</a>を参照してください。
+ResourceWizard.help.schemaStep=<p>このページはリソース・スキーマを表示します。リソース・スキーマは、コネクターが管理できる<i>オブジェクト・クラス</i>を定義します。 アカウント、グループ、組織単位など。 スキーマは、各オブジェクト・クラスの一連の<i>属性</i>を定義します。スキーマは読み取り専用形式でここに表示されるので、それを調べてリソースが提供するデータ・モデルに慣れることができます。</p><p>このページに表示されるリソース・スキーマは通常リソースから取得され、システムによって自動的に生成されます。リソース・スキーマは、そのリソースが<b>できること</b>、即ちそれが定義するオブジェクト・クラス、および、そのオブジェクト・クラスで使用される属性を定義します。従って、スキーマは読み取り専用です。構成では<b>ありません</b>。システムがオブジェクト・クラスと属性をどのように使用するかは定義して<b>いません</b>。これは、ウィザードの次のステップで構成されます。</p>リソース・スキーマの概念の詳細な説明については、<p><a href="https://wiki.evolveum.com/display/midPoint/Resource+Schema">リソース・スキーマのWikiページ</a>を参照してください。</p>
 ResourceWizard.help.synchronizationStep=<p>同期設定は、リソース・オブジェクトが変更されたことを検出したときにIdentity Managerがどのように反応するかを定義します。例えば、新しいアカウントを検出したとき、存在すべきグループが存在しないことを検出したときなどに、システムがどのように反応するかを定義します。システムがどのように変化を検出しても反応は同じであるかどうかは、通常は問題ではありません（ただし、例外は<i>チャネル</i>指定を使用することで可能です）。したがって、ここで設定されているポリシーは通常、<i>ライブ同期</i>、<i>リコンシリエーション</i>、<i>インポート</i>、<i>ディスカバリー</i>（一貫性メカニズム）、および将来発生する可能性のあるその他のメカニズムにも適用されます。</p>詳細については、<a href="https://wiki.evolveum.com/display/midPoint/Synchronization+Configuration">同期設定のWikiページ</a>を参照してください。
 ResourceWizard.saveAndVisualize=保存と可視化
 ResourceWizard.visualize=可視化
@@ -2889,7 +2889,7 @@ SchemaHandlingStep.association.tooltip.direction=アソシエーションの方
 SchemaHandlingStep.association.tooltip.explicitRefIntegrity=明示的な参照整合性。falseに設定すると、システムはリソースが参照整合性を実装していると見なします。例えば、 システムは、アカウントの名前が変更され、システムが何もする必要がない場合に、リソースが自動的にアソシエーションIDを更新すると想定します。trueに設定すると、システムは明示的に参照整合性を取ります。この場合、システムは、アカウントの名前が変更されると、アソシエーション属性を明示的に更新します。
 SchemaHandlingStep.association.tooltip.intent=アソシエーションの対象オブジェクト・タイプの用途。 ターゲットの種類と用途は、アソシエーションの対象となるオブジェクト・タイプを識別します。 グループ、特権、ロールなど
 SchemaHandlingStep.association.tooltip.kind=アソシエーションの対象オブジェクト・タイプの種類。 これは通常”エンタイトルメント”です。 ターゲットの種類と用途は、アソシエーションの対象となるオブジェクトタイプを識別します。例えば、 グループ、特権、ロールなど。
-SchemaHandlingStep.association.tooltip.valueAttribute=Name of the attribute that is the source of a value for the association. The value of this attribute will be taken and stored into the association attribute to form an association. This is usually an attribute that contains an identifier or name such as "uid", "id", "name", etc. In subject-to-object associations this is an attribute of an object (e.g. group). In object-to-subject associations this is an attribute of a subject (e.g. account).
+SchemaHandlingStep.association.tooltip.valueAttribute=アソシエーションの値のソースとなる属性の名前。この属性の値が取得され、アソシエーションを形成するためにアソシエーション属性に格納されます。これは通常、 "uid"、 "id"、 "name"などの識別子または名前を含む属性です。サブジェクトとオブジェクトのアソシエーションでは、これはオブジェクトの属性です（グループなど）。オブジェクトとサブジェクトのアソシエーションでは、これはサブジェクトの属性です（例：アカウント）。
 SchemaHandlingStep.attribute.label.attributeName=属性名
 SchemaHandlingStep.attribute.label.attributeNamespace=属性名前空間
 SchemaHandlingStep.attribute.tooltip.allow=オンにすると、元のリソーススキーマにない属性を指定できます。これは、完全なリソーススキーマを提供せず、いくつかの属性を隠すような不完全なコネクターを修正するために使用できます。
@@ -2973,7 +2973,7 @@ SchemaHandlingStep.tooltip.default=trueに設定した場合、この定義は
 SchemaHandlingStep.tooltip.dependency=Dependencies are object types that has to be processed before this object types is processed. I.e. this object type depends on them. The object types on which this object type depends will be provisioned before this object type. Dependencies are used to impose ordering into provisioning operations.
 SchemaHandlingStep.tooltip.filterClause=TODO: SchemaHandlingStep.tooltip.filterClause
 SchemaHandlingStep.tooltip.intent=用途は、システムがオブジェクトに対して何をすべきかを指定します。用途は、同じ種類のオブジェクトをいくつかのカテゴリに分類します。 用途が異なるオブジェクトは、システムによって異なる方法で処理される可能性があります。
-SchemaHandlingStep.tooltip.iteration=Iteratively find values for unique attributes such as identifiers. Identity Manager will try several times to find a unique value for such attributes.
+SchemaHandlingStep.tooltip.iteration=識別子などの固有の属性の値を繰り返し見つけます。アイデンティティ・マネージャーは、そのような属性に固有の値を見つけるために何度か試行します。
 SchemaHandlingStep.tooltip.kind=種類は、このオブジェクトが何であるか、それがアカウント、エンタイトルメント、または何か他のものであるかどうかを指定しました。
 SchemaHandlingStep.tooltip.objectClass=このオブジェクト・タイプのインスタンスを構築するために使用されるスキーマのオブジェクトクラス。
 SchemaHandlingStep.tooltip.protected=このオブジェクト型の保護されたインスタンスの指定 システムは保護されたインスタンスを見ることができますが、触れることはできません。 それらを変更しようとしても失敗します。 これは、 "root"や "administrator"などの緊急管理アカウントを保護するために使用されます。
@@ -3131,7 +3131,7 @@ SynchronizationStep.tooltip.enabled=この同期設定が有効になってい
 SynchronizationStep.tooltip.focus=リソース・オブジェクトに対応するフォーカル・オブジェクトのタイプ。アカウント・オブジェクトの場合、これは通常ユーザー・オブジェクト（UserType）です。これは、エンタイトルメント・オブジェクトなどに対してRoleTypeまたはOrgTypeに設定できます。
 SynchronizationStep.tooltip.intent=Object intent for which this definition applies. If the object (shadow) already has a kind and intent when it is processed by the synchronization code then this kind/intent definition will be used to select the synchronization settings to apply to this object. If the object does not have kind/intent then object class and conditions will be used to select the settings. In such a case the object (shadow) will be marked by the intent specified in this field.
 SynchronizationStep.tooltip.kind=Object kind for which this definition applies. If the object (shadow) already has a kind and intent when it is processed by the synchronization code then this kind/intent definition will be used to select the synchronization settings to apply to this object. If the object does not have kind/intent then object class and conditions will be used to select the settings. In such a case the object (shadow) will be marked by the kind specified in this field.
-SynchronizationStep.tooltip.objectClass=Object class for which this definition applies. This will be used to select the synchronization settings in case the object (shadow) does not have kind/intent definition yet.
+SynchronizationStep.tooltip.objectClass=この定義が適用されるオブジェクトクラス。これはオブジェクト（シャドウ）が種類/用途の定義をまだ持っていない場合に同期設定を選択するために使用されます。
 SynchronizationStep.tooltip.objectTemplate=この特定の同期イベントを処理するために使用されるオブジェクト・テンプレート。ここでオブジェクト・テンプレートが指定されていない場合は、通常のデフォルトが使用されます。
 SynchronizationStep.tooltip.opportunistic=trueに設定すると、このイベントの処理中に日和見的同期（別名ディスカバリー）が有効になります。
 SynchronizationStep.tooltip.reaction=システムがこの同期イベントにどのようにリアクションするかを指定します。 いくつかのリアクションを指定できます。 イベントの同期状況に適したリアクションが選択されます。
@@ -3696,7 +3696,7 @@ StageDefinitionPanel.notifyWhenNoDecisionHelp=チェックした場合、レビ
 StageDefinitionPanel.reviewerSpecificationTargetHelp=割当て/インデュースメント・ターゲットの所有者/承認者に基づくレビュー担当者の選択。 例えば ロールの所有者を使用して、（任意のユーザーに対する）「自分の」ロールのすべての割当てを認証するように指定できます。
 StageDefinitionPanel.reviewerSpecificationObjectHelp=Selection of reviewers based on object that has something assigned (or induced) to. E.g. you can specify that the role owner is used to certify all inducements made to 'his' role.
 StageDefinitionPanel.reviewerUseObjectManagerHelp=Selection of reviewers based on managers of object (typically a user) that has something assigned/induced to. E.g. you can specify that a manager is used to certify all assignments made to users in 'his' organization.
-StageDefinitionPanel.reviewerUseObjectManagerOrgTypeHelp=Influences determination of a manager of a user: First, we take all managers of all organizations the user belongs to. We exclude the user himself, if he is a manager of such organization (and if 'allow managers to approve their own assignments' below is unchecked). If the value in this field is filled-in, we use it to select only organizations with given organization type value - for example, 'functional' (if you have e.g. both functional-type and project-type organizations). If this field is empty, we take into account all organizations. If we find no suitable manager, we continue with all parent organizations (again, of the given type, if specified).
+StageDefinitionPanel.reviewerUseObjectManagerOrgTypeHelp=ユーザーのマネージャーの決定に影響を与えます。まず、ユーザーが属するすべての組織のすべてのマネージャーを取得します。ユーザーがそのような組織のマネージャーである場合（および下記の「マネージャーに自分の割当てを承認することを許可する」のチェックが外されている場合）、ユーザー自身を除外します。 このフィールドの値が入力されている場合は、指定された組織タイプの値を持つ組織のみを選択するために使用します。例えば、「ファンクショナル」（例えば、ファンクショナル・タイプとプロジェクト・タイプの組織の両方がある場合）。 このフィールドが空白の場合は、すべての組織が考慮されます。 適切なマネージャーが見つからない場合は、すべての親組織（ここでも指定されている場合は指定されたタイプのもの）を続行します。
 StageDefinitionPanel.reviewerUseObjectManagerAllowSelfHelp=If a user is a manager in his organization, could he be selected as a reviewer for his own assignments? If unchecked (the default), a higher-level manager is searched for - see description for the above field.
 StageDefinitionPanel.defaultReviewerRefHelp=上記の条件でレビューワーを導けない場合は、このレビューワー（複数可）が使用されます。
 StageDefinitionPanel.additionalReviewerRefHelp=このレビューワー（複数可）は、上記の条件で選択されたレビューワーに加えて使用されます。
@@ -3747,7 +3747,7 @@ PageResourceVisualization.dotMessage=DOTグラフのレンダリングは実行
 PageResourceVisualization.dot1=DOTレンダリング・ソフトウェアがサーバーにインストールされています。 推奨されるのはGraphvizです
 PageResourceVisualization.dot2=DOTレンダリング実行ファイルへのパスは、config.xmlファイルで正しく設定されています。
 PageResourceVisualization.moreInformation=詳細は、こちらをご覧ください：
-PageResourceVisualization.moreInformationLink=this article
+PageResourceVisualization.moreInformationLink=この記事
 PageResourceVisualization.errorMessage=エラーメッセージ
 PageResourceVisualization.seeOnline=オンラインのDOTレンダラーを使用することもできます
 PageResourceVisualization.seeOnlineLink=webgraphviz.com
@@ -4172,7 +4172,7 @@ ExpressionValuePanel.specifyExpression=式を指定する
 ExpressionValuePanel.addValueButtonDefaultTitle=シャドウ・リファレンス値を追加
 ExpressionValuePanel.addValueButtonTargetSearchTitle=アソシエーション・ターゲット・検索を追加
 ExpressionValuePanel.addLiteralValueButton=リテラル値を追加
-ExpressionValuePanel.associationDefenitionsNotDefined=Association definitions are not defined for the current resource with selected kind/intent parameters.
+ExpressionValuePanel.associationDefenitionsNotDefined=アソシエーション定義は、選択された種類/用途パラメーターを持つ現在のリソースに対して定義されていません。
 ConstructionType.attribute=属性
 ConstructionType.association=アソシエーション
 operation.Recompute.ALL.members=全メンバーの再計算
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
index c6a0b9f683c..4bb0c3f8248 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties
@@ -4172,7 +4172,7 @@ ExpressionValuePanel.specifyExpression=Określ wyrażenie
 ExpressionValuePanel.addValueButtonDefaultTitle=Dodaj wartość referencyjną cienia
 ExpressionValuePanel.addValueButtonTargetSearchTitle=Dodaj wyszukiwanie celu powiązania
 ExpressionValuePanel.addLiteralValueButton=Dodaj wartość dosłowną
-ExpressionValuePanel.associationDefenitionsNotDefined=Association definitions are not defined for the current resource with selected kind/intent parameters.
+ExpressionValuePanel.associationDefenitionsNotDefined=Brak jest definicji powiązań dla bieżącego systemu z wybranymi parametrami rodzaj/intencja
 ConstructionType.attribute=Atrybut
 ConstructionType.association=Powiązanie
 operation.Recompute.ALL.members=Przelicz wszystkich członków
diff --git a/infra/schema/src/main/resources/localization/schema_fr.properties b/infra/schema/src/main/resources/localization/schema_fr.properties
index b08ad80b20b..fce73424438 100644
--- a/infra/schema/src/main/resources/localization/schema_fr.properties
+++ b/infra/schema/src/main/resources/localization/schema_fr.properties
@@ -299,7 +299,7 @@ FormSpecificationType.formRef=Reference to form
 FormSpecificationType.panelClass=Classe de panneau
 FormSpecificationType.panelUri=Uri du panneau
 GenericPcpAspectConfigurationType.name=Nom
-GlobalPolicyRuleType.details=Règle globale de politique
+GlobalPolicyRuleType.details=Règle de politique globale
 GlobalPolicyRuleType.focusSelector=Sélecteur de foyer
 GlobalPolicyRuleType.targetSelector=Sélecteur de cible
 GlobalPolicyRuleType.condition=Conditions
@@ -633,9 +633,9 @@ RoleManagementConfigurationType.defaultAssignmentConstraints=Contraintes d'attri
 RoleManagementConfigurationType.defaultExecuteAfterAllApprovals=Default execute after all approvals
 RoleManagementConfigurationType.autoassignEnabled=Autoassign enabled
 RoleManagementConfigurationType.relations=Relations
-SearchBoxConfigurationType.defaultMode=Default mode
-SearchBoxConfigurationType.defaultObjectType=Default object type
-SearchBoxConfigurationType.defaultScope=Default scope
+SearchBoxConfigurationType.defaultMode=Mode par défaut
+SearchBoxConfigurationType.defaultObjectType=Type d'objet par défaut
+SearchBoxConfigurationType.defaultScope=Champ d'application par défaut
 ShadowType.dead=Mort
 ShadowType.kind=Sorte
 ShadowType.failedOperationType=Failed operation type
@@ -931,7 +931,7 @@ DefaultPolicyConstraint.not=Les contraintes incluses n'ont pas été enclenchée
 DefaultPolicyConstraint.transition=Contrainte de politique de transition appariée
 DefaultPolicyConstraint.situation=Contrainte de politique de situation appariée
 PolicyViolationException.message.aggregate=Des infractions à la politique {0} ont eu lieu.
-PolicyViolationException.message.projectionPassword=Le mot de passe fourni ne satisfait pas aux stratégies de mot de passe dans {0 }: {1}
+PolicyViolationException.message.projectionPassword=Le mot de passe fourni ne satisfait pas aux politiques de mots de passe dans {0} : {1}
 PolicyViolationException.message.credentials.nonce=Provided nonce does not satisfy the policies: {0}
 PolicyViolationException.message.credentials.password=Le mot de passe fourni ne satisfait pas les règles: {0}
 PolicyViolationException.message.credentials.securityQuestions=Les questions de sécurité fournies ne satisfont pas aux règles : {0}
@@ -1003,9 +1003,9 @@ PolicyConstraintsType.modification=Modification
 PolicyConstraintsType.modification.help=Contrainte déclenchée lorsque l'objet est modifié.
 PolicyConstraintsType.assignment=Attribution
 PolicyConstraintsType.assignment.help=Contrainte déclenchée lorsqu'un objet est attribué ou que l'attribution est retirée ou modifiée.
-PolicyConstraintsType.objectTimeValidity=Object time validity
+PolicyConstraintsType.objectTimeValidity=Durée de validité de l'objet
 PolicyConstraintsType.objectTimeValidity.help=Une contrainte qui se déclenche lorsque la validité d'un objet ou n'importe lequel de ses éléments asservis au temps (p.e. un mot de passe) est sur le point d'expirer.
-PolicyConstraintsType.assignmentTimeValidity=Validité du temps d'attribution
+PolicyConstraintsType.assignmentTimeValidity=Durée de validité des attributions
 PolicyConstraintsType.assignmentTimeValidity.help=Une contrainte qui se déclenche lorsque la validité d'une attribution ou n'importe lequel de ses éléments asservis au temps (p.e. un mot de passe) est sur le point d'expirer.
 PolicyConstraintsType.situation=Situation de politique
 PolicyConstraintsType.situation.help=Occurrence de la situation de politique au sein d'un objet ou d'une attribution.
@@ -1088,8 +1088,8 @@ DefaultPolicyConstraint.Short.objectModification.toBeDeleted=Suppression de {0}
 DefaultPolicyConstraint.Short.objectModification.wasDeleted={0} supprimé(e)
 DefaultPolicyConstraint.Short.objectModification.toBeModified=Modification de {0}
 DefaultPolicyConstraint.Short.objectModification.wasModified={0} modifié(e)
-DefaultPolicyConstraint.Short.objectState.unnamed=État d'appariement : {0}
-DefaultPolicyConstraint.Short.objectState.named=État d'appariement : {0} (« {1} »)
+DefaultPolicyConstraint.Short.objectState.unnamed=État d'appariement : {0}
+DefaultPolicyConstraint.Short.objectState.named=État d'appariement : {0} (« {1} »)
 # {0} = before/after, {1} target/path, {2} rule name
 DefaultPolicyConstraint.Short.assignmentState.unnamed=État correspondant : attribution de {1} ({0})
 DefaultPolicyConstraint.Short.assignmentState.named=État correspondant : attribution de {1} ({0}) (« {2} »)

From eb6903a93551361b7e97229b80e4cf9f645e02ea Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Fri, 1 Mar 2019 14:55:03 +0100
Subject: [PATCH 05/12] Fix intra-cluster authentication (MID-5162)

Also fixed the fix for TaskManagerQuartzImpl autowiring when profiling
is enabled.
---
 .../NodeAuthenticationEvaluatorImpl.java      | 105 +++++++++---------
 .../midpoint/task/api/TaskManager.java        |   7 ++
 .../quartzimpl/TaskManagerQuartzImpl.java     |   7 +-
 .../cluster/ClusterExecutionHelperImpl.java   |   9 +-
 .../quartzimpl/execution/HandlerExecutor.java |   4 +-
 .../LightweightPartitioningTaskHandler.java   |   2 +-
 6 files changed, 76 insertions(+), 58 deletions(-)

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NodeAuthenticationEvaluatorImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NodeAuthenticationEvaluatorImpl.java
index 680c24e495d..29776336582 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NodeAuthenticationEvaluatorImpl.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/NodeAuthenticationEvaluatorImpl.java
@@ -23,6 +23,7 @@
 import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -55,7 +56,7 @@ public class NodeAuthenticationEvaluatorImpl implements NodeAuthenticationEvalua
 	
 	private static final String OPERATION_SEARCH_NODE = NodeAuthenticationEvaluatorImpl.class.getName() + ".searchNode";
 	
-	public boolean authenticate(@Nullable String remoteName, String remoteAddress, @Nullable String credentials, String operation) {
+	public boolean authenticate(@Nullable String remoteName, String remoteAddress, @NotNull String credentials, String operation) {
 		LOGGER.debug("Checking if {} ({}) is a known node", remoteName, remoteAddress);
 		OperationResult result = new OperationResult(OPERATION_SEARCH_NODE);
 		
@@ -63,45 +64,52 @@ public boolean authenticate(@Nullable String remoteName, String remoteAddress, @
 		
 		try {
 			List<PrismObject<NodeType>> allNodes = repositoryService.searchObjects(NodeType.class, null, null, result);
-			List<PrismObject<NodeType>> matchingNodes = getMatchingNodes(allNodes, remoteName, remoteAddress, operation);
-			
-			if (matchingNodes.size() == 1 || matchingNodes.size() >= 1 && taskManager.isLocalNodeClusteringEnabled()) {
+			List<PrismObject<NodeType>> matchingNodes = getMatchingNodes(allNodes, remoteName, remoteAddress);
+
+			if (matchingNodes.isEmpty()) {
+				LOGGER.debug("Authenticity cannot be established: No matching nodes for remote name '{}' and remote address '{}'",
+						remoteName, remoteAddress);
+			} else if (matchingNodes.size() > 1 && !taskManager.isLocalNodeClusteringEnabled()) {
+				LOGGER.debug("Authenticity cannot be established: More than one matching node for remote name '{}' and "
+						+ "remote address '{}' with local-node clustering disabled: {}", remoteName, remoteAddress, matchingNodes);
+			} else {
+				assert matchingNodes.size() == 1 || matchingNodes.size() > 1 && taskManager.isLocalNodeClusteringEnabled();
 				LOGGER.trace(
-						"Matching result: Node(s) {} recognized as known (remote host name {} or IP address {} matched). Attempting to execute the requested operation: {}",
-						allNodes, remoteName, remoteAddress, operation);
+						"Matching result: Node(s) {} recognized as known (remote host name {} or IP address {} matched).",
+						matchingNodes, remoteName, remoteAddress);
 				PrismObject<NodeType> actualNode = null;
-				if (credentials != null) {
-					for (PrismObject<NodeType> matchingNode : matchingNodes) {
-						ProtectedStringType encryptedSecret = matchingNode.asObjectable().getSecret();
-						if (encryptedSecret != null) {
-							String plainSecret;
-							try {
-								plainSecret = protector.decryptString(encryptedSecret);
-							} catch (EncryptionException e) {
-								LoggingUtils.logUnexpectedException(LOGGER, "Couldn't decrypt node secret for {}", e, matchingNode);
-								continue;
-							}
-							if (credentials.equals(plainSecret)) {
-								LOGGER.debug("Node secret matches for {}", matchingNode);
-								actualNode = matchingNode;
-								break;
-							} else {
-								LOGGER.debug("Node secret does not match for {}", matchingNode);
-							}
+				for (PrismObject<NodeType> matchingNode : matchingNodes) {
+					ProtectedStringType encryptedSecret = matchingNode.asObjectable().getSecret();
+					if (encryptedSecret != null) {
+						String plainSecret;
+						try {
+							plainSecret = protector.decryptString(encryptedSecret);
+						} catch (EncryptionException e) {
+							LoggingUtils.logUnexpectedException(LOGGER, "Couldn't decrypt node secret for {}", e, matchingNode);
+							continue;
+						}
+						if (credentials.equals(plainSecret)) {
+							LOGGER.debug("Node secret matches for {}", matchingNode);
+							actualNode = matchingNode;
+							break;
+						} else {
+							LOGGER.debug("Node secret does not match for {}", matchingNode);
 						}
+					} else {
+						LOGGER.debug("No secret known for node {}", matchingNode);
 					}
-				} else {
-					actualNode = matchingNodes.get(0);
 				}
 				if (actualNode != null) {
+					LOGGER.trace("Established authenticity for remote {}", actualNode);
 					NodeAuthenticationToken authNtoken = new NodeAuthenticationToken(actualNode, remoteAddress,
 							Collections.emptyList());
 					SecurityContextHolder.getContext().setAuthentication(authNtoken);
 					securityHelper.auditLoginSuccess(actualNode.asObjectable(), connEnv);
 					return true;
+				} else {
+					LOGGER.debug("Authenticity for {} couldn't be established: none of the secrets match", matchingNodes);
 				}
 			}
-			
 		} catch (RuntimeException | SchemaException e) {
 			LOGGER.error("Unhandled exception when listing nodes");
 			LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing nodes", e);
@@ -110,27 +118,24 @@ public boolean authenticate(@Nullable String remoteName, String remoteAddress, @
 		return false;
 	}
 	
-private List<PrismObject<NodeType>> getMatchingNodes(List<PrismObject<NodeType>> knownNodes, String remoteName, String remoteAddress, String operation) {
-	List<PrismObject<NodeType>> matchingNodes = new ArrayList<>();
-	for (PrismObject<NodeType> node : knownNodes) {
-		NodeType actualNode = node.asObjectable();
-        if (remoteName != null && remoteName.equalsIgnoreCase(actualNode.getHostname())) {
-            LOGGER.trace("The node {} was recognized as a known node (remote host name {} matched). Attempting to execute the requested operation: {} ",
-                    actualNode.getName(), actualNode.getHostname(), operation);
-            matchingNodes.add(node);
-            continue;
-        }
-        if (actualNode.getIpAddress().contains(remoteAddress)) {
-            LOGGER.trace("The node {} was recognized as a known node (remote host address {} matched). Attempting to execute the requested operation: {} ",
-                    actualNode.getName(), remoteAddress, operation);
-            matchingNodes.add(node);
-            continue;
-        }
-    }
-	
-	return matchingNodes;
-}
-
-	
-	
+	private List<PrismObject<NodeType>> getMatchingNodes(List<PrismObject<NodeType>> knownNodes, String remoteName,
+			String remoteAddress) {
+		List<PrismObject<NodeType>> matchingNodes = new ArrayList<>();
+		for (PrismObject<NodeType> node : knownNodes) {
+			NodeType actualNode = node.asObjectable();
+			if (remoteName != null && remoteName.equalsIgnoreCase(actualNode.getHostname())) {
+				LOGGER.trace("The node {} was recognized as a known node (remote host name {} matched).",
+						actualNode.getName(), actualNode.getHostname());
+				matchingNodes.add(node);
+				continue;
+			}
+			if (actualNode.getIpAddress().contains(remoteAddress)) {
+				LOGGER.trace("The node {} was recognized as a known node (remote host address {} matched).",
+						actualNode.getName(), remoteAddress);
+				matchingNodes.add(node);
+				continue;
+			}
+		}
+		return matchingNodes;
+	}
 }
diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
index 35ef928292e..c18f3704ccf 100644
--- a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
+++ b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
@@ -740,4 +740,11 @@ String recordTaskThreadsDump(String taskOid, String cause, OperationResult paren
 	 * Use only for tests. Otherwise considered to be an ugly hack.
 	 */
 	RunningTask createFakeRunningTask(Task task);
+
+	TaskHandler getHandler(String handlerUri);
+
+	NodeType getLocalNode();
+
+	// TEMPORARY HACK -- DO NOT USE OUTSIDE task-quartz-impl module
+	Object getWorkStateManager();
 }
diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
index c26f85620b7..f5786467073 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
+++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
@@ -42,6 +42,7 @@
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.jetbrains.annotations.NotNull;
@@ -91,7 +92,6 @@
 import com.evolveum.midpoint.task.api.LightweightIdentifierGenerator;
 import com.evolveum.midpoint.task.api.LightweightTaskHandler;
 import com.evolveum.midpoint.task.api.RunningTask;
-import com.evolveum.midpoint.task.api.RunningTask;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.TaskCategory;
 import com.evolveum.midpoint.task.api.TaskDeletionListener;
@@ -2548,5 +2548,8 @@ public RunningTaskQuartzImpl createFakeRunningTask(Task task) {
 		return createRunningTask(task);
 	}
 
-
+	@Override
+	public NodeType getLocalNode() {
+		return ObjectTypeUtil.asObjectable(clusterManager.getLocalNodeObject());
+	}
 }
diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
index fcbe48703d4..80c223c505a 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
+++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
@@ -34,6 +34,7 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType;
+import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.jetbrains.annotations.NotNull;
@@ -110,14 +111,16 @@ public void execute(@NotNull NodeType node, @NotNull BiConsumer<WebClient, Opera
 			String url = baseUrl + "/ws/cluster";
 			LOGGER.debug("Going to execute '{}' on '{}'", context, url);
 			WebClient client = WebClient.create(url);
-			if (node.getSecret() == null) {
-				throw new SchemaException("No secret known for target node " + node.getNodeIdentifier());
+			NodeType localNode = taskManager.getLocalNode();
+			ProtectedStringType protectedSecret = localNode != null ? localNode.getSecret() : null;
+			if (protectedSecret == null) {
+				throw new SchemaException("No secret is set for local node " + localNode);
 			}
 			String secret;
 			try {
 				secret = protector.decryptString(node.getSecret());
 			} catch (EncryptionException e) {
-				throw new SystemException("Couldn't decrypt node secret: " + e.getMessage(), e);
+				throw new SystemException("Couldn't decrypt local node secret: " + e.getMessage(), e);
 			}
 			client.header("Authorization", RestAuthenticationMethod.CLUSTER.getMethod() + " " + Base64Utility.encode(secret.getBytes()));
 			code.accept(client, result);
diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/HandlerExecutor.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/HandlerExecutor.java
index a1912fb1d32..c9bc6b0af7b 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/HandlerExecutor.java
+++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/HandlerExecutor.java
@@ -83,7 +83,7 @@ private TaskRunResult executePlainTaskHandler(RunningTask task, TaskPartitionDef
 
 	@NotNull
 	private TaskRunResult executeWorkBucketAwareTaskHandler(RunningTaskQuartzImpl task, TaskPartitionDefinitionType taskPartition, WorkBucketAwareTaskHandler handler, OperationResult executionResult) {
-		WorkStateManager workStateManager = ((TaskManagerQuartzImpl) taskManager).getWorkStateManager();
+		WorkStateManager workStateManager = (WorkStateManager) taskManager.getWorkStateManager();
 		
 		if (task.getWorkState() != null && Boolean.TRUE.equals(task.getWorkState().isAllWorkComplete())) {
 			LOGGER.debug("Work is marked as complete; restarting it in task {}", task);
@@ -140,7 +140,7 @@ private TaskRunResult executeWorkBucketAwareTaskHandler(RunningTaskQuartzImpl ta
 				return runResult;
 			}
 			try {
-				((TaskManagerQuartzImpl) taskManager).getWorkStateManager().completeWorkBucket(task.getOid(), bucket.getSequentialNumber(), executionResult);
+				((WorkStateManager) taskManager.getWorkStateManager()).completeWorkBucket(task.getOid(), bucket.getSequentialNumber(), executionResult);
 			} catch (ObjectAlreadyExistsException | ObjectNotFoundException | SchemaException | RuntimeException e) {
 				LoggingUtils.logUnexpectedException(LOGGER, "Couldn't complete work bucket for task {}", e, task);
 				return createFailureTaskRunResult(task, "Couldn't complete work bucket: " + e.getMessage(), e);
diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/LightweightPartitioningTaskHandler.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/LightweightPartitioningTaskHandler.java
index 59cef8dc30b..c26395a9c3e 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/LightweightPartitioningTaskHandler.java
+++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/LightweightPartitioningTaskHandler.java
@@ -94,7 +94,7 @@ public TaskRunResult run(RunningTask task, TaskPartitionDefinitionType taskParti
 				
 		partitions.sort(comparator);
 		for (TaskPartitionDefinitionType partition : partitions) {
-			TaskHandler handler = ((TaskManagerQuartzImpl) taskManager).getHandler(partition.getHandlerUri());
+			TaskHandler handler = taskManager.getHandler(partition.getHandlerUri());
 			TaskRunResult subHandlerResult = handlerExecutor.executeHandler((RunningTaskQuartzImpl) task, partition, handler, opResult);
 //			TaskRunResult subHandlerResult = handler.run(task, partition);
 			OperationResult subHandlerOpResult = subHandlerResult.getOperationResult();

From e1c47aa742474c892cea4a1ba36e4c5ab43a5099 Mon Sep 17 00:00:00 2001
From: kate <honchar@evolveum.com>
Date: Fri, 1 Mar 2019 15:43:25 +0100
Subject: [PATCH 06/12] MID-5107 sorting for dropdown choices

---
 .../AssignmentActivationPopupablePanel.html   |  77 --------
 .../AssignmentActivationPopupablePanel.java   | 181 ------------------
 .../component/input/DropDownChoicePanel.java  |  19 +-
 .../web/page/admin/server/PageTaskAdd.html    |   2 +-
 .../web/page/admin/server/PageTaskAdd.java    |  13 +-
 5 files changed, 23 insertions(+), 269 deletions(-)
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
deleted file mode 100644
index 5048d061eff..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.html
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2010-2017 Evolveum
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-<html xmlns:wicket="http://wicket.apache.org">
-<wicket:panel>
-<div class="row" wicket:id="activationBlock">
-    <div class="container-fluid">
-        <div class="row prism-header">
-            <span class="col-md-2 prism-title"><wicket:message key="ActivationType.title"/></span>
-        </div>
-
-        <div class="prism-properties">
-
-            <div>
-                <div wicket:id="administrativeStatusContainer" class="row prism-property">
-                    <div class="col-xs-2">
-                        <span><wicket:message key="ActivationType.administrativeStatus"/></span>
-                    </div>
-                    <div class="col-xs-10">
-                        <div class="row">
-                            <div class="col-xs-6">
-                                <div wicket:id="administrativeStatus"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div wicket:id="validFromContainer" class="row prism-property">
-                    <div class="col-xs-2">
-                        <span><wicket:message key="ActivationType.validFrom"/></span>
-                    </div>
-                    <div class="col-xs-10">
-                        <div class="row">
-                            <div class="col-xs-9">
-                                <div wicket:id="validFrom" />
-                            </div>
-                        </div>
-                    </div>
-            </div>
-
-            <div>
-                <div wicket:id="validToContainer" class="row prism-property">
-                    <div class="col-xs-2">
-                        <span><wicket:message key="ActivationType.validTo"/></span>
-                    </div>
-                    <div class="col-xs-10">
-                        <div class="row">
-                            <div class="col-xs-9">
-                                <div wicket:id="validTo" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</div>
-    <div class="main-button-bar" wicket:id="buttonsPanel">
-        <a class="btn btn-default" wicket:id="okButton"/>
-        <a class="btn btn-default" wicket:id="cancelButton"/>
-    </div>
-</wicket:panel>
-</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
deleted file mode 100644
index 50caabfb269..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentActivationPopupablePanel.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2010-2017 Evolveum
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.evolveum.midpoint.web.component.assignment;
-
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.web.component.AjaxButton;
-import com.evolveum.midpoint.web.component.DateInput;
-import com.evolveum.midpoint.web.component.dialog.Popupable;
-import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationType;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.StringResourceModel;
-
-/**
- * Created by honchar.
- * the panel could be used as a content panel for popup
- * window as well as a standard page activation panel
- */
-public class AssignmentActivationPopupablePanel extends BasePanel<ActivationType> implements Popupable{
-    private static final long serialVersionUID = 1L;
-
-    private static final String ID_ACTIVATION = "activation";
-    private static final String ID_ACTIVATION_BLOCK = "activationBlock";
-    private static final String ID_ADMINISTRATIVE_STATUS = "administrativeStatus";
-    private static final String ID_VALID_FROM = "validFrom";
-    private static final String ID_VALID_TO = "validTo";
-    private static final String ID_ADMIN_STATUS_CONTAINER = "administrativeStatusContainer";
-    private static final String ID_VALID_FROM_CONTAINER = "validFromContainer";
-    private static final String ID_VALID_TO_CONTAINER = "validToContainer";
-    private static final String ID_OK_BUTTON = "okButton";
-    private static final String ID_CANCEL_BUTTON = "cancelButton";
-    private static final String ID_BUTTONS_PANEL = "buttonsPanel";
-
-
-    public AssignmentActivationPopupablePanel(String id, IModel<ActivationType> assignmentModel){
-        super(id, assignmentModel);
-        initModelObject();
-        initLayout();
-    }
-
-    private void initModelObject(){
-        if (getModelObject() == null){
-            getModel().setObject(new ActivationType());
-        }
-    }
-
-    private void initLayout(){
-        WebMarkupContainer activationBlock = new WebMarkupContainer(ID_ACTIVATION_BLOCK);
-        activationBlock.setOutputMarkupId(true);
-        add(activationBlock);
-
-        WebMarkupContainer adminStatusContainer = new WebMarkupContainer(ID_ADMIN_STATUS_CONTAINER);
-        adminStatusContainer.setOutputMarkupId(true);
-        activationBlock.add(adminStatusContainer);
-
-        DropDownChoicePanel administrativeStatus = WebComponentUtil.createEnumPanel(
-                ActivationStatusType.class, ID_ADMINISTRATIVE_STATUS,
-                new PropertyModel<ActivationStatusType>(getModel(), ActivationType.F_ADMINISTRATIVE_STATUS.getLocalPart()),
-                this);
-        adminStatusContainer.add(administrativeStatus);
-
-        WebMarkupContainer validFromContainer = new WebMarkupContainer(ID_VALID_FROM_CONTAINER);
-        validFromContainer.setOutputMarkupId(true);
-        activationBlock.add(validFromContainer);
-
-        DateInput validFrom = new DateInput(ID_VALID_FROM,
-                AssignmentsUtil.createDateModel(new PropertyModel<>(getModel(),
-                        ActivationType.F_VALID_FROM.getLocalPart())));
-        validFromContainer.add(validFrom);
-
-        WebMarkupContainer validToContainer = new WebMarkupContainer(ID_VALID_TO_CONTAINER);
-        validToContainer.setOutputMarkupId(true);
-        activationBlock.add(validToContainer);
-
-        DateInput validTo = new DateInput(ID_VALID_TO,
-                AssignmentsUtil.createDateModel(new PropertyModel<>(getModel(),
-                        ActivationType.F_VALID_TO.getLocalPart())));
-        validToContainer.add(validTo);
-
-        activationBlock.add(new VisibleEnableBehaviour() {
-
-            @Override
-            public boolean isVisible() {
-                // enabled activation in assignments for now.
-                return true;
-            }
-        });
-
-        WebMarkupContainer buttonsPanel = new WebMarkupContainer(ID_BUTTONS_PANEL);
-        buttonsPanel.setOutputMarkupId(true);
-        buttonsPanel.add(new VisibleEnableBehaviour(){
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible(){
-                return getButtonsPanelVisibility();
-            }
-        });
-        add(buttonsPanel);
-
-        AjaxButton okButton = new AjaxButton(ID_OK_BUTTON, createStringResource("AssignmentActivationPopupPanel.okButton")) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClick(AjaxRequestTarget ajaxRequestTarget) {
-                getPageBase().hideMainPopup(ajaxRequestTarget);
-                reloadDateComponent(ajaxRequestTarget);
-            }
-        };
-        buttonsPanel.add(okButton);
-
-        AjaxButton cancelButton = new AjaxButton(ID_CANCEL_BUTTON, createStringResource("AssignmentActivationPopupPanel.cancelButton")) {
-            private static final long serialVersionUID = 1L;
-            @Override
-            public void onClick(AjaxRequestTarget ajaxRequestTarget) {
-                getPageBase().hideMainPopup(ajaxRequestTarget);
-            }
-        };
-        buttonsPanel.add(cancelButton);
-
-        WebComponentUtil.addAjaxOnUpdateBehavior((WebMarkupContainer)get(ID_ACTIVATION_BLOCK));
-
-    }
-
-    protected void reloadDateComponent(AjaxRequestTarget target){
-    }
-
-    protected boolean getButtonsPanelVisibility(){
-        return true;
-    }
-
-    @Override
-    public int getWidth(){
-        return 600;
-    }
-
-    @Override
-    public int getHeight(){
-        return 300;
-    }
-
-    @Override
-    public String getWidthUnit(){
-        return "px";
-    }
-
-    @Override
-    public String getHeightUnit(){
-        return "px";
-    }
-
-    @Override
-    public StringResourceModel getTitle(){
-        return createStringResource("AssignmentActivationPopupPanel.title");
-    }
-
-    @Override
-    public Component getComponent(){
-        return this;
-    }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
index 21e8152cc33..cbb2ebdf569 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
@@ -17,13 +17,17 @@
 package com.evolveum.midpoint.web.component.input;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 
+import org.apache.commons.lang.Validate;
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 /**
  * @author lazyman
@@ -49,7 +53,8 @@ public DropDownChoicePanel(String id, IModel<T> model, IModel<? extends List<? e
                                boolean allowNull) {
         super(id);
 
-        DropDownChoice<T> input = new DropDownChoice<T>(ID_INPUT, model, choices, renderer) {
+        DropDownChoice<T> input = new DropDownChoice<T>(ID_INPUT, model,
+                Model.ofList(sortChoices(choices, renderer)), renderer) {
 
         	private static final long serialVersionUID = 1L;
 
@@ -71,6 +76,18 @@ protected String getNullValidDisplayValue() {
         add(input);
     }
 
+    private List<T> sortChoices(IModel<? extends List<? extends T>> choicesModel, IChoiceRenderer<T> renderer){
+        List<T> sortedList = choicesModel.getObject().stream().sorted((choice1, choice2) -> {
+            Validate.notNull(choice1);
+            Validate.notNull(choice2);
+
+            return String.CASE_INSENSITIVE_ORDER.compare(renderer.getDisplayValue(choice1).toString(), renderer.getDisplayValue(choice2).toString());
+
+
+        }).collect(Collectors.toList());
+        return sortedList;
+    }
+
     @Override
     public DropDownChoice<T> getBaseFormComponent() {
         return (DropDownChoice) get("input");
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
index 3f7e1dfdece..4d2da928c86 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
@@ -37,7 +37,7 @@ <h3><wicket:message key="pageTask.basic"/></h3>
                     </tr>
                     <tr>
                         <td><wicket:message key="pageTask.objectRef"/></td>
-                        <td><select class="form-control input-sm" wicket:id="resource"/></td>
+                        <td><div wicket:id="resource"/></td>
                     </tr>
                     <tr>
                         <td><wicket:message key="pageTask.kind"/></td>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
index 43ba0a23811..c9fc2df55fd 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
@@ -25,6 +25,7 @@
 
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
 import com.evolveum.midpoint.prism.delta.DeltaFactory;
+import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -221,15 +222,9 @@ private void initLayout() {
         Form mainForm = new com.evolveum.midpoint.web.component.form.Form(ID_FORM_MAIN);
         add(mainForm);
 
-        final DropDownChoice resource = new DropDownChoice<>(ID_RESOURCE,
+        final DropDownChoicePanel resource = new DropDownChoicePanel<TaskAddResourcesDto>(ID_RESOURCE,
             new PropertyModel<>(model, TaskAddDto.F_RESOURCE),
-                new IModel<List<TaskAddResourcesDto>>() {
-
-                    @Override
-                    public List<TaskAddResourcesDto> getObject() {
-                        return createResourceList();
-                    }
-                }, new ChoiceableChoiceRenderer<>());
+                Model.ofList(createResourceList()), new ChoiceableChoiceRenderer<>());
         resource.add(new VisibleEnableBehaviour() {
 
             @Override
@@ -241,7 +236,7 @@ public boolean isEnabled() {
                 return sync || recon || importAccounts;
             }
         });
-        resource.add(new AjaxFormComponentUpdatingBehavior("change") {
+        resource.getBaseFormComponent().add(new AjaxFormComponentUpdatingBehavior("change") {
 
             @Override
             protected void onUpdate(AjaxRequestTarget target) {

From 53764243edab4ad5ccd16d27ab777f4d8488a31e Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Fri, 1 Mar 2019 16:29:38 +0100
Subject: [PATCH 07/12] Re-fix intra-cluster authentication (MID-5162)

Fix of fix of fix of fix of ...
---
 .../task/quartzimpl/cluster/ClusterExecutionHelperImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
index 80c223c505a..4777e79d891 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
+++ b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterExecutionHelperImpl.java
@@ -118,7 +118,7 @@ public void execute(@NotNull NodeType node, @NotNull BiConsumer<WebClient, Opera
 			}
 			String secret;
 			try {
-				secret = protector.decryptString(node.getSecret());
+				secret = protector.decryptString(protectedSecret);
 			} catch (EncryptionException e) {
 				throw new SystemException("Couldn't decrypt local node secret: " + e.getMessage(), e);
 			}

From 8cf60b7dcc22f66ab736905b26c5f30791479735 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Fri, 1 Mar 2019 18:26:49 +0100
Subject: [PATCH 08/12] Support for PolyString translation

---
 .../midpoint/prism/polystring/PolyString.java |  44 ++++++
 .../PolyStringTranslationArgumentType.java    | 115 ++++++++++++++++
 .../types_3/PolyStringTranslationType.java    | 129 ++++++++++++++++++
 .../ns/_public/types_3/PolyStringType.java    |  49 +++++--
 .../prism/impl/marshaller/BeanMarshaller.java |  10 +-
 .../impl/marshaller/BeanUnmarshaller.java     |   9 +-
 .../impl/marshaller/PrismMarshaller.java      |  30 +++-
 .../main/resources/xml/ns/public/types-3.xsd  |  73 +++++++++-
 .../midpoint/prism/PrismInternalTestUtil.java |  37 ++++-
 .../com/evolveum/midpoint/prism/TestFind.java |   2 +-
 .../midpoint/prism/TestPrismParsing.java      |  16 +--
 .../common/json/user-jack-adhoc.json          |  14 +-
 .../common/json/user-jack-modified.json       |  14 +-
 .../common/json/user-jack-no-ns.json          |  13 +-
 .../test/resources/common/json/user-jack.json |  14 +-
 .../resources/common/xml/user-jack-adhoc.xml  |   7 +
 .../common/xml/user-jack-modified.xml         |   7 +
 .../resources/common/xml/user-jack-no-ns.xml  |   7 +
 .../test/resources/common/xml/user-jack.xml   |   7 +
 .../common/yaml/user-jack-adhoc.yaml          |  10 +-
 .../common/yaml/user-jack-modified.yaml       |  10 +-
 .../common/yaml/user-jack-no-ns.yaml          |   9 +-
 .../test/resources/common/yaml/user-jack.yaml |  10 +-
 23 files changed, 598 insertions(+), 38 deletions(-)
 create mode 100644 infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationArgumentType.java
 create mode 100644 infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java

diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
index e3551ed0faa..841acd15469 100644
--- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
+++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
@@ -25,6 +25,8 @@
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.ShortDumpable;
+import com.evolveum.midpoint.util.annotation.Experimental;
+import com.evolveum.prism.xml.ns._public.types_3.PolyStringTranslationType;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
 import java.io.Serializable;
@@ -50,9 +52,11 @@ public class PolyString implements Matchable<PolyString>, Recomputable, Structur
 
 	public static final ItemName F_ORIG = new ItemName(PrismConstants.NS_TYPES, "orig");
 	public static final ItemName F_NORM = new ItemName(PrismConstants.NS_TYPES, "norm");
+	public static final ItemName F_TRANSLATION = new ItemName(PrismConstants.NS_TYPES, "translation");
 
 	private final String orig;
 	private String norm = null;
+	private PolyStringTranslationType translation;
 
 	public PolyString(String orig) {
 		super();
@@ -70,6 +74,11 @@ public PolyString(String orig, String norm) {
 		this.orig = orig;
 		this.norm = norm;
 	}
+	
+	public PolyString(String orig, String norm, PolyStringTranslationType translation) {
+		this(orig, norm);
+		this.translation = translation;
+	}
 
 	public String getOrig() {
 		return orig;
@@ -79,6 +88,19 @@ public String getNorm() {
 		return norm;
 	}
 
+	public PolyStringTranslationType getTranslation() {
+		return translation;
+	}
+
+	/**
+	 * Do NOT rely on this method too much. It may disappear later, e.g. when we align PolyString and PolyString type and
+	 * make PolyString really immutable.
+	 */
+	@Experimental
+	public void setTranslation(PolyStringTranslationType translation) {
+		this.translation = translation;
+	}
+
 	public boolean isEmpty() {
 		if (orig == null) {
 			return true;
@@ -111,6 +133,8 @@ public Object resolve(ItemPath subpath) {
 			return orig;
 		} else if (QNameUtil.match(F_NORM, itemName)) {
 			return norm;
+		} else if (QNameUtil.match(F_TRANSLATION, itemName)) {
+			return translation;
 		} else {
 			throw new IllegalArgumentException("Unknown path segment "+itemName);
 		}
@@ -184,6 +208,7 @@ public int hashCode() {
 		int result = 1;
 		result = prime * result + ((norm == null) ? 0 : norm.hashCode());
 		result = prime * result + ((orig == null) ? 0 : orig.hashCode());
+		result = prime * result + ((translation == null) ? 0 : translation.hashCode());
 		return result;
 	}
 
@@ -206,6 +231,11 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!orig.equals(other.orig))
 			return false;
+		if (translation == null) {
+			if (other.translation != null)
+				return false;
+		} else if (!translation.equals(other.translation))
+			return false;
 		return true;
 	}
 
@@ -241,6 +271,10 @@ public String debugDump(int indent) {
 			sb.append(",");
 			sb.append(norm);
 		}
+		if (translation != null) {
+			sb.append(";translation=");
+			sb.append(translation.getKey());
+		}
 		sb.append(")");
 		return sb.toString();
 	}
@@ -278,6 +312,15 @@ public boolean matches(String regex) {
 		return Pattern.matches(regex, norm) || Pattern.matches(regex, orig);
 	}
 
+	/**
+	 * Returns true if the PolyString form contains only simple string.
+	 * I.e. returns true if the polystring can be serialized in a simplified form of a single string.
+	 * Returns true in case that there are language mutations, translation, etc.
+	 */
+	public boolean isSimple() {
+		return translation == null;
+	}
+
 	@Override
 	public void checkConsistence() {
 		if (orig == null) {
@@ -299,4 +342,5 @@ public static PolyStringType toPolyStringType(PolyString value) {
 	public static PolyString fromOrig(String orig) {
 		return new PolyString(orig);
 	}
+
 }
diff --git a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationArgumentType.java b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationArgumentType.java
new file mode 100644
index 00000000000..a638f4e632a
--- /dev/null
+++ b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationArgumentType.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2014.02.04 at 01:34:24 PM CET
+//
+
+
+package com.evolveum.prism.xml.ns._public.types_3;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+
+/**
+ * WARNING: this is NOT a generated code.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PolyStringTranslationArgumentType", propOrder = {
+    "value",
+    "translation"
+})
+public class PolyStringTranslationArgumentType implements Serializable, Cloneable {
+	private static final long serialVersionUID = 1L;
+
+	public static final QName COMPLEX_TYPE = new QName("http://prism.evolveum.com/xml/ns/public/types-3", "PolyStringTranslationArgumentType");
+
+    protected String value;
+    protected PolyStringTranslationType translation;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public PolyStringTranslationType getTranslation() {
+		return translation;
+	}
+
+	public void setTranslation(PolyStringTranslationType translation) {
+		this.translation = translation;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((translation == null) ? 0 : translation.hashCode());
+		result = prime * result + ((value == null) ? 0 : value.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		PolyStringTranslationArgumentType other = (PolyStringTranslationArgumentType) obj;
+		if (translation == null) {
+			if (other.translation != null)
+				return false;
+		} else if (!translation.equals(other.translation))
+			return false;
+		if (value == null) {
+			if (other.value != null)
+				return false;
+		} else if (!value.equals(other.value))
+			return false;
+		return true;
+	}
+
+    @Override
+	public String toString() {
+		return "PolyStringTranslationArgumentType(value=" + value + ", translation=" + translation + ")";
+	}
+
+	@Override
+    public PolyStringTranslationArgumentType clone() {
+        PolyStringTranslationArgumentType cloned = new PolyStringTranslationArgumentType();
+        cloned.setValue(value);
+        if (translation != null) {
+        	cloned.setTranslation(translation.clone());
+        }
+        return cloned;
+    }
+}
diff --git a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java
new file mode 100644
index 00000000000..09025dfdfde
--- /dev/null
+++ b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2019 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2014.02.04 at 01:34:24 PM CET
+//
+
+
+package com.evolveum.prism.xml.ns._public.types_3;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+
+/**
+ * WARNING: this is NOT a generated code.
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PolyStringTranslationType", propOrder = {
+    "key",
+    "fallback",
+    "argument"
+})
+public class PolyStringTranslationType implements Serializable, Cloneable {
+	private static final long serialVersionUID = 1L;
+
+	public static final QName COMPLEX_TYPE = new QName("http://prism.evolveum.com/xml/ns/public/types-3", "PolyStringTranslationType");
+
+	@XmlElement(required = true)
+    protected String key;
+    protected String fallback;
+    protected final List<PolyStringTranslationArgumentType> argument = new ArrayList<>();
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getFallback() {
+		return fallback;
+	}
+
+	public void setFallback(String fallback) {
+		this.fallback = fallback;
+	}
+
+	public List<PolyStringTranslationArgumentType> getArgument() {
+		return argument;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((argument == null) ? 0 : argument.hashCode());
+		result = prime * result + ((fallback == null) ? 0 : fallback.hashCode());
+		result = prime * result + ((key == null) ? 0 : key.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		PolyStringTranslationType other = (PolyStringTranslationType) obj;
+		if (argument == null) {
+			if (other.argument != null)
+				return false;
+		} else if (!argument.equals(other.argument))
+			return false;
+		if (fallback == null) {
+			if (other.fallback != null)
+				return false;
+		} else if (!fallback.equals(other.fallback))
+			return false;
+		if (key == null) {
+			if (other.key != null)
+				return false;
+		} else if (!key.equals(other.key))
+			return false;
+		return true;
+	}
+
+    @Override
+	public String toString() {
+		return "PolyStringTranslationType(key=" + key + ", fallback=" + fallback + ", argument=" + argument + ")";
+	}
+
+	@Override
+    public PolyStringTranslationType clone() {
+        PolyStringTranslationType cloned = new PolyStringTranslationType();
+        cloned.setKey(getKey());
+        cloned.setFallback(getFallback());
+        for (PolyStringTranslationArgumentType argument : getArgument()) {
+            cloned.getArgument().add(argument.clone());
+        }
+        return cloned;
+    }
+}
diff --git a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
index 4a058a34c15..09b943264b9 100644
--- a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
+++ b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,15 +86,21 @@
 @XmlType(name = "PolyStringType", propOrder = {
     "orig",
     "norm",
+    "translation",
     "any"
 })
 public class PolyStringType implements DebugDumpable, Serializable, Cloneable {
+	private static final long serialVersionUID = 1L;
 
 	public static final QName COMPLEX_TYPE = new QName("http://prism.evolveum.com/xml/ns/public/types-3", "PolyStringType");
 
     @XmlElement(required = true)
     protected String orig;
+    
     protected String norm;
+    
+    protected PolyStringTranslationType translation;
+
     @XmlAnyElement(lax = true)
     protected List<Object> any;
 
@@ -111,6 +117,7 @@ public PolyStringType(String orig) {
     public PolyStringType(PolyString polyString) {
     	this.orig = polyString.getOrig();
     	this.norm = polyString.getNorm();
+    	this.translation = polyString.getTranslation();
     }
 
     /**
@@ -160,8 +167,16 @@ public String getNorm() {
     public void setNorm(String value) {
         this.norm = value;
     }
+    
+    public PolyStringTranslationType getTranslation() {
+		return translation;
+	}
 
-    /**
+	public void setTranslation(PolyStringTranslationType translation) {
+		this.translation = translation;
+	}
+
+	/**
      * Gets the value of the any property.
      *
      * <p>
@@ -197,6 +212,15 @@ public boolean isEmpty() {
 		return orig.isEmpty();
 	}
     
+	/**
+	 * Returns true if the PolyString form contains only simple string.
+	 * I.e. returns true if the polystring can be serialized in a simplified form of a single string.
+	 * Returns true in case that there are language mutations, translation, etc.
+	 */
+	public boolean isSimple() {
+		return translation == null;
+	}
+    
     /**
      * Plus method for ease of use of PolyStrings in groovy (mapped from + operator).
      */
@@ -215,7 +239,7 @@ public PolyStringType plus(PolyStringType operand) {
     }
 
     public PolyString toPolyString() {
-    	return new PolyString(orig, norm);
+    	return new PolyString(orig, norm, translation);
     }
 
     /**
@@ -231,11 +255,6 @@ public String toString() {
 		return orig;
 	}
 
-	@Override
-	public String debugDump() {
-		return debugDump(0);
-	}
-
 	@Override
 	public String debugDump(int indent) {
 		StringBuilder sb = new StringBuilder();
@@ -246,6 +265,10 @@ public String debugDump(int indent) {
 			sb.append(",");
 			sb.append(norm);
 		}
+		if (translation != null) {
+			sb.append(";translation=");
+			sb.append(translation.getKey());
+		}
 		sb.append(")");
 		return sb.toString();
 
@@ -256,6 +279,9 @@ public PolyStringType clone() {
         PolyStringType poly = new PolyStringType();
         poly.setNorm(getNorm());
         poly.setOrig(getOrig());
+        if (translation != null) {
+        	poly.setTranslation(translation.clone());
+        }
         copyContent(getAny(), poly.getAny());
 
         return poly;
@@ -504,6 +530,7 @@ public int hashCode() {
 		result = prime * result + ((any == null || any.isEmpty()) ? 0 : any.hashCode());
 		result = prime * result + ((norm == null) ? 0 : norm.hashCode());
 		result = prime * result + ((orig == null) ? 0 : orig.hashCode());
+		result = prime * result + ((translation == null) ? 0 : translation.hashCode());
 		return result;
 	}
 
@@ -534,10 +561,16 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!orig.equals(other.orig))
 			return false;
+		if (translation == null) {
+			if (other.translation != null)
+				return false;
+		} else if (!translation.equals(other.translation))
+			return false;
 		return true;
 	}
 
 	public static PolyStringType fromOrig(String name) {
 		return name != null ? new PolyStringType(name) : null;
 	}
+
 }
diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanMarshaller.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanMarshaller.java
index 7581dbd45c7..f4c4042fd0a 100644
--- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanMarshaller.java
+++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,9 +89,13 @@ public <T> XNodeImpl marshall(@Nullable T bean, @Nullable SerializationContext c
 
 		// avoiding chatty PolyString serializations (namespace declaration + orig + norm)
 		if (bean instanceof PolyString) {
-			bean = (T) ((PolyString) bean).getOrig();
+			if (((PolyString)bean).isSimple()) {
+				bean = (T) ((PolyString) bean).getOrig();
+			}
 		} else if (bean instanceof PolyStringType) {
-			bean = (T) ((PolyStringType) bean).getOrig();
+			if (((PolyStringType)bean).isSimple()) {
+				bean = (T) ((PolyStringType) bean).getOrig();
+			}
 		}
 
 		if (bean instanceof Containerable) {
diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
index 78b1027755c..3a31ae7dddb 100644
--- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
+++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Evolveum
+ * Copyright (c) 2010-2019 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1156,7 +1156,12 @@ private Object unmarshalPolyStringFromMap(MapXNodeImpl map, Class<?> beanClass,
 			throw new SchemaException("Null polystring orig in "+map);
 		}
 		String norm = map.getParsedPrimitiveValue(QNameUtil.nullNamespace(PolyString.F_NORM), DOMUtil.XSD_STRING);
-		Object value = new PolyStringType(new PolyString(orig, norm));
+		PolyStringTranslationType translation = null;
+		XNodeImpl xTranslation = map.get(QNameUtil.nullNamespace(PolyString.F_TRANSLATION));
+		if (xTranslation != null) {
+			translation = unmarshal(xTranslation, PolyStringTranslationType.class, pc);
+		}
+		Object value = new PolyStringType(new PolyString(orig, norm, translation));
 		return toCorrectPolyStringClass(value, beanClass, map);
 	}
 
diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
index f79f9a6a455..a306a5b688e 100644
--- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
+++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
@@ -30,6 +30,7 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 import com.evolveum.prism.xml.ns._public.types_3.EvaluationTimeType;
+import com.evolveum.prism.xml.ns._public.types_3.PolyStringTranslationType;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
@@ -453,10 +454,31 @@ private <T> XNodeImpl serializePropertyValue(@NotNull PrismPropertyValue<T> valu
         }
     }
 
-	private XNodeImpl serializePolyString(PolyString realValue) {
-        PrimitiveXNodeImpl<PolyString> xprim = new PrimitiveXNodeImpl<>();
-        xprim.setValue(realValue, PolyStringType.COMPLEX_TYPE);
-        return xprim;
+	private XNodeImpl serializePolyString(PolyString realValue) throws SchemaException {
+		if (realValue.isSimple()) {
+	        PrimitiveXNodeImpl<PolyString> xprim = new PrimitiveXNodeImpl<>();
+	        xprim.setValue(realValue, PolyStringType.COMPLEX_TYPE);
+	        return xprim;
+	        
+		} else {
+			MapXNodeImpl xmap = new MapXNodeImpl();
+			
+			PrimitiveXNodeImpl<String> xorig = new PrimitiveXNodeImpl<>();
+			xorig.setValue(realValue.getOrig(), DOMUtil.XSD_STRING);
+			xmap.put(PolyString.F_ORIG, xorig);
+			
+			PrimitiveXNodeImpl<String> xnorm = new PrimitiveXNodeImpl<>();
+			xnorm.setValue(realValue.getNorm(), DOMUtil.XSD_STRING);
+			xmap.put(PolyString.F_NORM, xnorm);
+			
+			PolyStringTranslationType translation = realValue.getTranslation();
+			if (translation != null) {
+				XNodeImpl xTranslation = beanMarshaller.marshall(translation);
+				xmap.put(PolyString.F_TRANSLATION, xTranslation);
+			}
+			
+			return xmap;
+		}
     }
 
     @NotNull
diff --git a/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd b/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
index bf624c0a00f..0ea40e96044 100644
--- a/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
+++ b/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
@@ -30,7 +30,7 @@
         <xsd:documentation>
             Basic Prism types.
             
-            Version: 3.9
+            Version: 4.0-SNAPSHOT
             Recommended namespace prefix: t
         </xsd:documentation>
     </xsd:annotation>
@@ -87,6 +87,16 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="translation" type="tns:PolyStringTranslationType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Definition of string value by using localization key and parameters. 
+					</xsd:documentation>
+					<xsd:appinfo>
+						<a:since>4.0</a:since>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>
@@ -99,6 +109,67 @@
 		</xsd:sequence>
 	</xsd:complexType>
 	
+	<xsd:complexType name="PolyStringTranslationType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Definition of string value by using localization key and parameters.
+			</xsd:documentation>
+			<xsd:appinfo>
+				<a:since>4.0</a:since>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="key" type="xsd:string" minOccurs="1">
+				<xsd:annotation>
+					<xsd:documentation>
+						Key used to look up the localized message format in the localization catalogs.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="fallback" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Value of the string to be used in case that the key is not found in the localization catalogs.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="argument" type="tns:PolyStringTranslationArgumentType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>
+						Arguments for the translation. Arguments refer to placeholders in the format string in the localization catalog.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="PolyStringTranslationArgumentType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Arguments for localization translation. Arguments refer to placeholders in the format string in the localization catalog.
+			</xsd:documentation>
+			<xsd:appinfo>
+				<a:since>4.0</a:since>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="value" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Literal value for the localization argument.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="translation" type="tns:PolyStringTranslationType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Value of the localization argument is to be determined by using another localization key.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	
 	<xsd:complexType name="ProtectedStringType" mixed="true">
 		<xsd:annotation>
 			<xsd:documentation>
diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
index 7550dbfe58d..eaf7ce5c053 100644
--- a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
+++ b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
@@ -55,6 +55,8 @@
 import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
 import com.evolveum.midpoint.util.DOMUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
+import com.evolveum.prism.xml.ns._public.types_3.PolyStringTranslationArgumentType;
+import com.evolveum.prism.xml.ns._public.types_3.PolyStringTranslationType;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 import com.evolveum.prism.xml.ns._public.types_3.RawType;
 
@@ -300,9 +302,13 @@ public static void displayTestTitle(String testName) {
 	}
 
 	public static void assertUserJack(PrismObject<UserType> user, boolean expectRawInConstructions) throws SchemaException {
+		assertUserJack(user, expectRawInConstructions, true);
+	}
+	
+	public static void assertUserJack(PrismObject<UserType> user, boolean expectRawInConstructions, boolean expectFullPolyName) throws SchemaException {
 		user.checkConsistence();
 		user.assertDefinitions("test");
-		assertUserJackContent(user, expectRawInConstructions);
+		assertUserJackContent(user, expectRawInConstructions, expectFullPolyName);
 		assertUserJackExtension(user);
 		assertVisitor(user, 71);
 
@@ -321,7 +327,7 @@ public static void assertUserJack(PrismObject<UserType> user, boolean expectRawI
 //				NameItemPathSegment.WILDCARD), false, 5);
 	}
 
-	public static void assertUserJackContent(PrismObject<UserType> user, boolean expectRawInConstructions) throws SchemaException {
+	public static void assertUserJackContent(PrismObject<UserType> user, boolean expectRawInConstructions, boolean expectFullPolyName) throws SchemaException {
 		PrismContext prismContext = user.getPrismContext();
 		assertEquals("Wrong oid", USER_JACK_OID, user.getOid());
 		assertEquals("Wrong version", "42", user.getVersion());
@@ -340,7 +346,7 @@ public static void assertUserJackContent(PrismObject<UserType> user, boolean exp
         assertPropertyValue(user, "special", "got it!");
         assertPropertyDefinition(user, "special", DOMUtil.XSD_STRING, 0, 1);
 
-		assertPropertyValue(user, "polyName", new PolyString("Džek Sperou","dzek sperou"));
+        asssertJackPolyName(user, expectFullPolyName);
 		assertPropertyDefinition(user, "polyName", PolyStringType.COMPLEX_TYPE, 0, 1);
 
 		ItemPath enabledPath = USER_ENABLED_PATH;
@@ -422,6 +428,31 @@ public static void assertUserJackContent(PrismObject<UserType> user, boolean exp
 
 	}
 
+	private static void asssertJackPolyName(PrismObject<UserType> user, boolean expectFullPolyName) {
+		ItemName propQName = new ItemName(NS_FOO, "polyName");
+		PrismProperty<PolyString> polyNameProp = user.findProperty(propQName);
+		asssertJackPolyName(polyNameProp, user, expectFullPolyName);
+	}
+		
+	public static void asssertJackPolyName(PrismProperty<PolyString> polyNameProp, PrismObject<UserType> user, boolean expectFullPolyName) {
+		assertNotNull("No polyName in "+user, polyNameProp);
+		PolyString polyName = polyNameProp.getAnyRealValue();
+		assertEquals("Wrong polyName.orig in "+user, "Džek Sperou", polyName.getOrig());
+		assertEquals("Wrong polyName.norm in "+user, "dzek sperou", polyName.getNorm());
+		if (expectFullPolyName) {
+			PolyStringTranslationType translation = polyName.getTranslation();
+			assertNotNull("No polyName.translation in "+user, translation);
+			assertEquals("Wrong polyName.translation.key in "+user, "JACK", translation.getKey());
+			assertEquals("Wrong polyName.translation.fallback in "+user, "Jack", translation.getFallback());
+			List<PolyStringTranslationArgumentType> arguments = translation.getArgument();
+			assertNotNull("No polyName.translation.argument list in "+user, arguments);
+			assertEquals("Wrong number of polyName.translation.argument in "+user, 1, arguments.size());
+			PolyStringTranslationArgumentType argument = arguments.get(0);
+			assertNotNull("No polyName.translation.argument in "+user, argument);
+			assertEquals("Wrong polyName.translation.argument.value in "+user, "Sparrow", argument.getValue());
+		}
+	}
+
 	private static void assertUserJackExtension(PrismObject<UserType> user) throws SchemaException {
 		PrismContext prismContext = user.getPrismContext();
 		PrismContainer<?> extension = user.getExtension();
diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestFind.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestFind.java
index 9d2466743ae..b4daf2b22c6 100644
--- a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestFind.java
+++ b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestFind.java
@@ -77,7 +77,7 @@ public void testFindPolyString() throws SchemaException, SAXException, IOExcepti
 		PrismProperty<PolyString> nameProperty = findProperty(user, path);
 
 		// THEN
-		assertEquals("Wrong property value (path="+path+")", PrismTestUtil.createPolyString(USER_JACK_POLYNAME_ORIG), nameProperty.getRealValue());
+		PrismInternalTestUtil.asssertJackPolyName(nameProperty, user, true);
 		assertTrue("QName found something other", nameProperty == (PrismProperty) user.findProperty(UserType.F_POLY_NAME));
 	}
 
diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
index 42b48064a1c..0a8b9e9d2e2 100644
--- a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
+++ b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
@@ -122,7 +122,7 @@ public void test120PrismParseFileObject() throws Exception {
 		System.out.println(user.debugDump());
 		assertNotNull(user);
 
-		assertUserJack(user, true);
+		assertUserJack(user, true, false);
 	}
 
 	@Test
@@ -149,7 +149,7 @@ public void test200RoundTrip() throws Exception {
 		final String TEST_NAME = "test200RoundTrip";
 		PrismInternalTestUtil.displayTestTitle(TEST_NAME);
 
-		roundTrip(getFile(USER_JACK_FILE_BASENAME));
+		roundTrip(getFile(USER_JACK_FILE_BASENAME), true);
 	}
 
 	@Test
@@ -157,7 +157,7 @@ public void test210RoundTripNoNs() throws Exception {
 		final String TEST_NAME = "test210RoundTripNoNs";
 		PrismInternalTestUtil.displayTestTitle(TEST_NAME);
 
-		roundTrip(getFile(USER_JACK_NO_NS_BASENAME));
+		roundTrip(getFile(USER_JACK_NO_NS_BASENAME), true);
 	}
 
 	@Test
@@ -165,11 +165,11 @@ public void test220RoundTripObject() throws Exception {
 		final String TEST_NAME = "test220RoundTripObject";
 		PrismInternalTestUtil.displayTestTitle(TEST_NAME);
 
-		roundTrip(getFile(USER_JACK_OBJECT_BASENAME));
+		roundTrip(getFile(USER_JACK_OBJECT_BASENAME), false);
 	}
 
 
-	private void roundTrip(File file) throws SchemaException, SAXException, IOException {
+	private void roundTrip(File file, boolean expectFullPolyName) throws SchemaException, SAXException, IOException {
 
 		// GIVEN
 		PrismContext prismContext = constructInitializedPrismContext();
@@ -180,7 +180,7 @@ private void roundTrip(File file) throws SchemaException, SAXException, IOExcept
 		assertNotNull(originalUser);
 
 		// precondition
-		assertUserJack(originalUser, true);
+		assertUserJack(originalUser, true, expectFullPolyName);
 
 		// WHEN
 		// We need to serialize with composite objects during roundtrip, otherwise the result will not be equal
@@ -199,7 +199,7 @@ private void roundTrip(File file) throws SchemaException, SAXException, IOExcept
 		System.out.println(parsedUser.debugDump());
 		assertNotNull(parsedUser);
 
-		assertUserJack(parsedUser, true);
+		assertUserJack(parsedUser, true, expectFullPolyName);
 
 		ObjectDelta<UserType> diff = DiffUtil.diff(originalUser, parsedUser);
 		System.out.println("Diff:");
@@ -412,7 +412,7 @@ public void test500UserElisabethRoundTrip() throws Exception {
 
 	protected void assertUserAdhoc(PrismObject<UserType> user, boolean expectRawInConstructions) throws SchemaException {
 		user.checkConsistence();
-		assertUserJackContent(user, expectRawInConstructions);
+		assertUserJackContent(user, expectRawInConstructions, true);
 		assertUserExtensionAdhoc(user);
 		assertVisitor(user, 58);
 	}
diff --git a/infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json b/infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
index caf45d9670d..c58d3546df0 100644
--- a/infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
+++ b/infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
@@ -16,7 +16,19 @@
     "givenName" : "Jack",
     "familyName" : "Sparrow",
     "additionalNames" : [ "Captain", "Jackie" ],
-    "polyName" : "Džek Sperou",
+    "polyName" : {
+    	"@ns" : "http://prism.evolveum.com/xml/ns/public/types-3",
+    	"orig" : "Džek Sperou",
+    	"norm" : "dzek sperou",
+    	"translation" : {
+    		"key" : "JACK",
+    		"fallback" : "Jack",
+    		"argument" : [ {
+    			"value" : "Sparrow"
+    			}
+    		]
+    	}
+    },
     "assignment" : [ {
       "id" : 1111,
       "description" : "Assignment 1"
diff --git a/infra/prism-impl/src/test/resources/common/json/user-jack-modified.json b/infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
index a4391725434..13c72f35826 100644
--- a/infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
+++ b/infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
@@ -33,7 +33,19 @@
     "givenName" : "Jack",
     "familyName" : "Sparrow",
     "additionalNames" : [ "Jackie" ],
-    "polyName" : "Džek Sperou",
+    "polyName" : {
+    	"@ns" : "http://prism.evolveum.com/xml/ns/public/types-3",
+    	"orig" : "Džek Sperou",
+    	"norm" : "dzek sperou",
+    	"translation" : {
+    		"key" : "JACK",
+    		"fallback" : "Jack",
+    		"argument" : [ {
+    			"value" : "Sparrow"
+    			}
+    		]
+    	}
+    },
     "locality" : "World's End",
     "assignment" : [ {
       "id" : 1111,
diff --git a/infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json b/infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
index ad2427d677a..8c8d989fe65 100644
--- a/infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
+++ b/infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
@@ -30,7 +30,18 @@
     "givenName" : "Jack",
     "familyName" : "Sparrow",
     "additionalNames" : [ "Captain", "Jackie" ],
-    "polyName" : "Džek Sperou",
+    "polyName" : {
+    	"orig" : "Džek Sperou",
+    	"norm" : "dzek sperou",
+    	"translation" : {
+    		"key" : "JACK",
+    		"fallback" : "Jack",
+    		"argument" : [ {
+    			"value" : "Sparrow"
+    			}
+    		]
+    	}
+    },
     "assignment" : [ {
       "id" : 1111,
       "description" : "Assignment 1"
diff --git a/infra/prism-impl/src/test/resources/common/json/user-jack.json b/infra/prism-impl/src/test/resources/common/json/user-jack.json
index 9290c6066a8..30f0454c47d 100644
--- a/infra/prism-impl/src/test/resources/common/json/user-jack.json
+++ b/infra/prism-impl/src/test/resources/common/json/user-jack.json
@@ -33,7 +33,19 @@
     "givenName" : "Jack",
     "familyName" : "Sparrow",
     "additionalNames" : [ "Captain", "Jackie" ],
-    "polyName" : "Džek Sperou",
+    "polyName" : {
+    	"@ns" : "http://prism.evolveum.com/xml/ns/public/types-3",
+    	"orig" : "Džek Sperou",
+    	"norm" : "dzek sperou",
+    	"translation" : {
+    		"key" : "JACK",
+    		"fallback" : "Jack",
+    		"argument" : [ {
+    			"value" : "Sparrow"
+    			}
+    		]
+    	}
+    },
     "assignment" : [ {
       "id" : 1111,
       "description" : "Assignment 1"
diff --git a/infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml b/infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
index f5c14516493..09524378505 100644
--- a/infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
+++ b/infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
@@ -39,6 +39,13 @@
     <polyName>
     	<t:orig>Džek Sperou</t:orig>
     	<t:norm>dzek sperou</t:norm>
+    	<t:translation>
+    		<t:key>JACK</t:key>
+    		<t:fallback>Jack</t:fallback>
+    		<t:argument>
+    			<t:value>Sparrow</t:value>
+    		</t:argument>
+    	</t:translation>
     </polyName>
 
 	<assignment id="1111">
diff --git a/infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml b/infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
index ace6ddd2fcc..9181d85af22 100644
--- a/infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
+++ b/infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
@@ -43,6 +43,13 @@
     <polyName>
     	<t:orig>Džek Sperou</t:orig>
     	<t:norm>dzek sperou</t:norm>
+    	<t:translation>
+    		<t:key>JACK</t:key>
+    		<t:fallback>Jack</t:fallback>
+    		<t:argument>
+    			<t:value>Sparrow</t:value>
+    		</t:argument>
+    	</t:translation>
     </polyName>
     <locality>World's End</locality>
 
diff --git a/infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml b/infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
index 4e967c0f7b5..9e87717398e 100644
--- a/infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
+++ b/infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
@@ -51,6 +51,13 @@
     <polyName>
     	<orig>Džek Sperou</orig>
     	<norm>dzek sperou</norm>
+    	<translation>
+    		<key>JACK</key>
+    		<fallback>Jack</fallback>
+    		<argument>
+    			<value>Sparrow</value>
+    		</argument>
+    	</translation>
     </polyName>
 
 	<assignment id="1111">
diff --git a/infra/prism-impl/src/test/resources/common/xml/user-jack.xml b/infra/prism-impl/src/test/resources/common/xml/user-jack.xml
index 4f83ff30026..7328d3e1aea 100644
--- a/infra/prism-impl/src/test/resources/common/xml/user-jack.xml
+++ b/infra/prism-impl/src/test/resources/common/xml/user-jack.xml
@@ -59,6 +59,13 @@
     <polyName>
     	<t:orig>Džek Sperou</t:orig>
     	<t:norm>dzek sperou</t:norm>
+    	<t:translation>
+    		<t:key>JACK</t:key>
+    		<t:fallback>Jack</t:fallback>
+    		<t:argument>
+    			<t:value>Sparrow</t:value>
+    		</t:argument>
+    	</t:translation>
     </polyName>
 
 	<assignment id="1111">
diff --git a/infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml b/infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
index 40dd8e2879e..c5d496c9cd9 100644
--- a/infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
+++ b/infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
@@ -15,7 +15,15 @@ user:
   additionalNames:
   - "Captain"
   - "Jackie"
-  polyName: "Džek Sperou"
+  polyName:
+    '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
+    orig: "Džek Sperou"
+    norm: "dzek sperou"
+    translation:
+      key: "JACK"
+      fallback: "Jack"
+      argument:
+      - value: "Sparrow"
   assignment:
   - id: 1111
     description: "Assignment 1"
diff --git a/infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml b/infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
index 8f1db4572ac..075abcf820c 100644
--- a/infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
+++ b/infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
@@ -25,7 +25,15 @@ user:
   familyName: "Sparrow"
   additionalNames:
   - "Jackie"
-  polyName: "Džek Sperou"
+  polyName:
+    '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
+    orig: "Džek Sperou"
+    norm: "dzek sperou"
+    translation:
+      key: "JACK"
+      fallback: "Jack"
+      argument:
+      - value: "Sparrow"
   locality: "World's End"
   assignment:
   - id: 1111
diff --git a/infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml b/infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
index 6781d78d97b..fa1d628901a 100644
--- a/infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
+++ b/infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
@@ -23,7 +23,14 @@ user:
   additionalNames:
   - "Captain"
   - "Jackie"
-  polyName: "Džek Sperou"
+  polyName:
+    orig: "Džek Sperou"
+    norm: "dzek sperou"
+    translation:
+      key: "JACK"
+      fallback: "Jack"
+      argument:
+      - value: "Sparrow"
   assignment:
   - id: 1111
     description: "Assignment 1"
diff --git a/infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml b/infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml
index 9264e724cf5..85138046f71 100644
--- a/infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml
+++ b/infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml
@@ -25,7 +25,15 @@ user:
   additionalNames:
   - "Captain"
   - "Jackie"
-  polyName: "Džek Sperou"
+  polyName:
+    '@ns': "http://prism.evolveum.com/xml/ns/public/types-3"
+    orig: "Džek Sperou"
+    norm: "dzek sperou"
+    translation:
+      key: "JACK"
+      fallback: "Jack"
+      argument:
+      - value: "Sparrow"
   assignment:
   - id: !int 1111
     description: "Assignment 1"

From 78004984015a9ab35e2b747397496dd9ab385172 Mon Sep 17 00:00:00 2001
From: skublik <lskublik@evolveum.com>
Date: Fri, 1 Mar 2019 22:48:18 +0100
Subject: [PATCH 09/12] increase number of users

---
 .../midpoint/model/intest/TestActivation.java |  4 +--
 .../model/intest/gensync/TestEditSchema.java  |  2 +-
 .../midpoint/model/intest/misc/TestMisc.java  |  2 +-
 .../intest/security/AbstractSecurityTest.java |  2 +-
 .../sync/AbstractObjTemplateSyncTest.java     |  4 +--
 .../AbstractSynchronizationStoryTest.java     | 28 +++++++++----------
 .../intest/sync/TestInboundReconTask.java     |  8 +++---
 .../model/intest/sync/TestRecomputeTask.java  | 20 ++++++-------
 .../midpoint/model/intest/sync/TestUuid.java  |  8 +++---
 .../src/test/resources/common/user-will.xml   |  2 +-
 .../scripting/unassign-from-will-2.xml        |  2 +-
 .../scripting/unassign-from-will-3.xml        |  2 +-
 .../scripting/unassign-from-will.xml          |  2 +-
 13 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
index c58d6e38417..6f2b1fb6d8d 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
@@ -2265,7 +2265,7 @@ public void test310ImportAccountsFromDummyGreen() throws Exception {
         OperationResult result = task.getResult();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
         PrismObject<UserType> userMancomb = findUserByUsername(ACCOUNT_MANCOMB_DUMMY_USERNAME);
         assertNull("Unexpected user mancomb before import", userMancomb);
 
@@ -2286,7 +2286,7 @@ public void test310ImportAccountsFromDummyGreen() throws Exception {
         assertNotNull("No user mancomb after import", userMancomb);
         userMancombOid = userMancomb.getOid();
 
-        assertUsers(7);
+        assertUsers(8);
 
         assertAdministrativeStatusEnabled(userMancomb);
         assertValidFrom(userMancomb, ACCOUNT_MANCOMB_VALID_FROM_DATE);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
index 8e24e8bd3f1..8d2768e3536 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
@@ -1579,7 +1579,7 @@ public void test820OtisSearchUsers() throws Exception {
 		result.computeStatus();
 		TestUtil.assertSuccess(result);
 
-		assertEquals("Unexepected number of users found", 6, users.size());
+		assertEquals("Unexepected number of users found", 7, users.size());
 
 		for (final PrismObject<UserType> user: users) {
 			assertProperty(user, UserType.F_NAME, new Validator<PrismPropertyDefinition<PolyString>>() {
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java
index 5bf04618523..5b93c98e9e8 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/misc/TestMisc.java
@@ -157,7 +157,7 @@ public void test200ExportUsers() throws Exception {
         displayThen(TEST_NAME);
         assertSuccess(result);
 
-        assertEquals("Unexpected number of users", 5, users.size());
+        assertEquals("Unexpected number of users", 6, users.size());
         for (PrismObject<UserType> user: users) {
         	display("Exporting user", user);
         	assertNotNull("Null definition in "+user, user.getDefinition());
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
index 4203790587e..09bfc4ca8dc 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/AbstractSecurityTest.java
@@ -369,7 +369,7 @@ public abstract class AbstractSecurityTest extends AbstractInitializedModelInteg
 	protected static final XMLGregorianCalendar JACK_VALID_FROM_LONG_AGO = XmlTypeConverter.createXMLGregorianCalendar(10000L);
 	protected static final XMLGregorianCalendar JACK_VALID_TO_LONG_AGEAD = XmlTypeConverter.createXMLGregorianCalendar(10000000000000L);
 
-	protected static final int NUMBER_OF_ALL_USERS = 12;
+	protected static final int NUMBER_OF_ALL_USERS = 11;
 	protected static final int NUMBER_OF_IMPORTED_ROLES = 69;
 	protected static final int NUMBER_OF_ALL_ORGS = 11;
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
index 3bbfd7ba1ba..25e14e2ad7d 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractObjTemplateSyncTest.java
@@ -147,7 +147,7 @@ public void test110AddDummyByzantineAccountMancomb() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(5);
+        assertUsers(6);
 
         DummyAccount account = new DummyAccount(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 		account.setEnabled(true);
@@ -189,7 +189,7 @@ public void test110AddDummyByzantineAccountMancomb() throws Exception {
 		assertAssignedOrg(userMancomb, ORG_F0001_OID);
 		assertHasOrg(userMancomb, ORG_F0001_OID);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
index 0f1c041a9ff..3aef237d2ed 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
@@ -313,7 +313,7 @@ public void test220AddDummyBlueAccountWally() throws Exception {
         assertLinked(userWally, accountWallyGreen);
         assertLinked(userWally, accountWallyBlue);
 
-        assertUsers(7);
+        assertUsers(8);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -370,7 +370,7 @@ public void test315AddDummyBlueAccountMancomb() throws Exception {
         assertAccount(userMancomb, RESOURCE_DUMMY_BLUE_OID);
         assertAccount(userMancomb, RESOURCE_DUMMY_GREEN_OID);
 
-        assertUsers(7);
+        assertUsers(8);
 
         // notifications
         notificationManager.setDisabled(true);
@@ -409,7 +409,7 @@ public void test350ImportLiveSyncTaskDummyDefault() throws Exception {
         // Dummy resource has some extra users that may be created in recon, so let's give it a chance to do it now
         waitForSyncTaskNextRunAssertSuccess(getDummyResourceObject());
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 	}
 
 	/**
@@ -464,7 +464,7 @@ public void test360ModifyUserAddDummyDefaultAccount() throws Exception {
         assertLinked(userWally, accountWallyGreen);
         assertLinked(userWally, accountWallyBlue);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 	}
 
 //	@Test
@@ -592,7 +592,7 @@ public void test370ModifyDummyGreenAccountWally() throws Exception {
         assertLinked(userWally, accountWallyBlue);
         assertLinked(userWally, accountWallyDefault);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
         // notifications
         notificationManager.setDisabled(true);
@@ -667,7 +667,7 @@ public void test380ModifyUserWallyFullName() throws Exception {
         assertLinked(userWally, accountWallyBlue);
         assertLinked(userWally, accountWallyDefault);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
         notificationManager.setDisabled(true);
     }
@@ -742,7 +742,7 @@ public void test382ModifyUserWallyLocality() throws Exception {
         assertLinked(userWally, accountWallyBlue);
         assertLinked(userWally, accountWallyDefault);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
         notificationManager.setDisabled(true);
     }
@@ -798,7 +798,7 @@ public void test400DeleteDummyDefaultAccount() throws Exception {
         assertLinked(userWally, accountWallyGreen);
         assertLinked(userWally, accountWallyBlue);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
         // notifications
         notificationManager.setDisabled(true);
@@ -884,7 +884,7 @@ public void test410DeleteDummyGreenAccount() throws Exception {
 
 		assertNoShadow(ACCOUNT_WALLY_DUMMY_USERNAME, getDummyResourceObject(RESOURCE_DUMMY_BLUE_NAME), task, result);
 
-        assertUsers(6 + getNumberOfExtraDummyUsers());
+        assertUsers(7 + getNumberOfExtraDummyUsers());
 
         if (isReconciliation()) {
         	if (takResultBlue.getStatus() == OperationResultStatus.PARTIAL_ERROR) {
@@ -942,7 +942,7 @@ public void test510AddDummyGreenAccountWallyUserTemplate() throws Exception {
         assertLinks(userWally, 1);
         assertLinked(userWally, accountWallyGreen);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
 //        sync = ResourceTypeUtil.determineSynchronization(getDummyResourceObject(RESOURCE_DUMMY_BLUE_NAME).asObjectable(), UserType.class);
 //        if (sync != null){
@@ -965,7 +965,7 @@ public void test600AddDummyGreenAccountCalypso() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
         DummyAccount account = new DummyAccount(ACCOUNT_CALYPSO_DUMMY_USERNAME);
 		account.setEnabled(true);
@@ -993,7 +993,7 @@ public void test600AddDummyGreenAccountCalypso() throws Exception {
         display("User calypso", userCalypso);
         assertNull("User calypso was created, it should not", userCalypso);
 
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 	}
 
 	/**
@@ -1011,7 +1011,7 @@ public void test700AddDummyGreenAccountXjojo() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(7 + getNumberOfExtraDummyUsers());
+        assertUsers(8 + getNumberOfExtraDummyUsers());
 
         DummyAccount account = new DummyAccount("Xjojo");
 		account.setEnabled(true);
@@ -1044,7 +1044,7 @@ public void test700AddDummyGreenAccountXjojo() throws Exception {
 
         assertLinked(userAfter, accountAfter);
 
-        assertUsers(8 + getNumberOfExtraDummyUsers());
+        assertUsers(9 + getNumberOfExtraDummyUsers());
 
         // notifications
         notificationManager.setDisabled(true);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java
index 6fd47839d29..8482d4dff69 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestInboundReconTask.java
@@ -85,7 +85,7 @@ public void test180NoChange() throws Exception {
 		prepareNotifications();
 
 		// Preconditions
-		assertUsers(6);
+		assertUsers(7);
 
 		/// WHEN
 		displayWhen(TEST_NAME);
@@ -106,7 +106,7 @@ public void test180NoChange() throws Exception {
 		assertValidFrom(userMancomb, ACCOUNT_MANCOMB_VALID_FROM_DATE);
 		assertValidTo(userMancomb, ACCOUNT_MANCOMB_VALID_TO_DATE);
 
-		assertUsers(6);
+		assertUsers(7);
 
 		// notifications
 		notificationManager.setDisabled(true);
@@ -127,7 +127,7 @@ public void test199DeleteDummyEmeraldAccountMancomb() throws Exception {
         prepareNotifications();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
 
 		/// WHEN
         displayWhen(TEST_NAME);
@@ -159,7 +159,7 @@ public void test199DeleteDummyEmeraldAccountMancomb() throws Exception {
 
         assertNoDummyAccount(ACCOUNT_MANCOMB_DUMMY_USERNAME);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // notifications
         notificationManager.setDisabled(true);
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
index 081479afb6b..19641ffbddf 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
@@ -103,7 +103,7 @@ public void test100RecomputeAll() throws Exception {
         OperationResult result = task.getResult();
 
         // Preconditions
-        assertUsers(5);
+        assertUsers(6);
         assertNoDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_GUYBRUSH_DUMMY_USERNAME);
         assertNoDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME);
 
@@ -201,7 +201,7 @@ public void test100RecomputeAll() throws Exception {
         assertNoDummyAccount(null, ACCOUNT_JACK_DUMMY_USERNAME);
         assertDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, "Jack Sparrow", true);
 
-        assertUsers(6);
+        assertUsers(7);
 
         // Check audit
         display("Audit", dummyAuditService);
@@ -235,7 +235,7 @@ public void test100RecomputeAll() throws Exception {
         	}
 
         }
-        assertEquals("Unexpected number of audit modifications", 6, modifications);
+        assertEquals("Unexpected number of audit modifications", 7, modifications);
 
         deleteObject(TaskType.class, TASK_USER_RECOMPUTE_OID, task, result);
 	}
@@ -260,7 +260,7 @@ public void test110RecomputeSome() throws Exception {
         OperationResult result = task.getResult();
 
         // Preconditions
-        assertUsers(6);
+        assertUsers(7);
         assertDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, "Jack Sparrow", true);
         assertDummyAccount(RESOURCE_DUMMY_RED_NAME, USER_HERMAN_USERNAME, "Herman Toothrot", true);
 
@@ -302,7 +302,7 @@ public void test110RecomputeSome() throws Exception {
         // Only captains are recomputed. Therefore herman stays unrecomputed
         assertDummyAccount(RESOURCE_DUMMY_RED_NAME, USER_HERMAN_USERNAME, "Herman Toothrot", true);
 
-        assertUsers(6);
+        assertUsers(7);
 
 	}
 
@@ -320,7 +320,7 @@ public void test120RecomputeByExpression() throws Exception {
 		prepareNotifications();
 
 		// Preconditions
-		assertUsers(6);
+		assertUsers(7);
 		assertDummyAccount(RESOURCE_DUMMY_RED_NAME, ACCOUNT_JACK_DUMMY_USERNAME, "Jack Sparrow", false);
 		assertDummyAccount(RESOURCE_DUMMY_RED_NAME, USER_HERMAN_USERNAME, "Herman Toothrot", true);
 
@@ -361,7 +361,7 @@ public void test120RecomputeByExpression() throws Exception {
 		assertEquals("Wrong success count", 1, recomputeTask.getOperationStats().getIterativeTaskInformation().getTotalSuccessCount());
 		assertEquals("Wrong failure count", 0, recomputeTask.getOperationStats().getIterativeTaskInformation().getTotalFailureCount());
 
-		assertUsers(6);
+		assertUsers(7);
 
 		displayAllNotifications();
 		assertSingleDummyTransportMessageContaining("simpleAccountNotifier-SUCCESS", "Channel: " + SchemaConstants.CHANGE_CHANNEL_RECOMPUTE_URI);
@@ -381,7 +381,7 @@ public void test130RecomputeLight() throws Exception {
 		OperationResult result = task.getResult();
 
 		// Preconditions
-		assertUsers(6);
+		assertUsers(7);
 
 		PrismObject<UserType> usetJackBefore = getUser(USER_JACK_OID);
 		display("User jack before", usetJackBefore);
@@ -436,7 +436,7 @@ public void test130RecomputeLight() throws Exception {
 		assertDummyAccount(RESOURCE_DUMMY_RED_NAME, USER_HERMAN_USERNAME, "Herman Toothrot", false);
 
 		TaskType recomputeTask = getTask(TASK_USER_RECOMPUTE_LIGHT_OID).asObjectable();
-		assertEquals("Wrong success count", 6, recomputeTask.getOperationStats().getIterativeTaskInformation().getTotalSuccessCount());
+		assertEquals("Wrong success count", 7, recomputeTask.getOperationStats().getIterativeTaskInformation().getTotalSuccessCount());
 		assertEquals("Wrong failure count", 0, recomputeTask.getOperationStats().getIterativeTaskInformation().getTotalFailureCount());
 
 		PrismObject<UserType> usetJackAfter = getUser(USER_JACK_OID);
@@ -451,7 +451,7 @@ public void test130RecomputeLight() throws Exception {
 		assertAssignedOrgs(usetGuybrushAfter, ORG_MINISTRY_OF_OFFENSE_OID);
 	    assertHasOrgs(usetGuybrushAfter, ORG_MINISTRY_OF_OFFENSE_OID);
 
-		assertUsers(6);
+		assertUsers(7);
 
 	}
 
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
index a44a1e7f9e6..9a286b125d1 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestUuid.java
@@ -164,7 +164,7 @@ public void test200ReconcileDummyUuid() throws Exception {
         assertImportedUserByOid(USER_JACK_OID);
         assertImportedUserByOid(USER_BARBOSSA_OID);
 
-        assertEquals("Unexpected number of users", 5, users.size());
+        assertEquals("Unexpected number of users", 6, users.size());
 
         display("Dummy resource", getDummyResource().debugDump());
 
@@ -223,7 +223,7 @@ public void test210ReconcileDummyUuidAddAugustus() throws Exception {
         assertDummyAccountAttribute(RESOURCE_DUMMY_UUID_NAME, ACCOUNT_AUGUSTUS_NAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME,
         		ACCOUNT_AUGUSTUS_FULLNAME);
 
-        assertEquals("Unexpected number of users", 6, users.size());
+        assertEquals("Unexpected number of users", 7, users.size());
 
         display("Dummy resource", getDummyResource().debugDump());
 
@@ -302,7 +302,7 @@ public void test220ReconcileDummyUuidDeleteAddAugustus() throws Exception {
         assertDummyAccountAttribute(RESOURCE_DUMMY_UUID_NAME, ACCOUNT_AUGUSTUS_NAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME,
         		ACCOUNT_AUGUSTUS_FULLNAME);
 
-        assertEquals("Unexpected number of users", 6, users.size());
+        assertEquals("Unexpected number of users", 7, users.size());
 
         display("Dummy resource", getDummyResource().debugDump());
 
@@ -390,7 +390,7 @@ public void test230ReconcileDummyUuidDeleteAugustusAddAugustina() throws Excepti
         assertDummyAccountAttribute(RESOURCE_DUMMY_UUID_NAME, ACCOUNT_AUGUSTINA_NAME, DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_FULLNAME_NAME,
         		ACCOUNT_AUGUSTINA_FULLNAME);
 
-        assertEquals("Unexpected number of users", 6, users.size());
+        assertEquals("Unexpected number of users", 7, users.size());
 
         display("Dummy resource", getDummyResource().debugDump());
 
diff --git a/model/model-intest/src/test/resources/common/user-will.xml b/model/model-intest/src/test/resources/common/user-will.xml
index c552243300a..61e9b75d8d7 100644
--- a/model/model-intest/src/test/resources/common/user-will.xml
+++ b/model/model-intest/src/test/resources/common/user-will.xml
@@ -22,7 +22,7 @@
 		xmlns:xsd='http://www.w3.org/2001/XMLSchema'
 		xmlns:piracy='http://midpoint.evolveum.com/xml/ns/samples/piracy'
 		xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
-    <name>will</name>
+    <name>willTurner</name>
 	<!-- No full name -->
     <givenName>Will</givenName>
     <familyName>Turner</familyName>
diff --git a/model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml b/model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml
index ca4d368940d..62923c75d7f 100644
--- a/model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml
+++ b/model/model-intest/src/test/resources/scripting/unassign-from-will-2.xml
@@ -23,7 +23,7 @@
     <s:searchFilter>
         <equal xmlns="http://prism.evolveum.com/xml/ns/public/query-3">
             <path>c:name</path>
-            <value>will</value>
+            <value>willTurner</value>
         </equal>
     </s:searchFilter>
     <s:action>
diff --git a/model/model-intest/src/test/resources/scripting/unassign-from-will-3.xml b/model/model-intest/src/test/resources/scripting/unassign-from-will-3.xml
index e9683c2bf0f..8311e36ba5a 100644
--- a/model/model-intest/src/test/resources/scripting/unassign-from-will-3.xml
+++ b/model/model-intest/src/test/resources/scripting/unassign-from-will-3.xml
@@ -23,7 +23,7 @@
     <s:searchFilter>
         <equal xmlns="http://prism.evolveum.com/xml/ns/public/query-3">
             <path>c:name</path>
-            <value>will</value>
+            <value>willTurner</value>
         </equal>
     </s:searchFilter>
     <s:action>
diff --git a/model/model-intest/src/test/resources/scripting/unassign-from-will.xml b/model/model-intest/src/test/resources/scripting/unassign-from-will.xml
index 2e2e8ca47d6..8c9a103506a 100644
--- a/model/model-intest/src/test/resources/scripting/unassign-from-will.xml
+++ b/model/model-intest/src/test/resources/scripting/unassign-from-will.xml
@@ -23,7 +23,7 @@
     <s:searchFilter>
         <equal xmlns="http://prism.evolveum.com/xml/ns/public/query-3">
             <path>c:name</path>
-            <value>will</value>
+            <value>willTurner</value>
         </equal>
     </s:searchFilter>
     <s:action>

From 4afd03544414fd4869a9640e6a902577dae59b91 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Mon, 4 Mar 2019 11:57:35 +0100
Subject: [PATCH 10/12] PolyString fallbackTranslation

---
 .../types_3/PolyStringTranslationType.java    | 26 ++++++++++++++++---
 .../main/resources/xml/ns/public/types-3.xsd  |  7 +++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java
index 09025dfdfde..913ec46b683 100644
--- a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java
+++ b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringTranslationType.java
@@ -42,6 +42,7 @@
 @XmlType(name = "PolyStringTranslationType", propOrder = {
     "key",
     "fallback",
+    "fallbackTranslation",
     "argument"
 })
 public class PolyStringTranslationType implements Serializable, Cloneable {
@@ -52,6 +53,7 @@ public class PolyStringTranslationType implements Serializable, Cloneable {
 	@XmlElement(required = true)
     protected String key;
     protected String fallback;
+    protected PolyStringTranslationType fallbackTranslation;
     protected final List<PolyStringTranslationArgumentType> argument = new ArrayList<>();
 
 	public String getKey() {
@@ -69,17 +71,26 @@ public String getFallback() {
 	public void setFallback(String fallback) {
 		this.fallback = fallback;
 	}
+	
+	public PolyStringTranslationType getFallbackTranslation() {
+		return fallbackTranslation;
+	}
+
+	public void setFallbackTranslation(PolyStringTranslationType fallbackTranslation) {
+		this.fallbackTranslation = fallbackTranslation;
+	}
 
 	public List<PolyStringTranslationArgumentType> getArgument() {
 		return argument;
 	}
 
-	@Override
+    @Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((argument == null) ? 0 : argument.hashCode());
 		result = prime * result + ((fallback == null) ? 0 : fallback.hashCode());
+		result = prime * result + ((fallbackTranslation == null) ? 0 : fallbackTranslation.hashCode());
 		result = prime * result + ((key == null) ? 0 : key.hashCode());
 		return result;
 	}
@@ -103,6 +114,11 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!fallback.equals(other.fallback))
 			return false;
+		if (fallbackTranslation == null) {
+			if (other.fallbackTranslation != null)
+				return false;
+		} else if (!fallbackTranslation.equals(other.fallbackTranslation))
+			return false;
 		if (key == null) {
 			if (other.key != null)
 				return false;
@@ -111,9 +127,10 @@ public boolean equals(Object obj) {
 		return true;
 	}
 
-    @Override
+	@Override
 	public String toString() {
-		return "PolyStringTranslationType(key=" + key + ", fallback=" + fallback + ", argument=" + argument + ")";
+		return "PolyStringTranslationType(key=" + key + ", fallback=" + fallback + ", fallbackTranslation="
+				+ fallbackTranslation + ", argument=" + argument + ")";
 	}
 
 	@Override
@@ -121,6 +138,9 @@ public PolyStringTranslationType clone() {
         PolyStringTranslationType cloned = new PolyStringTranslationType();
         cloned.setKey(getKey());
         cloned.setFallback(getFallback());
+        if (getFallbackTranslation() != null) {
+        	cloned.setFallbackTranslation(getFallbackTranslation().clone());
+        }
         for (PolyStringTranslationArgumentType argument : getArgument()) {
             cloned.getArgument().add(argument.clone());
         }
diff --git a/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd b/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
index 0ea40e96044..c1200f7ca2a 100644
--- a/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
+++ b/infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
@@ -133,6 +133,13 @@
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element name="fallbackTranslation" type="tns:PolyStringTranslationType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>
+						Translation to be used in case that the key is not found in the localization catalogs.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="argument" type="tns:PolyStringTranslationArgumentType" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>

From bd6a3d18915e281a3f316c3596e7f6d1247b6d05 Mon Sep 17 00:00:00 2001
From: skublik <lskublik@evolveum.com>
Date: Tue, 5 Mar 2019 09:21:39 +0100
Subject: [PATCH 11/12] using bulk action unassign for unassign members
 MID-4983

---
 .../gui/api/util/WebComponentUtil.java        | 30 +++++++
 .../admin/roles/MemberOperationsHelper.java   | 81 ++++++++++++++++---
 2 files changed, 98 insertions(+), 13 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index 86f00f42920..176657499a6 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -63,6 +63,7 @@
 import com.evolveum.midpoint.schema.*;
 import com.evolveum.midpoint.schema.util.LocalizationUtil;
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.task.api.TaskBinding;
 import com.evolveum.midpoint.util.*;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.web.component.DateLabelComponent;
@@ -77,6 +78,7 @@
 import com.evolveum.midpoint.web.page.admin.valuePolicy.PageValuePolicy;
 import com.evolveum.midpoint.web.util.ObjectTypeGuiDescriptor;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ScriptingExpressionType;
 import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -134,6 +136,7 @@
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
 import com.evolveum.midpoint.task.api.TaskCategory;
+import com.evolveum.midpoint.task.api.TaskExecutionStatus;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -620,6 +623,33 @@ public static TaskType createSingleRecurrenceTask(String taskName, QName applica
 		}
 		return task;
 	}
+	
+	public static void executeBulkAction(PageBase pageBase, ScriptingExpressionType script, Task task, OperationResult result ){
+		try {
+		pageBase.getScriptingService().evaluateExpressionInBackground(script, task, result);
+	} catch (SchemaException | SecurityViolationException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException | ConfigurationException e) {
+    	result.recordFatalError(pageBase.createStringResource("WebComponentUtil.message.startPerformed.fatalError.submit").getString(), e);
+        LoggingUtils.logUnexpectedException(LOGGER, "Couldn't submit bulk action to execution", e);
+    }
+	}
+	
+	public static void executeMemberOperation(Task operationalTask, QName type, ObjectQuery memberQuery,
+			ScriptingExpressionType script, OperationResult parentResult, PageBase pageBase) throws SchemaException {
+		TaskType taskType = new TaskType(pageBase.getPrismContext());
+
+		MidPointPrincipal owner = SecurityUtils.getPrincipalUser();
+		operationalTask.setOwner(owner.getUser().asPrismObject());
+		
+		operationalTask.setBinding(TaskBinding.LOOSE);
+		operationalTask.setInitialExecutionStatus(TaskExecutionStatus.RUNNABLE);
+		operationalTask.setThreadStopAction(ThreadStopActionType.RESTART);
+		ScheduleType schedule = new ScheduleType();
+		schedule.setMisfireAction(MisfireActionType.EXECUTE_IMMEDIATELY);
+		operationalTask.makeSingle(schedule);
+		operationalTask.setName(WebComponentUtil.createPolyFromOrigString(parentResult.getOperation()));
+		
+		executeBulkAction(pageBase, script, operationalTask, parentResult);
+	}
 
 	public static void executeMemberOperation(Task operationalTask, QName type, ObjectQuery memberQuery,
 											  ObjectDelta delta, String category, OperationResult parentResult, PageBase pageBase) throws SchemaException{
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
index 907ee7204ea..203c785d8a5 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.query.QueryFactory;
@@ -18,18 +19,24 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.model.api.ModelPublicConstants;
+import com.evolveum.midpoint.prism.MutablePrismPropertyDefinition;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismObjectDefinition;
+import com.evolveum.midpoint.prism.PrismPropertyDefinition;
 import com.evolveum.midpoint.prism.PrismReferenceValue;
+import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.query.builder.S_AtomicFilterExit;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.TaskCategory;
+import com.evolveum.midpoint.util.DOMUtil;
+import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -43,12 +50,23 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
+import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ActionExpressionType;
+import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ActionParameterValueType;
+import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ScriptingExpressionType;
+import com.evolveum.midpoint.xml.ns._public.model.scripting_3.SearchExpressionType;
+import com.evolveum.prism.xml.ns._public.query_3.QueryType;
+import com.evolveum.prism.xml.ns._public.types_3.RawType;
 
 public class MemberOperationsHelper {
 
 	private static final Trace LOGGER = TraceManager.getTrace(AbstractRoleMemberPanel.class);
 	
+	private static final String UNASSIGN_OPERATION = "unassign";
+	private static final String ROLE_PARAMETER = "role";
+	private static final String RELATION_PARAMETER = "relation";
+	
 	public static void recomputeMembersPerformed(PageBase modelServiceLocator, QueryScope scope, ObjectQuery query, Collection<QName> supportedRelations, AjaxRequestTarget target) {
 		Task operationalTask = modelServiceLocator.createSimpleTask(getTaskName("Recompute", scope));
 		executeMemberOperation(modelServiceLocator, operationalTask, FocusType.COMPLEX_TYPE, query, null,
@@ -56,24 +74,44 @@ public static void recomputeMembersPerformed(PageBase modelServiceLocator, Query
 
 	}
 	
-	public static <R extends AbstractRoleType> void unassignMembersPerformed(PageBase pageBase, R targetObject, QueryScope scope, ObjectQuery query, Collection<QName> relation, QName type, AjaxRequestTarget target) {
-		Task operationalTask = pageBase.createSimpleTask(getTaskName("Remove", scope));
-		ObjectDelta delta = prepareAssignmentDelta(targetObject, type, relation, MemberOperation.REMOVE, pageBase.getPrismContext(), operationalTask.getResult());
-		executeMemberOperation(pageBase, operationalTask, type, query, delta,
-				TaskCategory.EXECUTE_CHANGES, target);
-
+	public static <R extends AbstractRoleType> void unassignOtherOrgMembersPerformed(PageBase pageBase, R targetObject, QueryScope scope, ObjectQuery query, Collection<QName> relations, AjaxRequestTarget target) {
+		unassignMembersPerformed(pageBase, targetObject, scope, query, relations, ObjectType.COMPLEX_TYPE, target);
 	}
 	
-	public static <R extends AbstractRoleType> void unassignOtherOrgMembersPerformed(PageBase pageBase, R targetObject, QueryScope scope, ObjectQuery query, Collection<QName> relations, AjaxRequestTarget target) {
-		Task operationalTask = pageBase.createSimpleTask(getTaskName("Remove", scope, false));
-		ObjectDelta delta = prepareObjectTypeDelta(targetObject, relations, MemberOperation.REMOVE, operationalTask.getResult(), pageBase.getPrismContext());
-		if (delta == null) {
-			return;
+	public static <R extends AbstractRoleType> void unassignMembersPerformed(PageBase pageBase, R targetObject, QueryScope scope, ObjectQuery query, Collection<QName> relations, QName type, AjaxRequestTarget target) {
+		Task operationalTask = pageBase.createSimpleTask(getTaskName("Remove", scope));
+		
+		SearchExpressionType script = new SearchExpressionType();
+		script.setType(type);
+		ActionExpressionType expression = new ActionExpressionType();
+		expression.setType(UNASSIGN_OPERATION);
+		
+		//hack using fake definition because of type
+		PrismPropertyDefinition<Object> def = pageBase.getPrismContext().definitionFactory().createPropertyDefinition(
+        		AbstractRoleType.F_NAME, DOMUtil.XSD_STRING);
+		PrismValue value = pageBase.getPrismContext().itemFactory().createValue(targetObject.getOid());
+		try {
+			value.applyDefinition(def);
+		} catch (SchemaException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
 		}
-		executeMemberOperation(pageBase, operationalTask, ObjectType.COMPLEX_TYPE,
-				query, delta, TaskCategory.EXECUTE_CHANGES, target);
+		expression.parameter(new ActionParameterValueType().name(ROLE_PARAMETER).value(
+				new RawType(value, DOMUtil.XSD_STRING, pageBase.getPrismContext())));
+		relations.forEach(relation -> {
+			expression.parameter(new ActionParameterValueType().name(RELATION_PARAMETER).value(QNameUtil.qNameToUri(relation)));
+		});
+		script.setScriptingExpression(new JAXBElement<ActionExpressionType>(SchemaConstants.S_ACTION,
+				ActionExpressionType.class, expression));
 		
+		try {
+			script.setQuery(pageBase.getQueryConverter().createQueryType(query));
+		} catch (SchemaException e) {
+			e.printStackTrace(); //TODO
+		}
 		
+		executeMemberOperation(pageBase, operationalTask, type, query, script, target);
+
 	}
 	
 	public static void deleteMembersPerformed(PageBase pageBase, QueryScope scope, ObjectQuery query, QName type, AjaxRequestTarget target) {
@@ -343,5 +381,22 @@ protected static void executeMemberOperation(PageBase modelServiceLocator, Task
 
 		target.add(modelServiceLocator.getFeedbackPanel());
 	}
+	
+	protected static void executeMemberOperation(PageBase modelServiceLocator, Task operationalTask, QName type, ObjectQuery memberQuery,
+			ScriptingExpressionType script, AjaxRequestTarget target) {
+
+		OperationResult parentResult = operationalTask.getResult();
+
+		try {
+			WebComponentUtil.executeMemberOperation(operationalTask, type, memberQuery, script, parentResult, modelServiceLocator);
+		} catch (SchemaException e) {
+			parentResult.recordFatalError(parentResult.getOperation(), e);
+			LoggingUtils.logUnexpectedException(LOGGER,
+					"Failed to execute operation " + parentResult.getOperation(), e);
+			target.add(modelServiceLocator.getFeedbackPanel());
+		}
+
+		target.add(modelServiceLocator.getFeedbackPanel());
+	}
 
 }

From a23ebb923e7f5e4688db304d1e717674b64f3960 Mon Sep 17 00:00:00 2001
From: skublik <lskublik@evolveum.com>
Date: Tue, 5 Mar 2019 09:44:17 +0100
Subject: [PATCH 12/12] adding show result MID-4983

---
 .../gui/api/util/WebComponentUtil.java        | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index 0d14a1048aa..dc9c5e2c67d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -624,18 +624,15 @@ public static TaskType createSingleRecurrenceTask(String taskName, QName applica
 		return task;
 	}
 	
-	public static void executeBulkAction(PageBase pageBase, ScriptingExpressionType script, Task task, OperationResult result ){
-		try {
+	public static void executeBulkAction(PageBase pageBase, ScriptingExpressionType script, Task task, OperationResult result ) 
+			throws SchemaException, SecurityViolationException, ObjectNotFoundException, ExpressionEvaluationException, 
+			CommunicationException, ConfigurationException{
+		
 		pageBase.getScriptingService().evaluateExpressionInBackground(script, task, result);
-	} catch (SchemaException | SecurityViolationException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException | ConfigurationException e) {
-    	result.recordFatalError(pageBase.createStringResource("WebComponentUtil.message.startPerformed.fatalError.submit").getString(), e);
-        LoggingUtils.logUnexpectedException(LOGGER, "Couldn't submit bulk action to execution", e);
-    }
 	}
 	
 	public static void executeMemberOperation(Task operationalTask, QName type, ObjectQuery memberQuery,
 			ScriptingExpressionType script, OperationResult parentResult, PageBase pageBase) throws SchemaException {
-		TaskType taskType = new TaskType(pageBase.getPrismContext());
 
 		MidPointPrincipal owner = SecurityUtils.getPrincipalUser();
 		operationalTask.setOwner(owner.getUser().asPrismObject());
@@ -647,8 +644,18 @@ public static void executeMemberOperation(Task operationalTask, QName type, Obje
 		schedule.setMisfireAction(MisfireActionType.EXECUTE_IMMEDIATELY);
 		operationalTask.makeSingle(schedule);
 		operationalTask.setName(WebComponentUtil.createPolyFromOrigString(parentResult.getOperation()));
-		
-		executeBulkAction(pageBase, script, operationalTask, parentResult);
+	
+		try {
+			executeBulkAction(pageBase, script, operationalTask, parentResult);
+			parentResult.recordInProgress();
+			parentResult.setBackgroundTaskOid(operationalTask.getOid());
+			pageBase.showResult(parentResult);
+		} catch (ObjectNotFoundException | SchemaException
+			| ExpressionEvaluationException | CommunicationException | ConfigurationException
+			| SecurityViolationException e) {
+			parentResult.recordFatalError(pageBase.createStringResource("WebComponentUtil.message.startPerformed.fatalError.submit").getString(), e);
+	        LoggingUtils.logUnexpectedException(LOGGER, "Couldn't submit bulk action to execution", e);
+		}
 	}
 
 	public static void executeMemberOperation(Task operationalTask, QName type, ObjectQuery memberQuery,