X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.castor%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fcastor%2Fspring%2FapplicationContext.xml;h=4e12b55671bd60101442eeb399b6aa64ac3e59f1;hb=34e590f37109dd9ff9aa4e12af04ee98779aa9e1;hp=414a2f49a058118858281d487972489c3e86aaf5;hpb=2995b63156cd89a45446422195c315e2ee96f170;p=gpl%2Fargeo-slc.git

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..4e12b5567 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
@@ -3,21 +3,25 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	default-lazy-init="true">
 
+<!-- DEPRECATED, USE classpath:org/argeo/slc/castor/spring.xml instead -->
+
+	<import resource="classpath:org/argeo/slc/castor/spring.xml"/>
+<!-- 
 	<bean id="slcDefault.castor.marshaller"
 		class="org.springframework.oxm.castor.CastorMarshaller">
 		<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>
@@ -39,5 +43,5 @@
 		<property name="basePath" value="${slc.workDir}/process" />
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 	</bean>
-
+ -->
 </beans>