Introduce test result attributes instead of root tags

[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 fc8493e42ab241e7b4e77d649528302916bb4764..ba98a785ab3a5e0e440d670c91ea420c44b4e89a 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
@@ -6,27 +6,21 @@
        <xs:element name="tree-test-result" type="slc:TreeTestResultType" />\r
        <xs:complexType name="TreeTestResultType">\r
                <xs:all>\r
-                       <xs:element name="result-id" type="slc:ResultIdType" />\r
-                       <xs:element name="close-date" type="xs:dateTime" />\r
+                       <xs:element name="close-date" type="xs:dateTime"\r
+                               minOccurs="0" />\r
+                       <xs:element name="attributes" minOccurs="0"
+                               type="slc:AttributesType" />
                        <xs:element name="result-parts" minOccurs="0"\r
                                type="slc:ResultPartsType" />\r
                        <xs:element name="elements" minOccurs="0"\r
                                type="slc:ElementsType" />\r
                </xs:all>\r
-       </xs:complexType>\r
-       <xs:complexType name="ResultIdType">\r
-               <xs:all>\r
-                       <xs:element name="numeric-tRId"\r
-                               type="slc:NumericResultIdType" />\r
-               </xs:all>\r
-       </xs:complexType>\r
-       <xs:complexType name="NumericResultIdType">\r
-               <xs:attribute name="value" type="xs:integer" use="required" />\r
+               <xs:attribute name="uuid" use="required" />\r
        </xs:complexType>\r
        <xs:complexType name="ResultPartsType">\r
                <xs:sequence>\r
                        <xs:element name="result-part" type="slc:ResultPartType"\r
-                               maxOccurs="unbounded">\r
+                               minOccurs="0" maxOccurs="unbounded">\r
                        </xs:element>\r
                </xs:sequence>\r
        </xs:complexType>\r
@@ -38,8 +32,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
@@ -62,37 +54,25 @@
                                </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="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:complexType>\r
-       <xs:complexType name="StackTraceType">\r
+       <xs:complexType name="StackLinesType">\r
                <xs:sequence>\r
-                       <xs:element name="stack-trace-element"\r
-                               type="slc:StackTraceElementType" maxOccurs="unbounded">\r
-                       </xs:element>\r
+                       <xs:element name="stack-line" maxOccurs="unbounded"\r
+                               type="xs:string" />\r
                </xs:sequence>\r
-       </xs:complexType>\r
-       <xs:complexType name="StackTraceElementType">\r
-               <xs:attribute name="declaring-class" type="xs:string"\r
-                       use="required" />\r
-               <xs:attribute name="method-name" type="xs:string"\r
-                       use="required" />\r
-               <xs:attribute name="file-name" type="xs:string" use="required" />\r
-               <xs:attribute name="line-number" type="xs:integer"\r
-                       use="required" />\r
+               <xs:attribute name="message" type="xs:string" />\r
        </xs:complexType>\r
        <xs:complexType name="ElementsType">\r
                <xs:sequence>\r
                        <xs:element name="element" type="slc:ElementType"\r
-                               maxOccurs="unbounded">\r
+                               minOccurs="0" maxOccurs="unbounded">\r
                        </xs:element>\r
                </xs:sequence>\r
        </xs:complexType>\r
@@ -111,7 +91,7 @@
        </xs:complexType>\r
        <xs:complexType name="TagsType">\r
                <xs:sequence>\r
-                       <xs:element name="tag" type="slc:TagType"\r
+                       <xs:element name="tag" type="slc:TagType" minOccurs="0"\r
                                maxOccurs="unbounded">\r
                        </xs:element>\r
                </xs:sequence>\r
@@ -122,6 +102,57 @@
                </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="test-run-uuid" type="xs:string" />\r
+                       <xs:element name="slc-execution-uuid" type="xs:string"\r
+                               minOccurs="0" />\r
+                       <xs:element name="slc-execution-step-uuid" type="xs:string"\r
+                               minOccurs="0" />\r
+                       <xs:element name="deployed-sytem-id" type="xs:string"\r
+                               minOccurs="0" />\r
+                       <xs:element name="test-result-uuid" type="xs:string"\r
+                               minOccurs="0" />\r
+               </xs:all>\r
+       </xs:complexType>\r
+\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
+                                       type="slc:TreeTestResultType" />\r
+                       </xs:all>\r
+               </xs:complexType>\r
+       </xs:element>\r
+\r
+       <xs:element name="close-tree-test-result-request">\r
+               <xs:complexType>\r
+                       <xs:all>\r
+                               <xs:element name="result-uuid" type="xs:string" />\r
+                               <xs:element name="close-date" type="xs:dateTime" />\r
+                       </xs:all>\r
+               </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
@@ -194,5 +225,13 @@
                        </xs:all>\r
                </xs:complexType>\r
        </xs:element>\r
+       <xs:element name="slc-execution-status-request">\r
+               <xs:complexType>\r
+                       <xs:all>\r
+                               <xs:element name="slc-execution-uuid" type="xs:string" />\r
+                               <xs:element name="new-status" type="xs:string" />\r
+                       </xs:all>\r
+               </xs:complexType>\r
+       </xs:element>\r
 \r
 </xs:schema>
\ No newline at end of file