From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 12 Dec 2012 10:29:00 +0000 (+0000)
Subject: Set default timeout to 60s
X-Git-Tag: argeo-slc-2.1.7~496
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=31b131c639e5c09bf50e15c2da44d93bf62dcfda;p=gpl%2Fargeo-slc.git

Set default timeout to 60s

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

diff --git a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
index 64d61ef60..bcb4d0a05 100644
--- a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
+++ b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
@@ -12,7 +12,7 @@
 	</bean>
 
 	<bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager">
-	<property name="defaultTimeout" value=""/>
+		<property name="defaultTimeout" value="${slc.agent.osgi.defaultTimeout}" />
 	</bean>
 
 	<!-- Logging -->