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

build-system/pom.xml

@@ -1246,7 +1246,7 @@
             <dependency>
 				<groupId>org.eclipse.jetty</groupId>
 		       	<artifactId>jetty-server</artifactId>
-		       	<version>9.4.12.v20180830</version>
+		       	<version>9.4.17.v20190418</version>
 			</dependency>
             <dependency>
                 <groupId>org.apache.qpid</groupId>

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -5315,11 +5315,27 @@
 	<xsd:complexType name="AssignmentRelationType">
         <xsd:annotation>
             <xsd:documentation>
-                Specifies what types of assignments can be made to the focal object when it is a target of an assignment.
-                This specifies possible relations of the assignment, type of assignment holder and so on.
-                Simply speaking, this specifies "who can have assignment to me" or "who can hold assignment with me as a target".
-                Limitations: assignmentRelation can appear only in archetype. It can appear in assignment or inducements, but 
-                it must not have any order specification (i.e. it must be order 0 or 1).
+            	<p>
+	                Specifies what types of assignments can be made to the focal object when it is a target of an assignment.
+	                This specifies possible relations of the assignment, type of assignment holder and so on.
+	                Simply speaking, this specifies "who can have assignment to me" or "who can hold assignment with me as a target".
+	                Limitations: assignmentRelation can appear only in archetype. It can appear in assignment or inducements, but 
+	                it must not have any order specification (i.e. it must be order 0 or 1).
+                </p>
+                <p>
+                	Assignment relation specification can be "wildcard", i.e. they can apply to a range of conditions.
+                	E.g. if no relation is specified, the specification applies to all the relations. An extreme case is
+                	an empty assignment relation, which is the ultimate wildcard. Such specification means that any
+                	type, any archetype can be assigned with any relation. Which in fact means "open" assignment policy.
+                	However, processing of wildcard assignment relations is limited in midPoint 4.0 (see documentation).
+                </p>
+                <p>
+                	Assignment relation applies only to assignments by default. Therefore it controls when an assignment
+                	can be made. It does not apply to inducements - yet. In later midPoint versions there will be an
+                	element that can specify "order constraints". In that case assignment relation could specify properties
+                	of inducements, including high-order inducements. However, the implementation in midPoint 4.0 is
+                	limited to assignments.
+                </p>
             </xsd:documentation>
             <xsd:appinfo>
                 <a:container/>
@@ -5337,14 +5353,16 @@
        		<xsd:element name="holderType" type="xsd:QName" minOccurs="0" maxOccurs="unbounded">
 	   			<xsd:annotation>
     				<xsd:documentation>
-    					TODO
+    					Specification of the holder type. This specifies type of the objects that can
+    					be "holders" of the assignment. If not specified at all then all object types
+    					are applicable.
     				</xsd:documentation>
     			</xsd:annotation>
     		</xsd:element>
     		<xsd:element name="holderArchetypeRef" type="c:ObjectReferenceType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>
-                        TODO
+                        Specification of holder archetype.
                     </xsd:documentation>
                     <xsd:appinfo>
             			<a:objectReferenceTargetType>tns:ArchetypeType</a:objectReferenceTargetType>
@@ -5354,10 +5372,11 @@
    			<xsd:element name="relation" type="xsd:QName" minOccurs="0" maxOccurs="unbounded">
 	   			<xsd:annotation>
     				<xsd:documentation>
-    					TODO
+    					Specification of a relation for the assignment/inducement.
     				</xsd:documentation>
     			</xsd:annotation>
     		</xsd:element>
+    		<!-- TODO: orderConstraint -->
        </xsd:sequence>
 	</xsd:complexType>
 

model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java

@@ -396,18 +396,18 @@ TaskType submitTaskFromTemplate(String templateTaskOid, Map<QName, Object> exten
 	 * This method should be used when editing assignment holder (e.g. user) and looking for available assignment target.
 	 * The determineAssignmentHolderSpecification is a "reverse" version of this method.
 	 * 
-	 * This method is not used that often. It is used when an object is edited. But is should be quite efficient anyway.
+	 * This method is not used that often. It is used when an object is edited. But it should be quite efficient anyway.
 	 * It should use cached archetype information.
 	 */
 	<O extends AssignmentHolderType> AssignmentCandidatesSpecification determineAssignmentTargetSpecification(PrismObject<O> assignmentHolder, OperationResult result) throws SchemaException, ConfigurationException;
 
 	/**
 	 * Returns data structure that contains information about possible assignment holders for a particular target object.
 	 * 
-	 * This method should be used when editing assignment assignment target (role, org, service) and looking for object that
+	 * This method should be used when editing assignment target (role, org, service) and looking for object that
 	 * can be potential members. The determineAssignmentTargetSpecification is a "reverse" version of this method.
 	 * 
-	 * This method is not used that often. It is used when an object is edited. But is should be quite efficient anyway.
+	 * This method is not used that often. It is used when an object is edited. But it should be quite efficient anyway.
 	 * It should use cached archetype information.
 	 */
 	<O extends AbstractRoleType> AssignmentCandidatesSpecification determineAssignmentHolderSpecification(PrismObject<O> assignmentTarget, OperationResult result) throws SchemaException, ConfigurationException;

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java

@@ -396,8 +396,13 @@ private <T extends ObjectType> String addObject(PrismObject<T> object, boolean o
 		}
 
 		modelService.executeChanges(deltas, modelOptions, task, parentResult);
+		String oidOfAddedObject = deltas.iterator().next().getOid();
+
+		if (isTrue(importOptions.isFetchResourceSchema()) && object.canRepresent(ResourceType.COMPLEX_TYPE)) {
+			modelService.testResource(oidOfAddedObject, task);
+		}
 
-		return deltas.iterator().next().getOid();
+		return oidOfAddedObject;
     }
 
     /**

model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportJasperCreateTaskHandler.java

@@ -508,7 +508,7 @@ private Exporter createExporter(ExportType type, JasperPrint jasperPrint, String
 
     public static String getDateTime() {
         Date createDate = new Date(System.currentTimeMillis());
-        SimpleDateFormat formatDate = new SimpleDateFormat("dd-MM-yyyy hh-mm-ss");
+        SimpleDateFormat formatDate = new SimpleDateFormat("dd-MM-yyyy hh-mm-ss.SSS");
         return formatDate.format(createDate);
     }
 
@@ -519,13 +519,12 @@ protected String getDestinationFileName(ReportType reportType) {
         }
 
         String output = EXPORT_DIR + reportType.getName().getOrig() + " " + getDateTime();
-
+        
         if (getExport(reportType) == ExportType.XML_EMBED) {
             return output + "_embed.xml";
-        }
+        } 
 
         return output + "." + getExport(reportType).value();
-
     }
 
     protected void saveReportOutputType(String filePath, ReportType reportType, Task task, OperationResult parentResult) throws Exception {