From 4438def6648f85c0831ec54a814ef723d798234c Mon Sep 17 00:00:00 2001
From: Jon Anders Sollien <jon.anders.sollien@catenda.no>
Date: Wed, 25 Nov 2020 08:50:25 +0100
Subject: [PATCH 1/3] List entities v2

---
 Schemas/documents.xsd |  8 +++++-
 Schemas/markup.xsd    | 57 +++++++++++++++++++++++++++++++++++++------
 Schemas/visinfo.xsd   |  8 +++++-
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/Schemas/documents.xsd b/Schemas/documents.xsd
index 70504ec1..1530460b 100644
--- a/Schemas/documents.xsd
+++ b/Schemas/documents.xsd
@@ -5,7 +5,13 @@
     <xs:element name="Documents">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="Documents" type="Document" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="Documents" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Document" type="Document" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
diff --git a/Schemas/markup.xsd b/Schemas/markup.xsd
index f5619629..09f69849 100644
--- a/Schemas/markup.xsd
+++ b/Schemas/markup.xsd
@@ -6,9 +6,21 @@
             <xs:sequence>
                 <xs:element name="Header" type="Header" minOccurs="0"/>
                 <xs:element name="Topic" type="Topic"/>
-                <xs:element name="Comment" type="Comment" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="Comments" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Comment" type="Comment" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
                 <!-- ISG Jira issue BCF-9. Add support for several viewpoints and snapshots per issue -->
-                <xs:element name="Viewpoints" type="ViewPoint" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="Viewpoints" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="ViewPoint" type="ViewPoint" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -58,13 +70,25 @@
     </xs:complexType>
     <xs:complexType name="Topic">
         <xs:sequence>
-            <xs:element name="ReferenceLink" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="ReferenceLinks" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="ReferenceLink" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
             <xs:element name="Title" type="xs:string"/>
             <xs:element name="Priority" type="Priority" minOccurs="0"/>
             <!-- ISG Jira issue BCF-8 Add a way save order the topics -->
             <!-- This property is deprecated and will be removed in a future release -->
             <xs:element name="Index" type="xs:int" minOccurs="0"/>
-            <xs:element name="Labels" type="TopicLabel" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="Labels" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="Label" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
             <xs:element name="CreationDate" type="xs:dateTime" minOccurs="1"/>
             <xs:element name="CreationAuthor" type="UserIdType" minOccurs="1"/>
             <xs:element name="ModifiedDate" type="xs:dateTime" minOccurs="0"/>
@@ -74,10 +98,29 @@
             <xs:element name="Stage" type="Stage" minOccurs="0"/>
             <xs:element name="Description" type="xs:string" minOccurs="0"/>
             <xs:element name="BimSnippet" type="BimSnippet" minOccurs="0"/>
-            <xs:element name="DocumentReferences" type="DocumentReference" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="RelatedTopic" minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="DocumentReferences" minOccurs="0">
                 <xs:complexType>
-                    <xs:attribute name="Guid" type="Guid" use="required"/>
+                    <xs:sequence>
+                        <xs:element name="DocumentReference" type="DocumentReference" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="DocumentReferences" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="DocumentReference" type="DocumentReference" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="RelatedTopics" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="RelatedTopic" minOccurs="0" maxOccurs="unbounded">
+                            <xs:complexType>
+                                <xs:attribute name="Guid" type="Guid" use="required"/>
+                            </xs:complexType>
+                        </xs:element>
+                    </xs:sequence>
                 </xs:complexType>
             </xs:element>
         </xs:sequence>
diff --git a/Schemas/visinfo.xsd b/Schemas/visinfo.xsd
index 5d55202a..4dd525be 100644
--- a/Schemas/visinfo.xsd
+++ b/Schemas/visinfo.xsd
@@ -7,7 +7,13 @@
         </xs:annotation>
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="Components" type="Components" minOccurs="0"/>
+                <xs:element name="Components" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Component" type="Component" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
                 <xs:choice>
                     <xs:element name="OrthogonalCamera" type="OrthogonalCamera"/>
                     <xs:element name="PerspectiveCamera" type="PerspectiveCamera"/>

From 4b028cfe56c30c9c8e326319574474fece081699 Mon Sep 17 00:00:00 2001
From: Jon Anders Sollien <jon.anders.sollien@catenda.no>
Date: Wed, 25 Nov 2020 08:56:16 +0100
Subject: [PATCH 2/3] Fix document

---
 Schemas/documents.xsd | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Schemas/documents.xsd b/Schemas/documents.xsd
index 1530460b..2663e89e 100644
--- a/Schemas/documents.xsd
+++ b/Schemas/documents.xsd
@@ -5,13 +5,7 @@
     <xs:element name="Documents">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="Documents" minOccurs="0">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="Document" type="Document" minOccurs="0" maxOccurs="unbounded"/>
-                        </xs:sequence>
-                    </xs:complexType>
-                </xs:element>
+                <xs:element name="Document" type="Document" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

From b1df4fbf6b85360907c181106f8718fafa5675cf Mon Sep 17 00:00:00 2001
From: Jon Anders Sollien <jon.anders.sollien@catenda.no>
Date: Wed, 25 Nov 2020 08:58:39 +0100
Subject: [PATCH 3/3] c

---
 Schemas/markup.xsd | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Schemas/markup.xsd b/Schemas/markup.xsd
index 09f69849..f91a87fe 100644
--- a/Schemas/markup.xsd
+++ b/Schemas/markup.xsd
@@ -105,13 +105,6 @@
                     </xs:sequence>
                 </xs:complexType>
             </xs:element>
-            <xs:element name="DocumentReferences" minOccurs="0">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="DocumentReference" type="DocumentReference" minOccurs="0" maxOccurs="unbounded"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
             <xs:element name="RelatedTopics" minOccurs="0">
                 <xs:complexType>
                     <xs:sequence>