Improve Spring templates and defaults

[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 ed66df8d390db18ce71bfcae5094a46c50e51079..d7e09650cfcaaec858e57306c16c683ab26f9ff7 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
@@ -3,12 +3,16 @@
        elementFormDefault="qualified"\r
        targetNamespace="http://argeo.org/projects/slc/schemas">\r
        <!-- TREE TEST RESULT -->\r
+       <xs:element name="tree-test-result" type="slc:TreeTestResultType" />\r
        <xs:complexType name="TreeTestResultType">\r
                <xs:all>\r
                        <xs:element name="close-date" type="xs:dateTime" />\r
                        <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:attribute name="uuid" use="required"/>\r
        </xs:complexType>\r
        <xs:complexType name="ResultPartsType">\r
                <xs:sequence>\r
@@ -27,39 +31,121 @@
                <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
+       <xs:complexType name="PartsType">\r
+               <xs:sequence>\r
+                       <xs:element name="simple-result-part"\r
+                               type="slc:SimpleResultPartType" maxOccurs="unbounded">\r
+                       </xs:element>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+       <xs:complexType name="SimpleResultPartType">\r
+               <xs:all>\r
+                       <xs:element name="status">\r
+                               <xs:simpleType>\r
+                                       <xs:restriction base="xs:string">\r
+                                               <xs:enumeration value="PASSED" />\r
+                                               <xs:enumeration value="FAILED" />\r
+                                               <xs:enumeration value="ERROR" />\r
+                                       </xs:restriction>\r
+                               </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: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:sequence>\r
+                       <xs:element name="stack-trace-element"\r
+                               type="slc:StackTraceElementType" maxOccurs="unbounded">\r
+                       </xs:element>\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:complexType>\r
+       <xs:complexType name="ElementsType">\r
+               <xs:sequence>\r
+                       <xs:element name="element" type="slc:ElementType"\r
+                               maxOccurs="unbounded">\r
+                       </xs:element>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+       <xs:complexType name="ElementType">\r
+               <xs:all>\r
+                       <xs:element name="simple-sElement"\r
+                               type="slc:SimpleSElementType" />\r
                </xs:all>\r
                <xs:attribute name="path" type="xs:string" use="required" />\r
        </xs:complexType>\r
+       <xs:complexType name="SimpleSElementType">\r
+               <xs:all>\r
+                       <xs:element name="label" type="xs:string" />\r
+                       <xs:element name="tags" type="slc:TagsType" minOccurs="0" />\r
+               </xs:all>\r
+       </xs:complexType>\r
+       <xs:complexType name="TagsType">\r
+               <xs:sequence>\r
+                       <xs:element name="tag" type="slc:TagType"\r
+                               maxOccurs="unbounded">\r
+                       </xs:element>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
+       <xs:complexType name="TagType">\r
+               <xs:all>\r
+                       <xs:element name="tag-value" type="xs:string" />\r
+               </xs:all>\r
+               <xs:attribute name="name" type="xs:string" use="required" />\r
+       </xs:complexType>\r
 \r
-       <!-- SLC EXECUTION -->\r
-       <xs:element name="slc-execution-request">\r
+       <!-- TREE TEST RESULT -->\r
+       <xs:element name="tree-test-result-request">\r
                <xs:complexType>\r
                        <xs:all>\r
-                               <xs:element name="slc-execution"\r
-                                       type="slc:SlcExecutionType" />\r
+                               <xs:element name="tree-test-result"\r
+                                       type="slc:TreeTestResultType" />\r
                        </xs:all>\r
                </xs:complexType>\r
        </xs:element>\r
-       <xs:element name="slc-execution-steps-request">\r
-               <xs:complexType>\r
-                       <xs:sequence>\r
-                               <xs:element name="steps"\r
-                                       type="slc:SlcExecutionStepsType" />\r
-                               <xs:element name="slc-execution-uuid" type="xs:string" />\r
-                       </xs:sequence>\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
                <xs:all>\r
                        <xs:element name="status" type="xs:string" />\r
                        <xs:element name="type" type="xs:string" />\r
                        <xs:element name="host" type="xs:string" />\r
-                       <xs:element name="path" type="xs:string" />\r
+                       <xs:element name="user" type="xs:string" />\r
                        <xs:element name="steps" minOccurs="0"\r
                                type="slc:SlcExecutionStepsType" />\r
+                       <xs:element name="attributes" minOccurs="0"\r
+                               type="slc:AttributesType" />\r
                </xs:all>\r
                <xs:attribute name="uuid" type="xs:string" use="required" />\r
        </xs:complexType>\r
+       <xs:complexType name="SlcExecutionStepsType">\r
+               <xs:sequence>\r
+                       <xs:element name="slc-execution-step"\r
+                               type="slc:SlcExecutionStepType" maxOccurs="unbounded">\r
+                       </xs:element>\r
+               </xs:sequence>\r
+       </xs:complexType>\r
        <xs:complexType name="SlcExecutionStepType">\r
                <xs:all>\r
                        <xs:element name="type" type="xs:string" />\r
@@ -75,12 +161,39 @@
                </xs:all>\r
                <xs:attribute name="uuid" type="xs:string" use="required" />\r
        </xs:complexType>\r
-       <xs:complexType name="SlcExecutionStepsType">\r
+       <xs:complexType name="AttributesType">\r
                <xs:sequence>\r
-                       <xs:element name="slc-execution-step"\r
-                               type="slc:SlcExecutionStepType" maxOccurs="unbounded">\r
+                       <xs:element name="attribute" type="slc:AttributeType"\r
+                               maxOccurs="unbounded">\r
                        </xs:element>\r
                </xs:sequence>\r
        </xs:complexType>\r
+       <xs:complexType name="AttributeType">\r
+               <xs:simpleContent>\r
+                       <xs:extension base="xs:string">\r
+                               <xs:attribute name="name" type="xs:string"\r
+                                       use="required" />\r
+                       </xs:extension>\r
+               </xs:simpleContent>\r
+       </xs:complexType>\r
+\r
+       <!-- SLC EXECUTION REQUESTS-->\r
+       <xs:element name="slc-execution-request">\r
+               <xs:complexType>\r
+                       <xs:all>\r
+                               <xs:element name="slc-execution"\r
+                                       type="slc:SlcExecutionType" />\r
+                       </xs:all>\r
+               </xs:complexType>\r
+       </xs:element>\r
+       <xs:element name="slc-execution-steps-request">\r
+               <xs:complexType>\r
+                       <xs:all>\r
+                               <xs:element name="slc-execution-uuid" type="xs:string" />\r
+                               <xs:element name="steps"\r
+                                       type="slc:SlcExecutionStepsType" />\r
+                       </xs:all>\r
+               </xs:complexType>\r
+       </xs:element>\r
 \r
 </xs:schema>
\ No newline at end of file