Reset Castor configs properly after bug due to Maven Eclipse plugin

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

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml
index 4e04c5c4933c7192f198b0270695a50a1b6ce600..1b5b2ec958b6233267b56fa82f930dc0ec167744 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/process/mapping.xml
@@ -48,24 +48,4 @@
                </field>\r
        </class>\r
        \r
-               <!-- PROCESS -->\r
-       <class name="org.argeo.slc.msg.process.SlcExecutionStepsRequest">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="slcExecutionUuid" />\r
-               <field name="steps" collection="vector"\r
-                       type="org.argeo.slc.core.process.SlcExecutionStep">\r
-                       <bind-xml auto-naming="deriveByClass" location="steps" />\r
-               </field>\r
-       </class>\r
-\r
-       <class name="org.argeo.slc.msg.process.SlcExecutionRequest">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="slcExecution"\r
-                       type="org.argeo.slc.core.process.SlcExecution" />\r
-       </class>\r
-\r
-\r
-       \r
 </mapping>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
index 30e1cc12753a5ec1f72e3c0ba0ed3ad2fbd2e6e8..e28934089f5a409a49ef7215ae4e79af20f38a48 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/spring/applicationContext.xml
@@ -7,9 +7,15 @@
                class="org.springframework.oxm.castor.CastorMarshaller">\r
                <property name="mappingLocations">\r
                        <list>\r
+                               <value>\r
+                                       classpath:org/argeo/slc/castor/msg/mapping.xml\r
+                               </value>\r
                                <value>\r
                                        classpath:org/argeo/slc/castor/process/mapping.xml\r
                                </value>\r
+                               <value>\r
+                                       classpath:org/argeo/slc/castor/structure/mapping.xml\r
+                               </value>\r
                                <value>\r
                                        classpath:org/argeo/slc/castor/test/mapping.xml\r
                                </value>\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
index 0e52293fc52a74aec09a4b931b6a76d26f72fee0..3eead131bce2f363e925605a9fcd5c62ff7e7b0e 100644 (file)
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/castor/test/mapping.xml
@@ -83,73 +83,4 @@
                </field>\r
        </class>\r
        \r
-               <!-- TESTS -->\r
-       <class\r
-               name="org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="treeTestResult"\r
-                       type="org.argeo.slc.core.test.tree.TreeTestResult" />\r
-       </class>\r
-\r
-       <class name="org.argeo.slc.msg.test.tree.ResultPartRequest">\r
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"\r
-                       ns-prefix="slc" />\r
-               <field name="resultUuid" />\r
-               <field name="resultPart">\r
-                       <bind-xml auto-naming="deriveByClass" />\r
-               </field>\r
-               <field name="relatedElements" collection="map">\r
-                       <bind-xml name="element" location="related-elements">\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"\r
-                                               type="org.argeo.slc.core.structure.tree.TreeSPath"\r
-                                               handler="org.argeo.slc.castor.structure.tree.TreeSPathFieldHandler">\r
-                                               <bind-xml name="path" node="attribute" />\r
-                                       </field>\r
-                                       <field name="value"\r
-                                               type="org.argeo.slc.core.structure.SimpleSElement">\r
-                                               <bind-xml auto-naming="deriveByClass" />\r
-                                       </field>\r
-                               </class>\r
-                       </bind-xml>\r
-               </field>\r
-               <field name="path">\r
-                       <bind-xml auto-naming="deriveByClass" />\r
-               </field>\r
-               <field name="testRunDescriptor" />\r
-       </class>\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
-       \r
 </mapping>
\ No newline at end of file