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=ba98a785ab3a5e0e440d670c91ea420c44b4e89a;hb=1a4b784250a43f6c7421ab5d8567c3bfbf51e990;hp=d7e09650cfcaaec858e57306c16c683ab26f9ff7;hpb=22a03283f23241864e433943ba2bea57bfb0afeb;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 d7e09650c..ba98a785a 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,18 +6,21 @@
 	<xs:element name="tree-test-result" type="slc:TreeTestResultType" />
 	<xs:complexType name="TreeTestResultType">
 		<xs:all>
-			<xs:element name="close-date" type="xs:dateTime" />
+			<xs:element name="close-date" type="xs:dateTime"
+				minOccurs="0" />
+			<xs:element name="attributes" minOccurs="0"
+				type="slc:AttributesType" />
 			<xs:element name="result-parts" minOccurs="0"
 				type="slc:ResultPartsType" />
 			<xs:element name="elements" minOccurs="0"
 				type="slc:ElementsType" />
 		</xs:all>
-		<xs:attribute name="uuid" use="required"/>
+		<xs:attribute name="uuid" use="required" />
 	</xs:complexType>
 	<xs:complexType name="ResultPartsType">
 		<xs:sequence>
 			<xs:element name="result-part" type="slc:ResultPartType"
-				maxOccurs="unbounded">
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -29,8 +32,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>
@@ -53,37 +54,25 @@
 				</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>
 			<xs:element name="element" type="slc:ElementType"
-				maxOccurs="unbounded">
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -102,7 +91,7 @@
 	</xs:complexType>
 	<xs:complexType name="TagsType">
 		<xs:sequence>
-			<xs:element name="tag" type="slc:TagType"
+			<xs:element name="tag" type="slc:TagType" minOccurs="0"
 				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
@@ -113,9 +102,26 @@
 		</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="test-run-uuid" type="xs:string" />
+			<xs:element name="slc-execution-uuid" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="slc-execution-step-uuid" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="deployed-sytem-id" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="test-result-uuid" type="xs:string"
+				minOccurs="0" />
+		</xs:all>
+	</xs:complexType>
 
-	<!-- TREE TEST RESULT -->
-	<xs:element name="tree-test-result-request">
+	<!-- TREE TEST RESULT REQUESTS -->
+	<xs:element name="create-tree-test-result-request">
 		<xs:complexType>
 			<xs:all>
 				<xs:element name="tree-test-result"
@@ -124,6 +130,30 @@
 		</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" />
 	<xs:complexType name="SlcExecutionType">
@@ -195,5 +225,13 @@
 			</xs:all>
 		</xs:complexType>
 	</xs:element>
+	<xs:element name="slc-execution-status-request">
+		<xs:complexType>
+			<xs:all>
+				<xs:element name="slc-execution-uuid" type="xs:string" />
+				<xs:element name="new-status" type="xs:string" />
+			</xs:all>
+		</xs:complexType>
+	</xs:element>
 
 </xs:schema>
\ No newline at end of file