From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 8 Dec 2008 13:22:40 +0000 (+0000)
Subject: Centralize Castor mapping files.
X-Git-Tag: argeo-slc-2.1.7~2314
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=cffd97edf5bfa5c6263ca2d5e1361eda34d66c2b;p=gpl%2Fargeo-slc.git

Centralize Castor mapping files.

ASSIGNED - bug 71: Extend capabilities of web services
https://www.argeo.org/bugzilla/show_bug.cgi?id=71

git-svn-id: https://svn.argeo.org/slc/trunk@1948 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/mapping.xml
deleted file mode 100644
index 92c2c71d0..000000000
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/mapping.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<mapping>
-	<description>Mapping of generic types</description>
-
-	<class name="java.lang.Exception" auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="message" type="string" set-method="%1"
-			get-method="getMessage">
-			<bind-xml node="attribute" />
-		</field>
-		<field name="stackTrace" collection="array"
-			type="java.lang.StackTraceElement">
-			<bind-xml auto-naming="deriveByClass"
-				location="stack-trace" />
-		</field>
-	</class>
-
-	<class name="java.lang.StackTraceElement" auto-complete="false"
-		verify-constructable="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="declaringClass" type="string" set-method="%1"
-			get-method="getClassName">
-			<bind-xml node="attribute" />
-		</field>
-		<field name="methodName" type="string" set-method="%2"
-			get-method="getMethodName">
-			<bind-xml node="attribute" />
-		</field>
-		<field name="fileName" type="string" set-method="%3"
-			get-method="getFileName">
-			<bind-xml node="attribute" />
-		</field>
-		<field name="lineNumber" type="integer" set-method="%4"
-			get-method="getLineNumber">
-			<bind-xml node="attribute" />
-		</field>
-	</class>
-</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
new file mode 100644
index 000000000..fafc89af0
--- /dev/null
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+
+<mapping>
+    <description>Message objects XML mapping</description>
+
+    <!-- TESTS -->
+    <class
+        name="org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="treeTestResult"
+            type="org.argeo.slc.core.test.tree.TreeTestResult" />
+        <field name="testRunDescriptor" />
+    </class>
+
+    <class
+        name="org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="resultUuid" />
+        <field name="closeDate" />
+    </class>
+
+    <class name="org.argeo.slc.msg.test.tree.ResultPartRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="resultUuid" />
+        <field name="resultPart"
+            type="org.argeo.slc.core.test.SimpleResultPart">
+            <bind-xml auto-naming="deriveByClass" />
+        </field>
+
+        <field name="relatedElements" collection="map">
+            <bind-xml name="element" location="related-elements">
+                <class name="org.exolab.castor.mapping.MapItem">
+                    <map-to
+                        ns-uri="http://argeo.org/projects/slc/schemas"
+                        ns-prefix="slc" />
+                    <field name="key"
+                        type="org.argeo.slc.core.structure.tree.TreeSPath"
+                        handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
+                        <bind-xml name="path" node="attribute" />
+                    </field>
+                    <field name="value"
+                        type="org.argeo.slc.core.structure.SimpleSElement">
+                        <bind-xml auto-naming="deriveByClass" />
+                    </field>
+                </class>
+            </bind-xml>
+        </field>
+        <field name="path">
+            <bind-xml auto-naming="deriveByClass" />
+        </field>
+        <field name="testRunDescriptor" />
+        <field name="attributes" collection="hashtable">
+            <bind-xml name="attribute" location="attributes">
+                <class name="org.exolab.castor.mapping.MapItem">
+                    <map-to
+                        ns-uri="http://argeo.org/projects/slc/schemas"
+                        ns-prefix="slc" />
+                    <field name="key" type="string">
+                        <bind-xml name="name" node="attribute" />
+                    </field>
+                    <field name="value" type="string">
+                        <bind-xml node="text" />
+                    </field>
+                </class>
+            </bind-xml>
+        </field>
+    </class>
+
+
+    <!-- PROCESS -->
+    <class name="org.argeo.slc.msg.process.SlcExecutionStepsRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="slcExecutionUuid" />
+        <field name="steps" collection="vector"
+            type="org.argeo.slc.process.SlcExecutionStep">
+            <bind-xml auto-naming="deriveByClass" location="steps" />
+        </field>
+    </class>
+
+    <class name="org.argeo.slc.msg.process.SlcExecutionStatusRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="slcExecutionUuid" />
+        <field name="newStatus" />
+    </class>
+
+    <class name="org.argeo.slc.msg.process.SlcExecutionRequest">
+        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
+            ns-prefix="slc" />
+        <field name="slcExecution"
+            type="org.argeo.slc.process.SlcExecution" />
+    </class>
+
+
+</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
deleted file mode 100644
index fafc89af0..000000000
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg/mapping.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-
-<mapping>
-    <description>Message objects XML mapping</description>
-
-    <!-- TESTS -->
-    <class
-        name="org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest">
-        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-            ns-prefix="slc" />
-        <field name="treeTestResult"
-            type="org.argeo.slc.core.test.tree.TreeTestResult" />
-        <field name="testRunDescriptor" />
-    </class>
-
-    <class
-        name="org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest">
-        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-            ns-prefix="slc" />
-        <field name="resultUuid" />
-        <field name="closeDate" />
-    </class>
-
-    <class name="org.argeo.slc.msg.test.tree.ResultPartRequest">
-        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-            ns-prefix="slc" />
-        <field name="resultUuid" />
-        <field name="resultPart"
-            type="org.argeo.slc.core.test.SimpleResultPart">
-            <bind-xml auto-naming="deriveByClass" />
-        </field>
-
-        <field name="relatedElements" collection="map">
-            <bind-xml name="element" location="related-elements">
-                <class name="org.exolab.castor.mapping.MapItem">
-                    <map-to
-                        ns-uri="http://argeo.org/projects/slc/schemas"
-                        ns-prefix="slc" />
-                    <field name="key"
-                        type="org.argeo.slc.core.structure.tree.TreeSPath"
-                        handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
-                        <bind-xml name="path" node="attribute" />
-                    </field>
-                    <field name="value"
-                        type="org.argeo.slc.core.structure.SimpleSElement">
-                        <bind-xml auto-naming="deriveByClass" />
-                    </field>
-                </class>
-            </bind-xml>
-        </field>
-        <field name="path">
-            <bind-xml auto-naming="deriveByClass" />
-        </field>
-        <field name="testRunDescriptor" />
-        <field name="attributes" collection="hashtable">
-            <bind-xml name="attribute" location="attributes">
-                <class name="org.exolab.castor.mapping.MapItem">
-                    <map-to
-                        ns-uri="http://argeo.org/projects/slc/schemas"
-                        ns-prefix="slc" />
-                    <field name="key" type="string">
-                        <bind-xml name="name" node="attribute" />
-                    </field>
-                    <field name="value" type="string">
-                        <bind-xml node="text" />
-                    </field>
-                </class>
-            </bind-xml>
-        </field>
-    </class>
-
-
-    <!-- PROCESS -->
-    <class name="org.argeo.slc.msg.process.SlcExecutionStepsRequest">
-        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-            ns-prefix="slc" />
-        <field name="slcExecutionUuid" />
-        <field name="steps" collection="vector"
-            type="org.argeo.slc.process.SlcExecutionStep">
-            <bind-xml auto-naming="deriveByClass" location="steps" />
-        </field>
-    </class>
-
-    <class name="org.argeo.slc.msg.process.SlcExecutionStatusRequest">
-        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-            ns-prefix="slc" />
-        <field name="slcExecutionUuid" />
-        <field name="newStatus" />
-    </class>
-
-    <class name="org.argeo.slc.msg.process.SlcExecutionRequest">
-        <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-            ns-prefix="slc" />
-        <field name="slcExecution"
-            type="org.argeo.slc.process.SlcExecution" />
-    </class>
-
-
-</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml
new file mode 100644
index 000000000..d37f3f839
--- /dev/null
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.org/mapping.dtd">
+
+<mapping>
+	<description>Process objects XML mapping</description>
+
+	<class name="org.argeo.slc.process.SlcExecution">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="uuid" identity="true">
+			<bind-xml node="attribute" />
+		</field>
+		<field name="status" />
+		<field name="type" />
+		<field name="host" />
+		<field name="user" />
+		<field name="steps" collection="vector"
+			type="org.argeo.slc.process.SlcExecutionStep">
+			<bind-xml auto-naming="deriveByClass" location="steps" />
+		</field>
+		<field name="attributes" collection="map">
+			<bind-xml name="attribute" location="attributes">
+				<class name="org.exolab.castor.mapping.MapItem">
+					<map-to
+						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
+					<field name="key" type="string">
+						<bind-xml name="name" node="attribute" />
+					</field>
+					<field name="value" type="string">
+						<bind-xml node="text" />
+					</field>
+				</class>
+			</bind-xml>
+		</field>
+	</class>
+
+	<class name="org.argeo.slc.process.SlcExecutionStep">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="uuid" identity="true">
+			<bind-xml node="attribute" />
+		</field>
+		<field name="type" />
+		<field name="begin" />
+		<field name="logLines" collection="vector" type="string">
+			<bind-xml name="log-line" location="log-lines" />
+		</field>
+	</class>
+	
+</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml
deleted file mode 100644
index d37f3f839..000000000
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/process/mapping.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.org/mapping.dtd">
-
-<mapping>
-	<description>Process objects XML mapping</description>
-
-	<class name="org.argeo.slc.process.SlcExecution">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="uuid" identity="true">
-			<bind-xml node="attribute" />
-		</field>
-		<field name="status" />
-		<field name="type" />
-		<field name="host" />
-		<field name="user" />
-		<field name="steps" collection="vector"
-			type="org.argeo.slc.process.SlcExecutionStep">
-			<bind-xml auto-naming="deriveByClass" location="steps" />
-		</field>
-		<field name="attributes" collection="map">
-			<bind-xml name="attribute" location="attributes">
-				<class name="org.exolab.castor.mapping.MapItem">
-					<map-to
-						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
-					<field name="key" type="string">
-						<bind-xml name="name" node="attribute" />
-					</field>
-					<field name="value" type="string">
-						<bind-xml node="text" />
-					</field>
-				</class>
-			</bind-xml>
-		</field>
-	</class>
-
-	<class name="org.argeo.slc.process.SlcExecutionStep">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="uuid" identity="true">
-			<bind-xml node="attribute" />
-		</field>
-		<field name="type" />
-		<field name="begin" />
-		<field name="logLines" collection="vector" type="string">
-			<bind-xml name="log-line" location="log-lines" />
-		</field>
-	</class>
-	
-</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
index 414a2f49a..21c0ce595 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
@@ -8,16 +8,16 @@
 		<property name="mappingLocations">
 			<list>
 				<value>
