Make some properties externally configurable

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / bundles / org.argeo.slc.server.services / META-INF / spring / services.xml

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
index 6ae0a3b850ec7498483e7e44b980c00417ab2086..45406600f7a26e98ec361aed3a154b36d951d0c4 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
@@ -7,6 +7,16 @@
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+               <property name="ignoreUnresolvablePlaceholders" value="true" />
+               <property name="locations">
+                       <value>osgibundle:services.properties
+                       </value>
+               </property>
+       </bean>
+
        <!-- Services -->
        <bean id="testManagerService" class="org.argeo.slc.services.impl.test.TestManagerServiceImpl">
                <constructor-arg ref="testResultDao" />
@@ -18,7 +28,7 @@
        <bean id="agentService" class="org.argeo.slc.services.impl.runtime.AgentServiceImpl">
                <constructor-arg ref="slcAgentDescriptorDao" />
                <constructor-arg ref="agentFactory" />
-               <property name="pingCycle" value="0" />
+               <property name="pingCycle" value="${slc.server.services.pingCycle}" />
        </bean>
 
        <bean id="slcExecutionService"