X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fxml%2Fslc.xsd;h=fc8493e42ab241e7b4e77d649528302916bb4764;hb=ff5078359b2bfda024f7d39a471918c75dcf27f0;hp=ed66df8d390db18ce71bfcae5094a46c50e51079;hpb=2e46e3b00b97b997150fc1c091ae6204d1729f54;p=gpl%2Fargeo-slc.git

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 ed66df8d3..fc8493e42 100644
--- 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,13 +3,26 @@
 	elementFormDefault="qualified"
 	targetNamespace="http://argeo.org/projects/slc/schemas">
 	<!-- TREE TEST RESULT -->
+	<xs:element name="tree-test-result" type="slc:TreeTestResultType" />
 	<xs:complexType name="TreeTestResultType">
 		<xs:all>
+			<xs:element name="result-id" type="slc:ResultIdType" />
 			<xs:element name="close-date" type="xs:dateTime" />
 			<xs:element name="result-parts" minOccurs="0"
 				type="slc:ResultPartsType" />
+			<xs:element name="elements" minOccurs="0"
+				type="slc:ElementsType" />
 		</xs:all>
 	</xs:complexType>
+	<xs:complexType name="ResultIdType">
+		<xs:all>
+			<xs:element name="numeric-tRId"
+				type="slc:NumericResultIdType" />
+		</xs:all>
+	</xs:complexType>
+	<xs:complexType name="NumericResultIdType">
+		<xs:attribute name="value" type="xs:integer" use="required" />
+	</xs:complexType>
 	<xs:complexType name="ResultPartsType">
 		<xs:sequence>
 			<xs:element name="result-part" type="slc:ResultPartType"
@@ -27,39 +40,111 @@
 		<xs:all>
 			<xs:element name="slc-execution-uuid" type="xs:string" />
 			<xs:element name="slc-execution-step-uuid" type="xs:string" />
+			<xs:element name="parts" minOccurs="0" type="slc:PartsType" />
+		</xs:all>
+	</xs:complexType>
+	<xs:complexType name="PartsType">
+		<xs:sequence>
+			<xs:element name="simple-result-part"
+				type="slc:SimpleResultPartType" maxOccurs="unbounded">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="SimpleResultPartType">
+		<xs:all>
+			<xs:element name="status">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="PASSED" />
+						<xs:enumeration value="FAILED" />
+						<xs:enumeration value="ERROR" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="message" type="xs:string" />
+			<xs:element name="exception" minOccurs="0"
+				type="slc:ExceptionType" />
+		</xs:all>
+	</xs:complexType>
+	<xs:complexType name="ExceptionType">
+		<xs:all>
+			<xs:element name="message" type="xs:string" />
+			<xs:element name="stack-trace" minOccurs="0"
+				type="slc:StackTraceType" />
+		</xs:all>
+	</xs:complexType>
+	<xs:complexType name="StackTraceType">
+		<xs:sequence>
+			<xs:element name="stack-trace-element"
+				type="slc:StackTraceElementType" maxOccurs="unbounded">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="StackTraceElementType">
+		<xs:attribute name="declaring-class" type="xs:string"
+			use="required" />
+		<xs:attribute name="method-name" type="xs:string"
+			use="required" />
+		<xs:attribute name="file-name" type="xs:string" use="required" />
+		<xs:attribute name="line-number" type="xs:integer"
+			use="required" />
+	</xs:complexType>
+	<xs:complexType name="ElementsType">
+		<xs:sequence>
+			<xs:element name="element" type="slc:ElementType"
+				maxOccurs="unbounded">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="ElementType">
+		<xs:all>
+			<xs:element name="simple-sElement"
+				type="slc:SimpleSElementType" />
 		</xs:all>
 		<xs:attribute name="path" type="xs:string" use="required" />
 	</xs:complexType>
+	<xs:complexType name="SimpleSElementType">
+		<xs:all>
+			<xs:element name="label" type="xs:string" />
+			<xs:element name="tags" type="slc:TagsType" minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
+	<xs:complexType name="TagsType">
+		<xs:sequence>
+			<xs:element name="tag" type="slc:TagType"
+				maxOccurs="unbounded">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TagType">
+		<xs:all>
+			<xs:element name="tag-value" type="xs:string" />
+		</xs:all>
+		<xs:attribute name="name" type="xs:string" use="required" />
+	</xs:complexType>
 
 	<!-- SLC EXECUTION -->
-	<xs:element name="slc-execution-request">
-		<xs:complexType>
-			<xs:all>
-				<xs:element name="slc-execution"
-					type="slc:SlcExecutionType" />
-			</xs:all>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="slc-execution-steps-request">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="steps"
-					type="slc:SlcExecutionStepsType" />
-				<xs:element name="slc-execution-uuid" type="xs:string" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+	<xs:element name="slc-execution" type="slc:SlcExecutionType" />
 	<xs:complexType name="SlcExecutionType">
 		<xs:all>
 			<xs:element name="status" type="xs:string" />
 			<xs:element name="type" type="xs:string" />
 			<xs:element name="host" type="xs:string" />
-			<xs:element name="path" type="xs:string" />
+			<xs:element name="user" type="xs:string" />
 			<xs:element name="steps" minOccurs="0"
 				type="slc:SlcExecutionStepsType" />
+			<xs:element name="attributes" minOccurs="0"
+				type="slc:AttributesType" />
 		</xs:all>
 		<xs:attribute name="uuid" type="xs:string" use="required" />
 	</xs:complexType>
+	<xs:complexType name="SlcExecutionStepsType">
+		<xs:sequence>
+			<xs:element name="slc-execution-step"
+				type="slc:SlcExecutionStepType" maxOccurs="unbounded">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 	<xs:complexType name="SlcExecutionStepType">
 		<xs:all>
 			<xs:element name="type" type="xs:string" />
@@ -75,12 +160,39 @@
 		</xs:all>
 		<xs:attribute name="uuid" type="xs:string" use="required" />
 	</xs:complexType>
-	<xs:complexType name="SlcExecutionStepsType">
+	<xs:complexType name="AttributesType">
 		<xs:sequence>
-			<xs:element name="slc-execution-step"
-				type="slc:SlcExecutionStepType" maxOccurs="unbounded">
+			<xs:element name="attribute" type="slc:AttributeType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="AttributeType">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="name" type="xs:string"
+					use="required" />
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+	<!-- SLC EXECUTION REQUESTS-->
+	<xs:element name="slc-execution-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="slc-execution"
+					type="slc:SlcExecutionType" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="slc-execution-steps-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="slc-execution-uuid" type="xs:string" />
+				<xs:element name="steps"
+					type="slc:SlcExecutionStepsType" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
 
 </xs:schema>
\ No newline at end of file