From 12d87d8b159facab47213ad4ae27be7a455fd1f9 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Jul 2008 12:51:04 +0000
Subject: [PATCH] Adapt for Tomcat and MySQL

git-svn-id: https://svn.argeo.org/slc/trunk@1417 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../ws/client/spring/applicationContext.xml   | 61 ++++++++++++-------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml b/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
index 564c45ee4..7e9df7d2d 100644
--- a/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
+++ b/org.argeo.slc.agent/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
@@ -8,29 +8,44 @@
 	<import
 		resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />
 
-	<bean id="slcDefault.ws.client.webServiceTemplate"
-		parent="slcTemplate.ws.client.webServiceTemplate">
-		<constructor-arg ref="slcDefault.ws.client.messageFactory" />
-		<property name="defaultUri"
-			value="http://localhost:9090/org.argeo.slc.webapp/slcService/" />
-	</bean>
-
-	<bean id="slcTemplate.ws.client.webServiceTemplate"
-		class="org.springframework.ws.client.core.WebServiceTemplate" abstract="true">
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-		<property name="unmarshaller"
-			ref="slcDefault.castor.marshaller" />
-		<property name="interceptors">
-			<list>
-				<bean
-					class="org.argeo.slc.ws.client.ValidatingClientInterceptor">
-					<property name="validator"
-						ref="slcDefault.xml.xsdValidator" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-
+	<bean id="slcDefault.ws.client.webServiceTemplate"
+		parent="slcTemplate.ws.client.webServiceTemplate">
+		<constructor-arg ref="slcDefault.ws.client.messageFactory" />
+		<property name="defaultUri" value="${slc.ws.uri}" />
+	</bean>
+
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+		lazy-init="false">
+		<property name="systemPropertiesModeName"
+			value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="properties">
+			<props>
+				<prop key="slc.ws.uri">
+					http://localhost:9090/org.argeo.slc.webapp/slcService/
+				</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="slcTemplate.ws.client.webServiceTemplate"
+		class="org.springframework.ws.client.core.WebServiceTemplate"
+		abstract="true">
+		<property name="marshaller" ref="slcDefault.castor.marshaller" />
+		<property name="unmarshaller"
+			ref="slcDefault.castor.marshaller" />
+		<property name="interceptors">
+			<list>
+				<bean
+					class="org.argeo.slc.ws.client.ValidatingClientInterceptor">
+					<property name="validator"
+						ref="slcDefault.xml.xsdValidator" />
+				</bean>
+			</list>
+		</property>
+	</bean>
+
 	<bean id="slcDefault.ws.client.messageFactory"
 		class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />
 
-- 
2.39.5