Add abstract="true" to Base... types, prepare for v3.4.1 release

at055612 · at055612 · commit 7ce12d99106c · 2019-04-05T16:16:41.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,11 @@ Patch version changes will typically include cosmetic changes (e.g. _xs:document
 ## [Unreleased]
 
 
+## [v3.4.1] - 2019-04-05
+
+* Change all `Base....` complex types to be `abstract="true"`
+
+
 ## [v3.4.0] - 2019-04-05
 
 * No changes to the schema.
@@ -171,7 +176,8 @@ Patch version changes will typically include cosmetic changes (e.g. _xs:document
 
 * Initial open source release
 
-[Unreleased]: https://github.com/gchq/event-logging-schema/compare/v3.4.0...HEAD
+[Unreleased]: https://github.com/gchq/event-logging-schema/compare/v3.4.1...HEAD
+[v3.4.1]: https://github.com/gchq/event-logging-schema/compare/v3.4.0...v3.4.1
 [v3.4.0]: https://github.com/gchq/event-logging-schema/compare/v3.4-beta.1...v3.4.0
 [v3.4-beta.1]: https://github.com/gchq/event-logging-schema/compare/v3.3.0...v3.4-beta.1
 [v3.3.1]: https://github.com/gchq/event-logging-schema/compare/v3.3.0...v3.3.1
diff --git a/README.md b/README.md
@@ -113,10 +113,10 @@ When you are ready to release a new version of the schema ensure you have done t
     The change can be achieved with some global search replace, e.g.:
 
     ```bash
-    find docs/completeExamples/ \(-name "*.xml.md" -o -name "*.xml" \) \
+    find docs/completeExamples/ \( -name "*.xml.md" -o -name "*.xml" \) \
       | xargs sed -i'' 's#file://event-logging-v3.4.0.xsd#file://event-logging-v3.4.1.xsd#'
 
-    find docs/completeExamples/ \(-name "*.xml.md" -o -name "*.xml" \) \
+    find docs/completeExamples/ \( -name "*.xml.md" -o -name "*.xml" \) \
       | xargs sed -i'' 's#Version="3.4.0"#Version="3.4.1"#'
     ```
 1. Run the build to ensure the versions are all valid and the example XML is all valid against the schema.
diff --git a/docs/completeExamples/xml/Event_Meta_JSON.xml.md b/docs/completeExamples/xml/Event_Meta_JSON.xml.md
@@ -5,8 +5,8 @@
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <!-- JSON Meta example -->
   <Event>
diff --git a/docs/completeExamples/xml/Event_Meta_XML.xml.md b/docs/completeExamples/xml/Event_Meta_XML.xml.md
@@ -5,8 +5,8 @@
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <!-- XML Meta example -->
   <Event>
diff --git a/docs/completeExamples/xml/objectTypes/Criteria.xml.md b/docs/completeExamples/xml/objectTypes/Criteria.xml.md
@@ -10,8 +10,8 @@ Criteria can be used within other schema actions.
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <!-- View/Criteria event -->
 
diff --git a/docs/completeExamples/xml/objectTypes/SearchResults.xml.md b/docs/completeExamples/xml/objectTypes/SearchResults.xml.md
@@ -13,8 +13,8 @@ SearchResults can be used within other schema actions.
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <!-- View/SearchResults event -->
 
diff --git a/docs/completeExamples/xml/schemaActions/AntiMalware.xml.md b/docs/completeExamples/xml/schemaActions/AntiMalware.xml.md
@@ -12,8 +12,8 @@ The user `jc101` has run an antimalware scan on `LUNA/LUNADESK35` using the anti
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <!-- AnitMalware event [DEPRECATED]-->
   <Event>
diff --git a/docs/completeExamples/xml/schemaActions/Import_File.xml.md b/docs/completeExamples/xml/schemaActions/Import_File.xml.md
@@ -12,8 +12,8 @@ The nature of the event (type of View) can be indicated within `<EventDetail>/<T
 <Events 
   xmlns="event-logging:3" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd" 
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd" 
+  Version="3.4.1">
 
   <Event>
     <EventTime>
diff --git a/docs/completeExamples/xml/schemaActions/Import_Object.xml.md b/docs/completeExamples/xml/schemaActions/Import_Object.xml.md
@@ -12,8 +12,8 @@ There is no Success element in `<Outcome>`, so it is assumed that the action com
 <Events 
   xmlns="event-logging:3" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd" 
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd" 
+  Version="3.4.1">
 
   <!-- Import Object event -->
   <Event>
diff --git a/docs/completeExamples/xml/schemaActions/Print.xml.md b/docs/completeExamples/xml/schemaActions/Print.xml.md
@@ -10,8 +10,8 @@ The document is `2` pages in length and `3410212` bytes in length.
 <Events 
   xmlns="event-logging:3" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd" 
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd" 
+  Version="3.4.1">
 
   <!-- Print event 
 
diff --git a/docs/completeExamples/xml/schemaActions/Search.xml.md b/docs/completeExamples/xml/schemaActions/Search.xml.md
@@ -12,8 +12,8 @@ The first with an id of `7811` and a name of `Surpisingly Heavy Chunk` and the s
 <Events 
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <!-- Search event -->
   <Event>
diff --git a/docs/completeExamples/xml/schemaActions/Send_Document.xml.md b/docs/completeExamples/xml/schemaActions/Send_Document.xml.md
@@ -12,8 +12,8 @@ The file was transferred successfully.
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <Event>
     <EventTime>
diff --git a/docs/completeExamples/xml/schemaActions/Send_File.xml.md b/docs/completeExamples/xml/schemaActions/Send_File.xml.md
@@ -13,8 +13,8 @@ The Outcome of the event is not defined, so we assume that the transfer was succ
 <Events
   xmlns="event-logging:3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.0.xsd"
-  Version="3.4.0">
+  xsi:schemaLocation="event-logging:3 file://event-logging-v3.4.1.xsd"
+  Version="3.4.1">
 
   <Event>
     <EventTime>
diff --git a/event-logging.xsd b/event-logging.xsd
@@ -20,8 +20,8 @@
     targetNamespace="event-logging:3"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
-    version="3.4.0"
-    id="event-logging-v3.4.0">
+    version="3.4.1"
+    id="event-logging-v3.4.1">
     <xs:annotation>
         <xs:documentation>This schema describes the allowed element structure for event logging. Please refer to the documentation and examples for a description of how to use this schema in addition to the descriptions given for each element within this schema.</xs:documentation>
     </xs:annotation>
@@ -1485,8 +1485,8 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:complexType name="BaseAdvancedQueryItemComplexType"/>
-    <xs:complexType name="BaseAdvancedQueryOperatorComplexType">
+    <xs:complexType name="BaseAdvancedQueryItemComplexType" abstract="true"/>
+    <xs:complexType name="BaseAdvancedQueryOperatorComplexType" abstract="true">
         <xs:complexContent>
             <xs:extension base="evt:BaseAdvancedQueryItemComplexType">
                 <xs:group ref="evt:AdvancedQueryOperatorGroup"
@@ -1495,7 +1495,7 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:complexType name="BaseAntiMalwareComplexType">
+    <xs:complexType name="BaseAntiMalwareComplexType" abstract="true">
         <xs:sequence minOccurs="1" maxOccurs="1">
             <xs:element name="Product"
                 type="evt:SoftwareComplexType"
@@ -1529,7 +1529,7 @@
             </xs:element>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="BaseChatComplexType">
+    <xs:complexType name="BaseChatComplexType" abstract="true">
         <xs:complexContent>
             <xs:extension base="evt:BaseObjectComplexType">
                 <xs:sequence minOccurs="1" maxOccurs="1">
@@ -1556,7 +1556,7 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:complexType name="BaseFileComplexType">
+    <xs:complexType name="BaseFileComplexType" abstract="true">
         <xs:complexContent>
             <xs:extension base="evt:BaseObjectComplexType">
                 <xs:sequence minOccurs="1" maxOccurs="1">
@@ -1629,7 +1629,7 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
-    <xs:complexType name="BaseMultiObjectComplexType">
+    <xs:complexType name="BaseMultiObjectComplexType" abstract="true">
         <xs:choice minOccurs="1" maxOccurs="unbounded">
             <xs:element name="Association"
                 type="evt:AssociationComplexType"
@@ -1709,7 +1709,7 @@
                 maxOccurs="1"/>
         </xs:choice>
     </xs:complexType>
-    <xs:complexType name="BaseNetworkComplexType">
+    <xs:complexType name="BaseNetworkComplexType" abstract="true">
         <xs:sequence minOccurs="1" maxOccurs="1">
             <xs:element name="Source"
                 type="evt:NetworkSrcDstComplexType"
@@ -1747,10 +1747,10 @@
             </xs:element>
         </xs:sequence>
     </xs:complexType>
-    <xs:complexType name="BaseObjectComplexType">
+    <xs:complexType name="BaseObjectComplexType" abstract="true">
         <xs:group ref="evt:BaseObjectGroup" minOccurs="1" maxOccurs="1"/>
     </xs:complexType>
-    <xs:complexType name="BaseOutcomeComplexType">
+    <xs:complexType name="BaseOutcomeComplexType" abstract="true">
         <xs:annotation>
             <xs:documentation>Describes the outcome of an event whether it is successful and whether it was permitted.</xs:documentation>
         </xs:annotation>
@@ -3636,7 +3636,7 @@
             <xs:documentation>Type for specifying the version numbers of XML documents that are supported by this version of the XMLSchema.</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:enumeration value="3.4.0"/>
+            <xs:enumeration value="3.4.1"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="VirtualSessionSessionStateSimpleType">
