From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 21 Feb 2010 18:06:50 +0000 (+0000)
Subject: Improve spring templates
X-Git-Tag: argeo-slc-2.1.7~1412
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f0b67f42081947fedad55db4e86124bc3223f154;p=gpl%2Fargeo-slc.git

Improve spring templates

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

diff --git a/runtime/org.argeo.slc.support.castor/.classpath b/runtime/org.argeo.slc.support.castor/.classpath
index 110fd7f0b..16c8205a8 100644
--- a/runtime/org.argeo.slc.support.castor/.classpath
+++ b/runtime/org.argeo.slc.support.castor/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
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 4e12b5567..4bcac1f20 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
@@ -6,42 +6,4 @@
 <!-- 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.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/process.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/structure.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/test.xml
-				</value>
-			</list>
-		</property>
-		<property name="whitespacePreserve" value="true" />
-	</bean>
-
-	<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" />
-	</bean>
-
-	<bean name="slcDefault.castor.fileSlcExecutionNotifier"
-		class="org.argeo.slc.xml.process.FileSlcExecutionNotifier">
-		<property name="basePath" value="${slc.workDir}/process" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-	</bean>
- -->
 </beans>
diff --git a/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/withCastor.xml b/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/withCastor.xml
index ae7f97114..902a8533e 100644
--- a/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/withCastor.xml
+++ b/runtime/org.argeo.slc.support.hibernate/src/test/resources/org/argeo/slc/hibernate/withCastor.xml
@@ -4,6 +4,5 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<import resource="applicationContext.xml" />
-	<import
-		resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
+	<import resource="classpath:/org/argeo/slc/castor/spring.xml" />
 </beans>
\ No newline at end of file