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

Evolveum · Jun 16, 2016 · 154eee5 · 154eee5
2 parents 001a475 + 4081a25
commit 154eee5
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 5 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java b/.../src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
@@ -220,6 +220,11 @@ public WebMarkupContainer getPanel(String panelId) {
 				}
 			});
 		}
+		int i = tabbedPanel.getSelectedTab();
+		if (i < 0 || i > tabs.size()) {
+			i = 0;
+		}
+		tabbedPanel.setSelectedTab(i);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -301,7 +306,6 @@ private void saveChanges() {
 
 		configurationPropertiesModel.reset();
 		updateConfigurationTabs();
-		TabbedPanel<ITab> tabbedPanel = getConfigurationTabbedPanel();
-		tabbedPanel.setSelectedTab(tabbedPanel.getSelectedTab());
+
 	}
 }
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
@@ -45,6 +45,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
 import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
+import com.evolveum.midpoint.web.util.ExpressionUtil;
 import com.evolveum.midpoint.web.util.InfoTooltipBehavior;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
@@ -1039,6 +1040,20 @@ private void removeEmptyContainers(@NotNull PrismObject<ResourceType> resourcePr
 					}
 				}
 				replace(objectType.getProtected(), newProtectedList);
+
+				// iterator expressions
+				if (objectType.getIteration() != null) {
+					IterationSpecificationType it = objectType.getIteration();
+					if (ExpressionUtil.isEmpty(it.getTokenExpression())) {
+						it.setTokenExpression(null);
+					}
+					if (ExpressionUtil.isEmpty(it.getPreIterationCondition())) {
+						it.setPreIterationCondition(null);
+					}
+					if (ExpressionUtil.isEmpty(it.getPostIterationCondition())) {
+						it.setPostIterationCondition(null);
+					}
+				}
             }
         }
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
@@ -413,7 +413,10 @@ private AccountCallableResult<List<SimpleAccountDto>> loadAccounts() throws Exce
         Collection<SelectorOptions<GetOperationOptions>> options =
                 SelectorOptions.createCollection(ShadowType.F_RESOURCE, getOpts);
 
