Adapt for Tomcat and MySQL

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

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 564c45ee486d0ac2513fbb686c3237c7d43b601d..7e9df7d2d72cf5c91928b2f90ec7f8511ebbb1cc 100644 (file)
--- 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"\r
-               parent="slcTemplate.ws.client.webServiceTemplate">\r
-               <constructor-arg ref="slcDefault.ws.client.messageFactory" />\r
-               <property name="defaultUri"\r
-                       value="http://localhost:9090/org.argeo.slc.webapp/slcService/" />\r
-       </bean>\r
-\r
-       <bean id="slcTemplate.ws.client.webServiceTemplate"\r
-               class="org.springframework.ws.client.core.WebServiceTemplate" abstract="true">\r
-               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
-               <property name="unmarshaller"\r
-                       ref="slcDefault.castor.marshaller" />\r
-               <property name="interceptors">\r
-                       <list>\r
-                               <bean\r
-                                       class="org.argeo.slc.ws.client.ValidatingClientInterceptor">\r
-                                       <property name="validator"\r
-                                               ref="slcDefault.xml.xsdValidator" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
+       <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" />