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=0b73dee77e54732f19a4078ce4b1ddae6d58a871;hb=c1cadd631138302ddd6700aa2eb7376eb657002d;hp=6ef3613e83e8d0c2ae85d77e31df446cfda46795;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;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 6ef3613e8..0b73dee77 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,6 +1,6 @@
 <!--
 
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+    Copyright (C) 2007-2012 Mathieu Baudier
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -16,6 +16,15 @@
 
 -->
 
+<!-- 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"
@@ -24,30 +33,14 @@
 	<bean id="slcDefault.castor.marshaller" class="org.springframework.oxm.castor.CastorMarshaller">
 		<property name="mappingLocations">
 			<list>
-				<value>
-					classpath:org/argeo/slc/castor/msg.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/process.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/runtime.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/structure.xml
-				</value>
-				<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>
+				<value>classpath:org/argeo/slc/castor/common.xml</value>
+				<value>classpath:org/argeo/slc/castor/msg.xml</value>
+				<value>classpath:org/argeo/slc/castor/process.xml</value>
+				<value>classpath:org/argeo/slc/castor/runtime.xml</value>
+				<value>classpath:org/argeo/slc/castor/structure.xml</value>
+				<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>
 			</list>
 		</property>
 		<property name="whitespacePreserve" value="true" />
@@ -60,11 +53,11 @@
 			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" />
+		<property name="basePath" value="${user.dir}/process" />
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 	</bean>