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=0b645c2741cae2d40ba346e2a020eece6fa018f0;hb=5c0582beb72385114c6b971f378719d748b27ffc;hp=fc8493e42ab241e7b4e77d649528302916bb4764;hpb=ff5078359b2bfda024f7d39a471918c75dcf27f0;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 fc8493e42..0b645c274 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
@@ -6,22 +6,13 @@
 	<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:attribute name="uuid" use="required" />
 	</xs:complexType>
 	<xs:complexType name="ResultPartsType">
 		<xs:sequence>
@@ -38,8 +29,6 @@
 	</xs:complexType>
 	<xs:complexType name="PartSubListType">
 		<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>
@@ -62,32 +51,20 @@
 				</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:element name="exception-message" minOccurs="0"
+				type="xs:string" />
+			<xs:element name="stack-lines" minOccurs="0"
+				type="slc:StackLinesType" />
+			<xs:element name="test-run-uuid" type="xs:string"
+				minOccurs="0" />
 		</xs:all>
 	</xs:complexType>
-	<xs:complexType name="StackTraceType">
+	<xs:complexType name="StackLinesType">
 		<xs:sequence>
-			<xs:element name="stack-trace-element"
-				type="slc:StackTraceElementType" maxOccurs="unbounded">
-			</xs:element>
+			<xs:element name="stack-line" maxOccurs="unbounded"
+				type="xs:string" />
 		</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:attribute name="message" type="xs:string" />
 	</xs:complexType>
 	<xs:complexType name="ElementsType">
 		<xs:sequence>
@@ -122,6 +99,53 @@
 		</xs:all>
 		<xs:attribute name="name" type="xs:string" use="required" />
 	</xs:complexType>
+	<xs:complexType name="TreeSPathType">
+		<xs:attribute name="as-unique-string" type="xs:string"
+			use="required" />
+	</xs:complexType>
+	<xs:complexType name="TestRunDescriptorType">
+		<xs:all>
+			<xs:element name="slc-execution-uuid" type="xs:string" />
+			<xs:element name="slc-execution-step-uuid" type="xs:string" />
+			<xs:element name="test-run-uuid" type="xs:string" />
+			<xs:element name="deployed-sytem-id" type="xs:string" />
+			<xs:element name="test-result-uuid" type="xs:string" />
+		</xs:all>
+	</xs:complexType>
+
+	<!-- TREE TEST RESULT REQUESTS -->
+	<xs:element name="create-tree-test-result-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="tree-test-result"
+					type="slc:TreeTestResultType" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="close-tree-test-result-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="result-uuid" type="xs:string" />
+				<xs:element name="close-date" type="xs:dateTime" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="result-part-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="result-uuid" type="xs:string" />
+				<xs:element name="simple-result-part"
+					type="slc:SimpleResultPartType" />
+				<xs:element name="related-elements"
+					type="slc:ElementsType" />
+				<xs:element name="tree-sPath" type="slc:TreeSPathType" />
+				<xs:element name="test-run-descriptor"
+					type="slc:TestRunDescriptorType" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
 
 	<!-- SLC EXECUTION -->
 	<xs:element name="slc-execution" type="slc:SlcExecutionType" />