Merge branch 'master' into feature/deputy

Evolveum · Nov 4, 2016 · e725c3d · e725c3d
2 parents f915b8e + a94f2f1
commit e725c3d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 58 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
@@ -20,6 +20,7 @@
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.web.component.assignment.*;
 import com.evolveum.midpoint.web.page.self.PageAssignmentDetails;
+import com.evolveum.midpoint.web.session.RoleCatalogStorage;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -28,6 +29,7 @@
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -216,16 +218,16 @@ private String getBackgroundClass(AssignmentEditorDtoType type){
     }
 
     private void addAssignmentPerformed(AssignmentEditorDto assignment, AjaxRequestTarget target){
-//        plusIconClicked = true;
-//        RoleCatalogStorage storage = getPageBase().getSessionStorage().getRoleCatalog();
-//        if (storage.getAssignmentShoppingCart() == null){
-//            storage.setAssignmentShoppingCart(new ArrayList<AssignmentEditorDto>());
-//        }
-//        List<AssignmentEditorDto> assignmentsToAdd = storage.getAssignmentShoppingCart();
-//        assignmentsToAdd.add(assignment);
-//        storage.setAssignmentShoppingCart(assignmentsToAdd);
-//        CatalogItemsPanel parent = MultiButtonTable.this.findParent(CatalogItemsPanel.class);
-//        parent.reloadCartButton(target);
+        plusIconClicked = true;
+        RoleCatalogStorage storage = getPageBase().getSessionStorage().getRoleCatalog();
+        if (storage.getAssignmentShoppingCart() == null){
+            storage.setAssignmentShoppingCart(new ArrayList<AssignmentEditorDto>());
+        }
+        List<AssignmentEditorDto> assignmentsToAdd = storage.getAssignmentShoppingCart();
+        assignmentsToAdd.add(assignment);
+        storage.setAssignmentShoppingCart(assignmentsToAdd);
+        AssignmentCatalogPanel parent = MultiButtonTable.this.findParent(AssignmentCatalogPanel.class);
+        parent.reloadCartButton(target);
 
     }
 

diff --git a/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml b/gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -9697,6 +9697,18 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:element>
+
+                    <xsd:element name="globalPolicyRule" type="tns:PolicyRuleType" minOccurs="0" maxOccurs="unbounded">
+					    <xsd:annotation>
+					        <xsd:documentation>
+					            Global policy rules that are applied to all (selected) objects in the system.
+					            These rules specify compliance and governance constraints.
+					        </xsd:documentation>
+					        <xsd:appinfo>
+								<a:since>3.5</a:since>
+							</xsd:appinfo>
+					    </xsd:annotation>
+					</xsd:element>
 
                     <xsd:element name="profilingConfiguration" type="tns:ProfilingConfigurationType" minOccurs="0" maxOccurs="1">
                         <xsd:annotation>
@@ -10539,23 +10551,15 @@
 			    </xsd:annotation>
 			</xsd:element>
 			<!-- TODO: role assignment mode: multiple, single, parametric-multiple -->
-			<xsd:element name="globalPolicyRule" type="tns:PolicyRuleType" minOccurs="0" maxOccurs="unbounded">
-			    <xsd:annotation>
-			        <xsd:documentation>
-			            Reference to the root object of the role catalog.
-			        </xsd:documentation>
-			        <xsd:appinfo>
-						<a:since>3.5</a:since>
-					</xsd:appinfo>
-			    </xsd:annotation>
-			</xsd:element>
         </xsd:sequence>
     </xsd:complexType>
 
     <xsd:complexType name="PolicyRuleType">
         <xsd:annotation>
             <xsd:documentation>
-                TODO
+                These rules specify compliance and governance constraints.
+                E.g. role exclusion (SoD), number of assignees, 
+                approvals, remediation, etc.
             </xsd:documentation>
             <xsd:appinfo>
 				<a:since>3.5</a:since>

diff --git a/...ing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java b/...ing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdapUniversity.java
@@ -22,9 +22,7 @@
 import com.evolveum.midpoint.model.impl.sync.ReconciliationTaskHandler;
 import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.schema.constants.MidPointConstants;
-import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.internals.InternalsConfig;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
@@ -33,7 +31,6 @@
 import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentPolicyEnforcementType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTemplateType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
@@ -55,7 +52,6 @@
 import javax.xml.namespace.QName;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import static com.evolveum.midpoint.test.IntegrationTestTools.display;
