Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Jun 25, 2019
2 parents 170ebed + 947631b commit 1899482
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build-system/pom.xml
View file
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions infra/schema/src/main/resources/xml/ns/public/common/audit-3.xsd
View file
Expand Up @@ -290,6 +290,16 @@
</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:sequence>
</xsd:complexType>
<xsd:element name="auditEventRecord" type="tns:AuditEventRecordType" />
Expand Down
110 changes: 108 additions & 2 deletions infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
View file
Expand Up @@ -16142,7 +16142,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>
Expand All @@ -16152,7 +16152,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>
Expand Down Expand Up @@ -16229,6 +16241,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>
Expand Down

0 comments on commit 1899482

Please sign in to comment.