From d79bfe9bf22c3cd6f446f3c7668a20c20386ea61 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 1 May 2008 19:54:42 +0000
Subject: [PATCH 1/1] Various changes (currently broken, apparently Castor is
 hanging)

git-svn-id: https://svn.argeo.org/slc/trunk@1090 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../webapp/WEB-INF/applicationContext.xml     |  8 +--
 .../main/webapp/WEB-INF/slc-ws-servlet.xml    | 52 +++++++------------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 0177380d3..9ef1c433e 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -3,7 +3,8 @@
 	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.0.xsd">
 
-	<import resource="classpath:/org/argeo/slc/spring/templates.xml" />
+	<import
+		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -40,13 +41,12 @@
 		<property name="suppressClose" value="true" />
 	</bean>
 
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
+	<bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
 	<bean id="slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate">
+		parent="slcTemplates.dao.slcExecutionDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
index 8c3977ccd..1277f5e5e 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
@@ -3,39 +3,33 @@
 	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.0.xsd">
 
+	<import
+		resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
+	<import
+		resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />
+
 	<bean name="slcExecutionRequestEp"
 		class="org.argeo.slc.ws.process.SlcExecutionRequestEp">
 		<constructor-arg ref="slcExecutionDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="unmarshaller"
+			ref="slcDefault.castor.marshaller" />
 	</bean>
 
 	<bean name="slcExecutionStepsRequestEp"
 		class="org.argeo.slc.ws.process.SlcExecutionStepsRequestEp">
 		<constructor-arg ref="slcExecutionDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="unmarshaller"
+			ref="slcDefault.castor.marshaller" />
 	</bean>
 
-	<bean name="treeTestResultRequestEp"
-		class="org.argeo.slc.ws.test.tree.TreeTestResultRequestEp">
+	<bean name="createTreeTestResultRequestEp"
+		class="org.argeo.slc.ws.test.tree.CreateTreeTestResultRequestEp">
 		<constructor-arg ref="testResultDao" />
-		<property name="marshaller" ref="marshaller" />
-		<property name="unmarshaller" ref="marshaller" />
-	</bean>
-
-	<bean id="marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
-		<property name="mappingLocations">
-			<list>
-				<value>
-					classpath:org/argeo/slc/castor/process/mapping.xml
-				</value>
-				<value>
-					classpath:org/argeo/slc/castor/test/tree/mapping.xml
-				</value>
-			</list>
-		</property>
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="unmarshaller"
+			ref="slcDefault.castor.marshaller" />
 	</bean>
 
 	<bean id="endPointMapping"
@@ -52,8 +46,8 @@
 					slcExecutionStepsRequestEp
 				</prop>
 				<prop
-					key="{http://argeo.org/projects/slc/schemas}tree-test-result-request">
-					treeTestResultRequestEp
+					key="{http://argeo.org/projects/slc/schemas}create-tree-test-result-request">
+					createTreeTestResultRequestEp
 				</prop>
 			</props>
 		</property>
@@ -66,20 +60,14 @@
 
 	<bean id="slcDefinition"
 		class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
-		<property name="schema" ref="schema" />
+		<property name="schema" ref="slcDefault.xml.xsdSchema" />
 		<property name="portTypeName" value="Slc" />
 		<property name="locationUri"
-			value="http://localhost:8080/argeo-slc-ws/slcService/" />
+			value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />
 		<property name="targetNamespace"
 			value="http://argeo.org/projects/slc/definitions" />
 		<property name="requestSuffix" value="-request" />
 	</bean>
 
-	<bean id="schema"
-		class="org.springframework.xml.xsd.SimpleXsdSchema">
-		<property name="xsd"
-			value="classpath:/org/argeo/slc/xml/slc.xsd" />
-	</bean>
-
 	<bean class="org.argeo.slc.ws.CustomSoapExceptionResolver" />
 </beans>
\ No newline at end of file
-- 
2.39.2