@@ -192,9 +188,9 @@ private void createUsers(String prefix, OperationResult result) throws ObjectAlr
         for(int i=0; i < NUM_LDAP_ENTRIES; i++) {
             UserType userType = (UserType) prismContext.getSchemaRegistry().findObjectDefinitionByType(UserType.COMPLEX_TYPE).instantiate().asObjectable();
             if (i%2 == 0) {
-                userType.setName(createPolyString("e" + i));
+                userType.setName(createPolyStringType("e" + i));
             } else {
-                userType.setName(createPolyString("e" + i + "(u" + i + ")"));
+                userType.setName(createPolyStringType("e" + i + "(u" + i + ")"));
             }
             userType.setEmployeeNumber("e"+i);
             repositoryService.addObject(userType.asPrismObject(), null, result);
@@ -315,11 +311,4 @@ private String groupDn(int groupIndex) {
     private String groupCn(int groupIndex) {
         return String.format("g%02d", groupIndex);
     }
-
-    private PolyStringType createPolyString(String orig) {
-        PolyStringType poly = new PolyStringType();
-        poly.setOrig(orig);
-        return poly;
-    }
-
 }
diff --git a/testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java b/testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
@@ -124,10 +124,10 @@ private PrismObject<UserType> createUser(String parentOid, int i, int u, String
             throws Exception {
         UserType user = new UserType();
         user.setOid("1" + createOid(u, oidPrefix + i));
-        user.setName(createPolyString("u" + oidPrefix + i + u));
-        user.setFullName(createPolyString("fu" + oidPrefix + i + u));
-        user.setFamilyName(createPolyString("fa" + oidPrefix + i + u));
-        user.setGivenName(createPolyString("gi" + oidPrefix + i + u));
+        user.setName(createPolyStringType("u" + oidPrefix + i + u));
+        user.setFullName(createPolyStringType("fu" + oidPrefix + i + u));
+        user.setFamilyName(createPolyStringType("fa" + oidPrefix + i + u));
+        user.setGivenName(createPolyStringType("gi" + oidPrefix + i + u));
         if (parentOid != null) {
             ObjectReferenceType ref = new ObjectReferenceType();
             ref.setOid(parentOid);
@@ -143,8 +143,8 @@ private PrismObject<OrgType> createOrg(String parentOid, int i, String oidPrefix
             throws Exception {
         OrgType org = new OrgType();
         org.setOid("2" + createOid(i, oidPrefix));
-        org.setDisplayName(createPolyString("o" + oidPrefix + i));
-        org.setName(createPolyString("o" + oidPrefix + i));
+        org.setDisplayName(createPolyStringType("o" + oidPrefix + i));
+        org.setName(createPolyStringType("o" + oidPrefix + i));
         if (parentOid != null) {
             ObjectReferenceType ref = new ObjectReferenceType();
             ref.setOid(parentOid);
@@ -172,10 +172,4 @@ private String createOid(int i, String oidPrefix) {
 
         return sb.toString();
     }
-
-    private PolyStringType createPolyString(String orig) {
-        PolyStringType poly = new PolyStringType();
-        poly.setOrig(orig);
-        return poly;
-    }
 }
diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
@@ -31,6 +31,7 @@
 
 import com.evolveum.midpoint.notifications.api.transports.Message;
 
+import com.evolveum.midpoint.prism.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.opends.server.types.DirectoryException;
@@ -60,13 +61,6 @@
 import com.evolveum.midpoint.model.api.context.ModelContext;
 import com.evolveum.midpoint.model.common.expression.evaluator.LiteralExpressionEvaluatorFactory;
 import com.evolveum.midpoint.model.test.AbstractModelIntegrationTest;
-import com.evolveum.midpoint.prism.Containerable;
-import com.evolveum.midpoint.prism.PrismContainer;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismProperty;
-import com.evolveum.midpoint.prism.PrismPropertyDefinition;
-import com.evolveum.midpoint.prism.PrismPropertyValue;
-import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.delta.ChangeType;
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
@@ -945,7 +939,7 @@ public void test310ProjectJollyRogerNestedGroup() throws Exception {
 
         ObjectQuery query = ObjectQueryUtil.createResourceAndObjectClassFilterPrefix(RESOURCE_OPENDJ_OID, GROUP_OF_UNIQUE_NAMES_OBJECTCLASS_QNAME, prismContext)
 				.and().itemWithDef(
-						new PrismPropertyDefinition<>(new QName(RESOURCE_OPENDJ_NAMESPACE, "cn"), DOMUtil.XSD_STRING, prismContext),
+						new PrismPropertyDefinitionImpl<>(new QName(RESOURCE_OPENDJ_NAMESPACE, "cn"), DOMUtil.XSD_STRING, prismContext),
 						ShadowType.F_ATTRIBUTES, new QName(RESOURCE_OPENDJ_NAMESPACE, "cn")).eq("admins")
 				.build();
 

diff --git a/testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml b/testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
@@ -92,6 +92,10 @@
             <displayName>Login name</displayName>
             <secondaryIdentifier>true</secondaryIdentifier>
             <matchingRule xmlns:mr="http://prism.evolveum.com/xml/ns/public/matching-rule-3">mr:stringIgnoreCase</matchingRule>
+            <limitations>
+               <minOccurs>0</minOccurs>
+               <maxOccurs>1</maxOccurs>
+            </limitations>
             <outbound>
                <strength>weak</strength>
                <source>