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.xml;h=bba3b481371f39710018621efb1d81ce662a9580;hb=306b4417e8258aa195ba6cfeac6f4d2b66ce3231;hp=46f0ad212025144b04501af96a69095812880d6d;hpb=11a9d0e8d3e9f610d0546463cfaf07ae884cb249;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml
index 46f0ad212..bba3b4813 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/spring.xml
@@ -1,10 +1,23 @@
+
+	<!--
+
+		Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org> Licensed under
+		the Apache License, Version 2.0 (the "License"); you may not use this
+		file except in compliance with the License. You may obtain a copy of
+		the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+		required by applicable law or agreed to in writing, software
+		distributed under the License is distributed on an "AS IS" BASIS,
+		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+		implied. See the License for the specific language governing
+		permissions and limitations under the License.
+	-->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	default-lazy-init="true">
 
-	<bean id="slcDefault.castor.marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
+	<bean id="slcDefault.castor.marshaller" class="org.springframework.oxm.castor.CastorMarshaller">
 		<property name="mappingLocations">
 			<list>
 				<value>
@@ -22,24 +35,32 @@
 				<value>
 					classpath:org/argeo/slc/castor/test.xml
 				</value>
+				<value>
+					classpath:org/argeo/slc/castor/execution.xml
+				</value>
+				<value>
+					classpath:org/argeo/slc/castor/attachment.xml
+				</value>
+				<value>
+					classpath:org/argeo/slc/castor/build.xml
+				</value>
 			</list>
 		</property>
 		<property name="whitespacePreserve" value="true" />
+		<property name="encoding" value="UTF-8" />
 	</bean>
 
-	<bean id="slcDefault.castor.xsltReportGenerator"
-		class="org.argeo.slc.xml.test.tree.XsltReportGenerator"
+	<bean id="slcDefault.castor.xsltReportGenerator" class="org.argeo.slc.xml.test.tree.XsltReportGenerator"
 		init-method="init">
 		<property name="xsltStyleSheet"
 			value="classpath:/org/argeo/slc/core/test/tree/basicReport.xslt" />
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 		<property name="logXml" value="false" />
-		<property name="outputDir" value="${slc.workDir}/results/html" />
+		<property name="outputDir" value="${user.dir}/results/html" />
 	</bean>
 
-	<bean name="slcDefault.castor.fileSlcExecutionNotifier"
-		class="org.argeo.slc.xml.process.FileSlcExecutionNotifier">
-		<property name="basePath" value="${slc.workDir}/process" />
+	<bean name="slcDefault.castor.fileSlcExecutionNotifier" class="org.argeo.slc.xml.process.FileSlcExecutionNotifier">
+		<property name="basePath" value="${user.dir}/process" />
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 	</bean>