From 6c935d61f9f2ad8befe0ae0eb96c4f328ad99835 Mon Sep 17 00:00:00 2001
From: skublik <lskublik@evolveum.com>
Date: Tue, 25 Jun 2019 10:25:10 +0200
Subject: [PATCH 1/3] adding element for resourceOID and classifier to
 ShadowType shadow = ObjectTypeUtil.getObjectFromReference(shadowRef);

---
 .../resources/xml/ns/public/common/audit-3.xsd  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
index 2bfad83b54b..4327438c6be 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
@@ -290,6 +290,23 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
+	    <xsd:element name="resourceOID" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Resource OIDs. This field is used for resource OIDs of target, when target is FocusType or Shadowtype.
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <a:since>4.0</a:since>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
+	    <xsd:element name="classifier" type="xsd:string" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Custom attribute for identification of audit record.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
     <xsd:element name="auditEventRecord" type="tns:AuditEventRecordType" />

From c15a262c63a259bbdf497d3426889b02eb5a67be Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Tue, 25 Jun 2019 10:39:56 +0200
Subject: [PATCH 2/3] Upgrading jackson to 2.9.9

---
 build-system/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-system/pom.xml b/build-system/pom.xml
index da7cf973a6e..f00af811f4a 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -86,7 +86,7 @@
         <jasper.version>6.5.0</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
-        <jackson.version>2.9.8</jackson.version>
+        <jackson.version>2.9.9</jackson.version>
         <snakeyaml.version>1.19</snakeyaml.version>
         <surefire.version>3.0.0-M2</surefire.version>
         <reflections.version>0.9.11</reflections.version>

From 947631b7515ce94dc237f279483db3abcfd1a554 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Tue, 25 Jun 2019 11:30:46 +0200
Subject: [PATCH 3/3] Schema for custom audit fields (MID-5478)

---
 .../xml/ns/public/common/audit-3.xsd          |   9 +-
 .../xml/ns/public/common/common-core-3.xsd    | 110 +++++++++++++++++-
 2 files changed, 109 insertions(+), 10 deletions(-)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
index 4327438c6be..2294572910c 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
@@ -290,7 +290,7 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-	    <xsd:element name="resourceOID" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+	    <xsd:element name="resourceOid" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
                     <xsd:documentation>
                         Resource OIDs. This field is used for resource OIDs of target, when target is FocusType or Shadowtype.
@@ -300,13 +300,6 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-	    <xsd:element name="classifier" type="xsd:string" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        Custom attribute for identification of audit record.
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
     <xsd:element name="auditEventRecord" type="tns:AuditEventRecordType" />
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
index a52353d0039..810db76b6da 100755
--- 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
@@ -16129,7 +16129,7 @@
 					<xsd:element name="expressions" type="tns:SystemConfigurationExpressionsType" minOccurs="0" maxOccurs="1">
                         <xsd:annotation>
                             <xsd:documentation>
-                                Specifies profile for expression evaluations, execution, restrictions, etc.
+                                Specifies profiles for expression evaluations, execution, restrictions, etc.
                             </xsd:documentation>
                             <xsd:appinfo>
 								<a:displayName>SystemConfigurationType.expressions</a:displayName>
@@ -16139,7 +16139,19 @@
                         </xsd:annotation>
                     </xsd:element>
                     
-                    <!-- TODO(maybe): objectCollectionRef -->
+                    <xsd:element name="audit" type="tns:SystemConfigurationAuditType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Specifies details regarding creation and recording of audit events.
+                            </xsd:documentation>
+                            <xsd:appinfo>
+								<a:displayName>SystemConfigurationType.audit</a:displayName>
+                            	<a:since>4.0</a:since>
+                            	<a:experimental>true</a:experimental>
+                            </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+                    
                 </xsd:sequence>
             </xsd:extension>
         </xsd:complexContent>
@@ -16216,6 +16228,100 @@
 		</xsd:sequence>
 	</xsd:complexType>
 	
+	<xsd:complexType name="SystemConfigurationAuditType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Specifies details regarding creation and recording of audit events.
+			</xsd:documentation>
+			<xsd:appinfo>
+				<a:container/>
+            	<a:since>4.0</a:since>
+            	<a:experimental>true</a:experimental>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="eventRecording" type="tns:SystemConfigurationAuditEventRecordingType" minOccurs="0" maxOccurs="1">
+			    <xsd:annotation>
+			        <xsd:documentation>
+			            Details about creation and recording of audit events.
+			        </xsd:documentation>
+			        <xsd:appinfo>
+						<a:displayName>SystemConfigurationAuditType.eventRecording</a:displayName>
+					</xsd:appinfo>
+			    </xsd:annotation>
+			</xsd:element>
+			<!-- TODO: recordRetentionPolicy -->
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="SystemConfigurationAuditEventRecordingType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Details about creation and recording of audit events.
+			</xsd:documentation>
+			<xsd:appinfo>
+				<a:container/>
+            	<a:since>4.0</a:since>
+            	<a:experimental>true</a:experimental>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="recordResourceOids" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
+			    <xsd:annotation>
+			        <xsd:documentation>
+			            If set to true, the resource OIDs will be recorded in the audit event records.
+			            Recording resource OIDs means additional (storage) overhead. Therefore it is turned off by default.
+			        </xsd:documentation>
+			        <xsd:appinfo>
+						<a:displayName>SystemConfigurationAuditEventRecordingType.recordResourceOids</a:displayName>
+					</xsd:appinfo>
+			    </xsd:annotation>
+			</xsd:element>
+			<xsd:element name="property" type="tns:SystemConfigurationAuditEventRecordingPropertyType" minOccurs="0" maxOccurs="unbounded">
+			    <xsd:annotation>
+			        <xsd:documentation>
+			            Specifies details how an audit event record property is created.
+			        </xsd:documentation>
+			        <xsd:appinfo>
+						<a:displayName>SystemConfigurationAuditEventRecordingType.property</a:displayName>
+					</xsd:appinfo>
+			    </xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	
+	<xsd:complexType name="SystemConfigurationAuditEventRecordingPropertyType">
+		<xsd:annotation>
+			<xsd:documentation>
+				Specifies details how an audit event record property is created.
+			</xsd:documentation>
+			<xsd:appinfo>
+				<a:container/>
+            	<a:since>4.0</a:since>
+            	<a:experimental>true</a:experimental>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1">
+			    <xsd:annotation>
+			        <xsd:documentation>
+			            Audit event record property name.
+			        </xsd:documentation>
+			        <xsd:appinfo>
+						<a:displayName>SystemConfigurationAuditEventRecordingPropertyType.name</a:displayName>
+					</xsd:appinfo>
+			    </xsd:annotation>
+			</xsd:element>
+			<xsd:element name="expression" type="tns:ExpressionType" minOccurs="0" maxOccurs="1">
+      			<xsd:annotation>
+      				<xsd:documentation>
+      					Expression that produces value of the property.
+      				</xsd:documentation>
+      			</xsd:annotation>
+      		</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	
 	<xsd:complexType name="SystemConfigurationExpressionsType">
 		<xsd:annotation>
 			<xsd:documentation>