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 (file)
index 92c2c71..0000000
--- 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"?>\r
-\r
-<mapping>\r
-       <description>Mapping of generic types</description>\r
-\r
-       <class name="java.lang.Exception" auto-complete="false">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="message" type="string" set-method="%1"\r
-                       get-method="getMessage">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-               <field name="stackTrace" collection="array"\r
-                       type="java.lang.StackTraceElement">\r
-                       <bind-xml auto-naming="deriveByClass"\r
-                               location="stack-trace" />\r
-               </field>\r
-       </class>\r
-\r
-       <class name="java.lang.StackTraceElement" auto-complete="false"\r
-               verify-constructable="false">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="declaringClass" type="string" set-method="%1"\r
-                       get-method="getClassName">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-               <field name="methodName" type="string" set-method="%2"\r
-                       get-method="getMethodName">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-               <field name="fileName" type="string" set-method="%3"\r
-                       get-method="getFileName">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-               <field name="lineNumber" type="integer" set-method="%4"\r
-                       get-method="getLineNumber">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-       </class>\r
-</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 (file)
index 0000000..fafc89a
--- /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 (file)
index fafc89a..0000000
--- 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 (file)
index 0000000..d37f3f8
--- /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"?>\r
+\r
+<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.org/mapping.dtd">\r
+\r
+<mapping>\r
+       <description>Process objects XML mapping</description>\r
+\r
+       <class name="org.argeo.slc.process.SlcExecution">\r
+               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
+                       ns-prefix="slc" />\r
+               <field name="uuid" identity="true">\r
+                       <bind-xml node="attribute" />\r
+               </field>\r
+               <field name="status" />\r
+               <field name="type" />\r
+               <field name="host" />\r
+               <field name="user" />\r
+               <field name="steps" collection="vector"\r
+                       type="org.argeo.slc.process.SlcExecutionStep">\r
+                       <bind-xml auto-naming="deriveByClass" location="steps" />\r
+               </field>\r
+               <field name="attributes" collection="map">\r
+                       <bind-xml name="attribute" location="attributes">\r
+                               <class name="org.exolab.castor.mapping.MapItem">\r
+                                       <map-to\r
+                                               ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />\r
+                                       <field name="key" type="string">\r
+                                               <bind-xml name="name" node="attribute" />\r
+                                       </field>\r
+                                       <field name="value" type="string">\r
+                                               <bind-xml node="text" />\r
+                                       </field>\r
+                               </class>\r
+                       </bind-xml>\r
+               </field>\r
+       </class>\r
+\r
+       <class name="org.argeo.slc.process.SlcExecutionStep">\r
+               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
+                       ns-prefix="slc" />\r
+               <field name="uuid" identity="true">\r
+                       <bind-xml node="attribute" />\r
+               </field>\r
+               <field name="type" />\r
+               <field name="begin" />\r
+               <field name="logLines" collection="vector" type="string">\r
+                       <bind-xml name="log-line" location="log-lines" />\r
+               </field>\r
+       </class>\r
+       \r
+</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 (file)
index d37f3f8..0000000
--- 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"?>\r
-\r
-<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN" "http://castor.org/mapping.dtd">\r
-\r
-<mapping>\r
-       <description>Process objects XML mapping</description>\r
-\r
-       <class name="org.argeo.slc.process.SlcExecution">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="uuid" identity="true">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-               <field name="status" />\r
-               <field name="type" />\r
-               <field name="host" />\r
-               <field name="user" />\r
-               <field name="steps" collection="vector"\r
-                       type="org.argeo.slc.process.SlcExecutionStep">\r
-                       <bind-xml auto-naming="deriveByClass" location="steps" />\r
-               </field>\r
-               <field name="attributes" collection="map">\r
-                       <bind-xml name="attribute" location="attributes">\r
-                               <class name="org.exolab.castor.mapping.MapItem">\r
-                                       <map-to\r
-                                               ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />\r
-                                       <field name="key" type="string">\r
-                                               <bind-xml name="name" node="attribute" />\r
-                                       </field>\r
-                                       <field name="value" type="string">\r
-                                               <bind-xml node="text" />\r
-                                       </field>\r
-                               </class>\r
-                       </bind-xml>\r
-               </field>\r
-       </class>\r
-\r
-       <class name="org.argeo.slc.process.SlcExecutionStep">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="uuid" identity="true">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-               <field name="type" />\r
-               <field name="begin" />\r
-               <field name="logLines" collection="vector" type="string">\r
-                       <bind-xml name="log-line" location="log-lines" />\r
-               </field>\r
-       </class>\r
-       \r
-</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 414a2f49a058118858281d487972489c3e86aaf5..21c0ce59521124e06089fb40dbf0eff5543b0e4f 100644 (file)
--- 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 (file)
index 0000000..3e20025
--- /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"?>\r
+\r
+<mapping>\r
+       <description>Structure related objects XML mapping</description>\r
+\r
+       <class name="org.argeo.slc.core.structure.tree.TreeSPath"\r
+               auto-complete="false">\r
+               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
+                       ns-prefix="slc" />\r
+               <field name="asUniqueString" type="string">\r
+                       <bind-xml node="attribute" />\r
+               </field>\r
+       </class>\r
+\r
+       <class name="org.argeo.slc.core.structure.SimpleSElement"\r
+               auto-complete="false">\r
+               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
+                       ns-prefix="slc" />\r
+               <field name="label" type="string" />\r
+               <field name="tags" collection="map">\r
+                       <bind-xml name="tag" location="tags">\r
+                               <class name="org.exolab.castor.mapping.MapItem">\r
+                                       <map-to\r
+                                               ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />\r
+                                       <field name="key" type="string">\r
+                                               <bind-xml name="name" node="attribute" />\r
+                                       </field>\r
+                                       <field name="value" type="string">\r
+                                               <bind-xml name="tag-value" />\r
+                                       </field>\r
+                               </class>\r
+                       </bind-xml>\r
+               </field>\r
+       </class>\r
+</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 (file)
index 3e20025..0000000
--- 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"?>\r
-\r
-<mapping>\r
-       <description>Structure related objects XML mapping</description>\r
-\r
-       <class name="org.argeo.slc.core.structure.tree.TreeSPath"\r
-               auto-complete="false">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="asUniqueString" type="string">\r
-                       <bind-xml node="attribute" />\r
-               </field>\r
-       </class>\r
-\r
-       <class name="org.argeo.slc.core.structure.SimpleSElement"\r
-               auto-complete="false">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="label" type="string" />\r
-               <field name="tags" collection="map">\r
-                       <bind-xml name="tag" location="tags">\r
-                               <class name="org.exolab.castor.mapping.MapItem">\r
-                                       <map-to\r
-                                               ns-uri="http://argeo.org/projects/slc/schemas" ns-prefix="slc" />\r
-                                       <field name="key" type="string">\r
-                                               <bind-xml name="name" node="attribute" />\r
-                                       </field>\r
-                                       <field name="value" type="string">\r
-                                               <bind-xml name="tag-value" />\r
-                                       </field>\r
-                               </class>\r
-                       </bind-xml>\r
-               </field>\r
-       </class>\r
-</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 (file)
index 0000000..520cfa3
--- /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 (file)
index 520cfa3..0000000
--- 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