From 5405c0fffb550121cce173d177cc4ab37812fc4f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 4 May 2008 07:49:28 +0000
Subject: [PATCH] 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
---
 .../org/argeo/slc/castor/process/mapping.xml  | 20 ------
 .../slc/castor/spring/applicationContext.xml  |  6 ++
 .../org/argeo/slc/castor/test/mapping.xml     | 69 -------------------
 3 files changed, 6 insertions(+), 89 deletions(-)

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 4e04c5c49..1b5b2ec95 100644
--- 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>
 	</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.core.process.SlcExecutionStep">
-			<bind-xml auto-naming="deriveByClass" location="steps" />
-		</field>
-	</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.core.process.SlcExecution" />
-	</class>
-
-
-	
 </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 30e1cc127..e28934089 100644
--- 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">
 		<property name="mappingLocations">
 			<list>
+				<value>
+					classpath:org/argeo/slc/castor/msg/mapping.xml
+				</value>
 				<value>
 					classpath:org/argeo/slc/castor/process/mapping.xml
 				</value>
+				<value>
+					classpath:org/argeo/slc/castor/structure/mapping.xml
+				</value>
 				<value>
 					classpath:org/argeo/slc/castor/test/mapping.xml
 				</value>
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 0e52293fc..3eead131b 100644
--- 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>
 	</class>
 	
-		<!-- 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" />
-	</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">
-			<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" />
-	</class>
-
-		<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
-- 
2.39.2