-					classpath:org/argeo/slc/castor/msg/mapping.xml
+					classpath:org/argeo/slc/castor/msg.xml
 				</value>
 				<value>
-					classpath:org/argeo/slc/castor/process/mapping.xml
+					classpath:org/argeo/slc/castor/process.xml
 				</value>
 				<value>
-					classpath:org/argeo/slc/castor/structure/mapping.xml
+					classpath:org/argeo/slc/castor/structure.xml
 				</value>
 				<value>
-					classpath:org/argeo/slc/castor/test/mapping.xml
+					classpath:org/argeo/slc/castor/test.xml
 				</value>
 			</list>
 		</property>
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml
new file mode 100644
index 000000000..3e20025b3
--- /dev/null
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<mapping>
+	<description>Structure related objects XML mapping</description>
+
+	<class name="org.argeo.slc.core.structure.tree.TreeSPath"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="asUniqueString" type="string">
+			<bind-xml node="attribute" />
+		</field>
+	</class>
+
+	<class name="org.argeo.slc.core.structure.SimpleSElement"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="label" type="string" />
+		<field name="tags" collection="map">
+			<bind-xml name="tag" location="tags">
+				<class name="org.exolab.castor.mapping.MapItem">
+					<map-to
+						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
+					<field name="key" type="string">
+						<bind-xml name="name" node="attribute" />
+					</field>
+					<field name="value" type="string">
+						<bind-xml name="tag-value" />
+					</field>
+				</class>
+			</bind-xml>
+		</field>
+	</class>
+</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure/mapping.xml
deleted file mode 100644
index 3e20025b3..000000000
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/structure/mapping.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<mapping>
-	<description>Structure related objects XML mapping</description>
-
-	<class name="org.argeo.slc.core.structure.tree.TreeSPath"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="asUniqueString" type="string">
-			<bind-xml node="attribute" />
-		</field>
-	</class>
-
-	<class name="org.argeo.slc.core.structure.SimpleSElement"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="label" type="string" />
-		<field name="tags" collection="map">
-			<bind-xml name="tag" location="tags">
-				<class name="org.exolab.castor.mapping.MapItem">
-					<map-to
-						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
-					<field name="key" type="string">
-						<bind-xml name="name" node="attribute" />
-					</field>
-					<field name="value" type="string">
-						<bind-xml name="tag-value" />
-					</field>
-				</class>
-			</bind-xml>
-		</field>
-	</class>
-</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml
new file mode 100644
index 000000000..520cfa346
--- /dev/null
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+
+<mapping>
+	<description>Test objects XML mapping</description>
+
+	<class name="org.argeo.slc.test.TestRunDescriptor"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="testRunUuid" />
+		<field name="slcExecutionUuid" />
+		<field name="slcExecutionStepUuid" />
+		<field name="testResultUuid" />
+		<field name="deployedSytemId" />
+	</class>
+
+	<class name="org.argeo.slc.core.test.tree.TreeTestResult"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="uuid" type="string">
+			<bind-xml name="uuid" node="attribute" />
+		</field>
+		<field name="closeDate" />
+		<field name="attributes" collection="map">
+			<bind-xml name="attribute" location="attributes">
+				<class name="org.exolab.castor.mapping.MapItem">
+					<map-to
+						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
+					<field name="key" type="string">
+						<bind-xml name="name" node="attribute" />
+					</field>
+					<field name="value" type="string">
+						<bind-xml node="text" />
+					</field>
+				</class>
+			</bind-xml>
+		</field>
+		<field name="resultParts" collection="sortedmap">
+			<bind-xml name="result-part" location="result-parts">
+				<class name="org.exolab.castor.mapping.MapItem">
+					<map-to
+						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
+					<field name="key"
+						type="org.argeo.slc.core.structure.tree.TreeSPath"
+						handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
+						<bind-xml name="path" node="attribute" />
+					</field>
+					<field name="value"
+						type="org.argeo.slc.core.test.tree.PartSubList">
+						<bind-xml name="part-sub-list" />
+					</field>
+				</class>
+			</bind-xml>
+		</field>
+		<field name="elements" collection="sortedmap">
+			<bind-xml name="element" location="elements">
+				<class name="org.exolab.castor.mapping.MapItem">
+					<map-to
+						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
+					<field name="key"
+						type="org.argeo.slc.core.structure.tree.TreeSPath"
+						handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
+						<bind-xml name="path" node="attribute" />
+					</field>
+					<field name="value"
+						type="org.argeo.slc.core.structure.SimpleSElement">
+						<bind-xml auto-naming="deriveByClass" />
+					</field>
+				</class>
+			</bind-xml>
+		</field>
+	</class>
+
+	<class name="org.argeo.slc.core.test.tree.PartSubList"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="parts" collection="arraylist"
+			type="org.argeo.slc.core.test.SimpleResultPart">
+			<bind-xml auto-naming="deriveByClass" location="parts" />
+		</field>
+	</class>
+
+	<class name="org.argeo.slc.core.test.SimpleResultPart"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="testRunUuid" type="string" />
+		<field name="message" type="string" />
+		<field name="status" type="string"
+			handler="org.argeo.slc.castor.test.tree.StatusFieldHandler" />
+		<field name="exceptionMessage" type="string" />
+	</class>
+
+	<class name="org.argeo.slc.core.test.tree.TreeTestResultCollection"
+		auto-complete="false">
+		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
+			ns-prefix="slc" />
+		<field name="id" type="string">
+			<bind-xml name="id" node="attribute" />
+		</field>
+		<field name="results" collection="set"
+			type="org.argeo.slc.core.test.tree.TreeTestResult">
+			<bind-xml auto-naming="deriveByClass" location="results" />
+		</field>
+	</class>
+</mapping>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml
deleted file mode 100644
index 520cfa346..000000000
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/test/mapping.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-
-<mapping>
-	<description>Test objects XML mapping</description>
-
-	<class name="org.argeo.slc.test.TestRunDescriptor"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="testRunUuid" />
-		<field name="slcExecutionUuid" />
-		<field name="slcExecutionStepUuid" />
-		<field name="testResultUuid" />
-		<field name="deployedSytemId" />
-	</class>
-
-	<class name="org.argeo.slc.core.test.tree.TreeTestResult"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="uuid" type="string">
-			<bind-xml name="uuid" node="attribute" />
-		</field>
-		<field name="closeDate" />
-		<field name="attributes" collection="map">
-			<bind-xml name="attribute" location="attributes">
-				<class name="org.exolab.castor.mapping.MapItem">
-					<map-to
-						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
-					<field name="key" type="string">
-						<bind-xml name="name" node="attribute" />
-					</field>
-					<field name="value" type="string">
-						<bind-xml node="text" />
-					</field>
-				</class>
-			</bind-xml>
-		</field>
-		<field name="resultParts" collection="sortedmap">
-			<bind-xml name="result-part" location="result-parts">
-				<class name="org.exolab.castor.mapping.MapItem">
-					<map-to
-						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
-					<field name="key"
-						type="org.argeo.slc.core.structure.tree.TreeSPath"
-						handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
-						<bind-xml name="path" node="attribute" />
-					</field>
-					<field name="value"
-						type="org.argeo.slc.core.test.tree.PartSubList">
-						<bind-xml name="part-sub-list" />
-					</field>
-				</class>
-			</bind-xml>
-		</field>
-		<field name="elements" collection="sortedmap">
-			<bind-xml name="element" location="elements">
-				<class name="org.exolab.castor.mapping.MapItem">
-					<map-to
-						ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />
-					<field name="key"
-						type="org.argeo.slc.core.structure.tree.TreeSPath"
-						handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">
-						<bind-xml name="path" node="attribute" />
-					</field>
-					<field name="value"
-						type="org.argeo.slc.core.structure.SimpleSElement">
-						<bind-xml auto-naming="deriveByClass" />
-					</field>
-				</class>
-			</bind-xml>
-		</field>
-	</class>
-
-	<class name="org.argeo.slc.core.test.tree.PartSubList"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="parts" collection="arraylist"
-			type="org.argeo.slc.core.test.SimpleResultPart">
-			<bind-xml auto-naming="deriveByClass" location="parts" />
-		</field>
-	</class>
-
-	<class name="org.argeo.slc.core.test.SimpleResultPart"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="testRunUuid" type="string" />
-		<field name="message" type="string" />
-		<field name="status" type="string"
-			handler="org.argeo.slc.castor.test.tree.StatusFieldHandler" />
-		<field name="exceptionMessage" type="string" />
-	</class>
-
-	<class name="org.argeo.slc.core.test.tree.TreeTestResultCollection"
-		auto-complete="false">
-		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
-			ns-prefix="slc" />
-		<field name="id" type="string">
-			<bind-xml name="id" node="attribute" />
-		</field>
-		<field name="results" collection="set"
-			type="org.argeo.slc.core.test.tree.TreeTestResult">
-			<bind-xml auto-naming="deriveByClass" location="results" />
-		</field>
-	</class>
-</mapping>
\ No newline at end of file