Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jun 25, 2019 · 2cce051 · 2cce051
2 parents 6c935d6 + 95f6b92
commit 2cce051
Show file tree

Hide file tree

Showing 802 changed files with 2,159 additions and 156,913 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ 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.
@@ -60,6 +60,11 @@
             <artifactId>ninja</artifactId>
             <version>4.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint</groupId>
+            <artifactId>midpoint-samples</artifactId>
+            <version>4.0-SNAPSHOT</version>
+        </dependency>
         <dependency><!-- Not used, but required for surefire plugin not to complain -->
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/dist/src/main/assembly/dist.xml b/dist/src/main/assembly/dist.xml
@@ -43,20 +43,6 @@
         <include>NEWS</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../samples</directory>
-      <outputDirectory>/doc/samples</outputDirectory>
-      <excludes>
-      	<exclude>.project</exclude>
-      	<exclude>.classpath</exclude>
-      	<exclude>.settings/</exclude>
-      	<exclude>pom.xml</exclude>
-      	<exclude>*~</exclude>
-      	<exclude>**/*~</exclude>
-      	<exclude>model-client-sample/</exclude>
-      	<exclude>samples-test/</exclude>
-      </excludes>
-    </fileSet>
     <fileSet>
       <directory>../config</directory>
       <outputDirectory>/doc/config</outputDirectory>
@@ -119,5 +105,17 @@
       </includes>
       <unpack>true</unpack>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>/doc/samples</outputDirectory>
+      <includes>
+        <include>com.evolveum.midpoint:midpoint-samples</include>
+      </includes>
+      <unpack>true</unpack>
+      <unpackOptions>
+	      <excludes>
+	      	<exclude>META-INF/</exclude>
+	      </excludes>      	
+      </unpackOptions>
+    </dependencySet>
   </dependencySets>
 </assembly>
diff --git a/samples/archetypes/archetype-employee.xml → ...s/initial-objects/026-archetype-trace.xml b/samples/archetypes/archetype-employee.xml → ...s/initial-objects/026-archetype-trace.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2018-2019 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.
@@ -13,25 +13,20 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<archetype oid="7135e68c-ee53-11e8-8025-170b77da3fd6"
+<!-- experimental -->
+<archetype oid="00000000-0000-0000-0000-000000000343"
         xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
         xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
         xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
         xmlns:org='http://midpoint.evolveum.com/xml/ns/public/common/org-3'>
-    <name>Employee</name>
+    <name>Trace</name>
+    <description>
+    	Archetype for execution trace, as a special case of report output.
+    </description>
     <archetypePolicy>
     	<display>
-    		<label>Employee</label>
-    		<pluralLabel>Employees</pluralLabel>
-    		<icon>
-    			<cssClass>fa fa-male</cssClass>
-    			<color>blue</color>
-    		</icon>
+    		<label>Trace</label>
+    		<pluralLabel>Traces</pluralLabel>
     	</display>
     </archetypePolicy>
-    <assignment>
-    	<assignmentRelation>
-    		<holderType>UserType</holderType>
-    	</assignmentRelation>
-    </assignment>
 </archetype>
diff --git a/...sm-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java b/...sm-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java
@@ -1074,6 +1074,9 @@ private <O extends Containerable> ObjectQuery createObjectQueryInternal(PrismCon
 	}
 
 	public QueryType createQueryType(ObjectQuery query) throws SchemaException {
+    	if (query == null) {
+    		return null;
+	    }
 		ObjectFilter filter = query.getFilter();
 		QueryType queryType = new QueryType();
 		if (filter != null) {

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
@@ -290,6 +290,8 @@ public abstract class SchemaConstants {
 	public static final ItemName MODEL_EXTENSION_LAST_SCAN_TIMESTAMP_PROPERTY_NAME = new ItemName(
 			NS_MODEL_EXTENSION, "lastScanTimestamp");
 	public static final ItemName MODEL_EXTENSION_PROFILING_INTERVAL = new ItemName(NS_MODEL_EXTENSION, "profilingInterval");
+	public static final ItemName MODEL_EXTENSION_TRACING_INTERVAL = new ItemName(NS_MODEL_EXTENSION, "tracingInterval");
+	public static final ItemName MODEL_EXTENSION_TRACING_PROFILE = new ItemName(NS_MODEL_EXTENSION, "tracingProfile");
 
 	public static final String NS_MODEL_DISABLE_REASON = NS_MODEL + "/disableReason";
 	public static final String MODEL_DISABLE_REASON_EXPLICIT =