-
+        SelectorOptions<GetOperationOptions> resolveNamesOptions = new SelectorOptions(GetOperationOptions.createResolveNames());
+        resolveNamesOptions.getOptions().setNoFetch(Boolean.TRUE);
+        options.add(resolveNamesOptions);
+
         List<ObjectReferenceType> references = user.asObjectable().getLinkRef();
         for (ObjectReferenceType reference : references) {
             PrismObject<ShadowType> account = WebModelServiceUtils.loadObject(ShadowType.class, reference.getOid(),

diff --git a/samples/demo-generic synchronization/object-template-org-GenSync.xml b/samples/demo-generic synchronization/object-template-org-GenSync.xml
@@ -34,6 +34,7 @@
     <mapping>
     	<name>Org-org mapping</name>
     	<authoritative>true</authoritative>
+		<strength>strong</strength>
     	<source>
     		<path>extension/ext:orgpath</path>
     	</source>
@@ -113,6 +114,7 @@
     <mapping>
     	<name>Org metarole assignment</name>
     	<authoritative>true</authoritative>
+		<strength>strong</strength>
     	<source>
     		<path>orgType</path>
     	</source>

diff --git a/samples/demo-generic synchronization/object-template-role-GenSync.xml b/samples/demo-generic synchronization/object-template-role-GenSync.xml
@@ -26,6 +26,7 @@
     <mapping>
     	<name>Responsibility metarole assignment</name>
     	<authoritative>true</authoritative>
+        <strength>strong</strength>
     	<source>
     		<path>extension/ext:responsibility</path>
     	</source>

diff --git a/samples/demo-generic synchronization/object-template-user-GenSync.xml b/samples/demo-generic synchronization/object-template-user-GenSync.xml
@@ -25,6 +25,7 @@
 
     <mapping>
     	<!-- This mapping is NOT initial so if will in fact FORCE fullname consistency -->
+		<strength>strong</strength>
     	<source>
     		<path>$user/givenName</path>
     	</source>
@@ -49,6 +50,7 @@
     </mapping>
 	<mapping>
       <description>A hack to avoid feedback to HR feed - deleting accounts because they are not assigned</description>
+	  <strength>strong</strength>
       <source>
          <c:path xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">employeeType</c:path>
       </source>
@@ -69,6 +71,7 @@
       </condition>
    </mapping>
    <mapping>
+	  <strength>strong</strength>
       <source>
          <c:path xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">employeeType</c:path>
       </source>
@@ -87,6 +90,7 @@
       </condition>
    </mapping>
    <mapping>
+	  <strength>strong</strength>
       <source>
          <c:path xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">employeeType</c:path>
       </source>
@@ -105,6 +109,7 @@
       </condition>
    </mapping>
    <mapping>
+	  <strength>strong</strength>
       <source>
          <c:path xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3">employeeType</c:path>
       </source>
@@ -141,6 +146,7 @@
     		the user.
     	</description>
     	<authoritative>true</authoritative>
+		<strength>strong</strength>
     	<source>
     		<path>extension/ext:orgpath</path>
     	</source>
@@ -211,6 +217,7 @@
     <mapping>
     	<name>responsibility role assignment</name>
     	<authoritative>true</authoritative>
+		<strength>strong</strength>
     	<source>
     		<path>extension/ext:responsibility</path>
     	</source>

diff --git a/samples/demo-rs/object-template-org.xml b/samples/demo-rs/object-template-org.xml
@@ -24,6 +24,7 @@
         <name>Org Template</name>
 
     <mapping>
+        <strength>strong</strength>
     	<source>
     		<path>orgType</path>
     	</source>

diff --git a/samples/demo-rs/object-template-user.xml b/samples/demo-rs/object-template-user.xml
@@ -54,6 +54,7 @@
         </mapping>
 
     <mapping>
+        <strength>strong</strength>
     	<source>
     		<path>employeeType</path>
     	</source>
@@ -74,6 +75,7 @@
     </mapping>
 
     <mapping>
+        <strength>strong</strength>
     	<source>
     		<path>employeeType</path>
     	</source>

diff --git a/samples/demo/orgs-objectTemplate.xml b/samples/demo/orgs-objectTemplate.xml
@@ -16,6 +16,7 @@
            when using Projects & Orgs you need to disable 'projects-objectTemplate.xml' and enable 'orgs-objectTemplate.xml'  -->
     <mapping>
         <description>A hack to avoid feedback to HR feed - deleting accounts because they are not assigned</description>
+        <strength>strong</strength>
         <source>
             <c:path>orgType</c:path>
         </source>
@@ -35,6 +36,7 @@
     </mapping>
     <mapping>
         <description>A hack to avoid feedback to HR feed - deleting accounts because they are not assigned</description>
+        <strength>strong</strength>
         <source>
             <c:path>orgType</c:path>
         </source>

diff --git a/samples/demo/user-template.xml b/samples/demo/user-template.xml
@@ -45,6 +45,7 @@
 
     <mapping>
 	<description>A hack to avoid feedback to HR feed - deleting accounts because they are not assigned</description>
+		<strength>strong</strength>
     	<source>
     		<path>employeeType</path>
     	</source>
@@ -68,6 +69,7 @@
     </mapping>
 
     <mapping>
+		<strength>strong</strength>
     	<source>
     		<path>employeeType</path>
     	</source>
@@ -89,6 +91,7 @@
     </mapping>
 
     <mapping>
+		<strength>strong</strength>
     	<source>
     		<path>employeeType</path>
     	</source>
@@ -111,7 +114,7 @@
 
 <!-- moved to HR Feed resource
     <mapping>
-	<strength>weak</strength>
+		<strength>weak</strength>
     	<expression>
             <value>ENABLED</value>    	
     	</expression>

diff --git a/samples/objects/object-template-org.xml b/samples/objects/object-template-org.xml
@@ -26,6 +26,7 @@
     <mapping>
     	<name>Org-org mapping</name>
     	<authoritative>true</authoritative>
+		<strength>strong</strength>
     	<source>
     		<path>extension/ext:orgpath</path>
     	</source>

diff --git a/samples/objects/object-template-role.xml b/samples/objects/object-template-role.xml
@@ -32,6 +32,7 @@
     <mapping>
     	<name>Responsibility metarole assignment</name>
     	<authoritative>true</authoritative>
+        <strength>strong</strength>
     	<source>
     		<path>extension/ext:responsibility</path>
     	</source>

diff --git a/samples/objects/object-template-user-nickname.xml b/samples/objects/object-template-user-nickname.xml
@@ -25,6 +25,7 @@
 
     <mapping>
     	<!-- This mapping is NOT initial so if will in fact FORCE fullname consistency -->
+        <strength>strong</strength>
     	<source>
     		<path>$user/givenName</path>
     	</source>

diff --git a/samples/objects/object-template-user.xml b/samples/objects/object-template-user.xml
@@ -25,6 +25,7 @@
 
     <mapping>
     	<!-- This mapping is NOT initial so if will in fact FORCE fullname consistency -->
+		<strength>strong</strength>
     	<source>
     		<path>$user/givenName</path>
     	</source>
@@ -50,6 +51,7 @@
 
     <mapping>
     	<name>basic role</name>
+		<strength>strong</strength>
     	<expression>
             <assignmentTargetSearch>
             	<targetType>c:RoleType</targetType>

diff --git a/samples/objects/user-template-complex.xml b/samples/objects/user-template-complex.xml
@@ -25,6 +25,7 @@
     <name>Complex User Template</name>
     <mapping>
 		<!-- This expression is NOT initial so if will in fact FORCE fullname consistency -->
+		<strength>strong</strength>
 		<source>
 			<path>$user/givenName</path>
 		</source>
@@ -46,6 +47,7 @@
 
 	<!-- Unconditional automatic assignment of OpenDJ resource -->
     <mapping>
+		<strength>strong</strength>
     	<expression>
             <value>
             	<assignment>
@@ -62,6 +64,7 @@
 
     <!-- RB-RBAC functionality. The Pirate role is automatically assigned based on the value of employeeType property -->
     <mapping>
+		<strength>strong</strength>
     	<source>
     		<path>employeeType</path>
     	</source>

diff --git a/samples/resources/ad/ad-resource-groups-advanced.xml b/samples/resources/ad/ad-resource-groups-advanced.xml
@@ -438,6 +438,7 @@
         <mapping>
             <name>Metarole assignment</name>
             <authoritative>true</authoritative>
+            <strength>strong</strength>
             <expression>
                 <assignmentTargetSearch>
                     <targetType>c:RoleType</targetType>

diff --git a/samples/resources/sap/assignment/object-template-org.xml b/samples/resources/sap/assignment/object-template-org.xml
@@ -14,6 +14,7 @@
     <mapping>
         <name>SAP Role (ActivityGroup) metarole assignment</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>orgType</path>
         </source>
@@ -36,6 +37,7 @@
     <mapping>
         <name>Parent for SAP Roles</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>orgType</path>
         </source>
@@ -60,6 +62,7 @@
     <mapping>
         <name>SAP Group metarole assignment</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>orgType</path>
         </source>
@@ -82,6 +85,7 @@
     <mapping>
         <name>Parent for SAP Groups</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>orgType</path>
         </source>
@@ -106,6 +110,7 @@
     <mapping>
         <name>SAP Profile metarole assignment</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>orgType</path>
         </source>
@@ -128,6 +133,7 @@
     <mapping>
         <name>Parent for SAP Profiles</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>orgType</path>
         </source>

diff --git a/samples/resources/sap/assignment/object-template-user.xml b/samples/resources/sap/assignment/object-template-user.xml
@@ -60,6 +60,7 @@
    	<!--<mapping>-->
 		<!--<name>End user role for all CDO users</name>-->
 		<!--<authoritative>true</authoritative>-->
+		<!--<strength>strong</strength>-->
 		<!--<source>-->
 			<!--<path>employeeType</path>-->
 		<!--</source>-->
@@ -84,6 +85,7 @@
  	<mapping>
       <name>User - SAP Role mapping</name>
       <authoritative>true</authoritative>
+	  <strength>strong</strength>
       <source>
          <c:name>sapRole</c:name>
          <c:path xmlns:ext="http://xml.uniba.sk/cdoext">extension/sapRoles</c:path>
@@ -134,6 +136,7 @@
 	<mapping>
 		<name>User - SAP Profile mapping</name>
 		<authoritative>true</authoritative>
+		<strength>strong</strength>
 		<source>
 			<c:name>sapProfile</c:name>
 			<c:path xmlns:ext="http://xml.uniba.sk/cdoext">extension/sapProfiles</c:path>
@@ -184,6 +187,7 @@
 	<mapping>
 		<name>User - SAP Group mapping</name>
 		<authoritative>true</authoritative>
+		<strength>strong</strength>
 		<source>
 			<c:name>sapGroup</c:name>
 			<c:path xmlns:ext="http://xml.uniba.sk/cdoext">extension/sapGroups</c:path>

diff --git a/samples/resources/sap/object-template-role.xml b/samples/resources/sap/object-template-role.xml
@@ -12,6 +12,7 @@
     <mapping>
         <name>SAP ActivityGroup metarole assignment</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>roleType</path>
         </source>
@@ -34,6 +35,7 @@
     <mapping>
         <name>SAP Group metarole assignment</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>roleType</path>
         </source>
@@ -56,6 +58,7 @@
     <mapping>
         <name>SAP Group metarole assignment</name>
         <authoritative>true</authoritative>
+        <strength>strong</strength>
         <source>
             <path>roleType</path>
         </source>

diff --git a/samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml b/samples/stories/multitenant-idm-saas/objectTemplates/object-template-org.xml
@@ -29,7 +29,7 @@
     	<source>
     		<path>orgType</path>
     	</source>
-	<source>
+	    <source>
     		<path>name</path>
     	</source>
     	<expression>