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 110fd7f0b1110a8a65097dcfb44037afd6ad6938..16c8205a870925a3e3a1dab7f2ca8d56f91d7768 100644 (file)
--- 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"?>\r
 <classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
+       <classpathentry kind="src" path="src/main/java"/>\r
+       <classpathentry kind="src" path="src/main/resources"/>\r
+       <classpathentry kind="src" path="src/test/java"/>\r
+       <classpathentry kind="src" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="output" path="bin"/>\r

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 4e12b55671bd60101442eeb399b6aa64ac3e59f1..4bcac1f20ea48e578f897cf0b677620fc690b745 100644 (file)
--- 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 ae7f97114cd0de73904ad0229243efadabc9b271..902a8533e408899fbeb9713a6414872d0900ad40 100644 (file)
--- 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">\r
 \r
        <import resource="applicationContext.xml" />\r
-       <import\r
-               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
+       <import resource="classpath:/org/argeo/slc/castor/spring.xml" />\r
 </beans>
\ No newline at end of file