Various changes

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / resources / org / argeo / slc / xml / slc.xsd

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
index d7e09650cfcaaec858e57306c16c683ab26f9ff7..55bb55afd71bcb5ee2f3eeb067f0bc94e1211b38 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/xml/slc.xsd
@@ -12,7 +12,7 @@
                        <xs:element name="elements" minOccurs="0"\r
                                type="slc:ElementsType" />\r
                </xs:all>\r
-               <xs:attribute name="uuid" use="required"/>\r
+               <xs:attribute name="uuid" use="required" />\r
        </xs:complexType>\r
        <xs:complexType name="ResultPartsType">\r
                <xs:sequence>\r
@@ -29,8 +29,6 @@
        </xs:complexType>\r
        <xs:complexType name="PartSubListType">\r
                <xs:all>\r
-                       <xs:element name="slc-execution-uuid" type="xs:string" />\r
-                       <xs:element name="slc-execution-step-uuid" type="xs:string" />\r
                        <xs:element name="parts" minOccurs="0" type="slc:PartsType" />\r
                </xs:all>\r
        </xs:complexType>\r
@@ -53,16 +51,28 @@
                                </xs:simpleType>\r
                        </xs:element>\r
                        <xs:element name="message" type="xs:string" />\r
-                       <xs:element name="exception" minOccurs="0"\r
-                               type="slc:ExceptionType" />\r
+                       <xs:element name="exception-message" minOccurs="0"\r
+                               type="xs:string" />\r
+                       <xs:element name="stack-lines" minOccurs="0"\r
+                               type="slc:StackLinesType" />\r
+                       <xs:element name="test-run-uuid" type="xs:string"\r
+                               minOccurs="0" />\r
                </xs:all>\r
        </xs:complexType>\r
+       <xs:complexType name="StackLinesType">\r
+               <xs:sequence>\r
+                       <xs:element name="stack-line" maxOccurs="unbounded"\r
+                               type="xs:string" />\r
+               </xs:sequence>\r
+               <xs:attribute name="message" type="xs:string" />\r
+       </xs:complexType>\r
+       <!-- \r
        <xs:complexType name="ExceptionType">\r
                <xs:all>\r
-                       <xs:element name="message" type="xs:string" />\r
                        <xs:element name="stack-trace" minOccurs="0"\r
                                type="slc:StackTraceType" />\r
                </xs:all>\r
+               <xs:attribute name="message" type="xs:string" />\r
        </xs:complexType>\r
        <xs:complexType name="StackTraceType">\r
                <xs:sequence>\r
@@ -80,6 +90,7 @@
                <xs:attribute name="line-number" type="xs:integer"\r
                        use="required" />\r
        </xs:complexType>\r
+       -->\r
        <xs:complexType name="ElementsType">\r
                <xs:sequence>\r
                        <xs:element name="element" type="slc:ElementType"\r
@@ -113,9 +124,22 @@
                </xs:all>\r
                <xs:attribute name="name" type="xs:string" use="required" />\r
        </xs:complexType>\r
+       <xs:complexType name="TreeSPathType">\r
+               <xs:attribute name="as-unique-string" type="xs:string"\r
+                       use="required" />\r
+       </xs:complexType>\r
+       <xs:complexType name="TestRunDescriptorType">\r
+               <xs:all>\r
+                       <xs:element name="slc-execution-uuid" type="xs:string" />\r
+                       <xs:element name="slc-execution-step-uuid" type="xs:string" />\r
+                       <xs:element name="test-run-uuid" type="xs:string" />\r
+                       <xs:element name="deployed-sytem-id" type="xs:string" />\r
+                       <xs:element name="test-result-uuid" type="xs:string" />\r
+               </xs:all>\r
+       </xs:complexType>\r
 \r
-       <!-- TREE TEST RESULT -->\r
-       <xs:element name="tree-test-result-request">\r
+       <!-- TREE TEST RESULT REQUESTS -->\r
+       <xs:element name="create-tree-test-result-request">\r
                <xs:complexType>\r
                        <xs:all>\r
                                <xs:element name="tree-test-result"\r
@@ -124,6 +148,21 @@
                </xs:complexType>\r
        </xs:element>\r
 \r
+       <xs:element name="result-part-request">\r
+               <xs:complexType>\r
+                       <xs:all>\r
+                               <xs:element name="result-uuid" type="xs:string" />\r
+                               <xs:element name="simple-result-part"\r
+                                       type="slc:SimpleResultPartType" />\r
+                               <xs:element name="related-elements"\r
+                                       type="slc:ElementsType" />\r
+                               <xs:element name="tree-sPath" type="slc:TreeSPathType" />\r
+                               <xs:element name="test-run-descriptor"\r
+                                       type="slc:TestRunDescriptorType" />\r
+                       </xs:all>\r
+               </xs:complexType>\r
+       </xs:element>\r
+\r
        <!-- SLC EXECUTION -->\r
        <xs:element name="slc-execution" type="slc:SlcExecutionType" />\r
        <xs:complexType name="SlcExecutionType">\r