X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Forg.argeo.slc.agent%2FMETA-INF%2Fspring%2Fagent.xml;h=1f8ca96cfb45108902288c6bfc9f6e2d9a9b7191;hb=0251574d5d704018b6f336d0f10ed1aae57290f4;hp=38cc1d4e1a06eb9724908690f25b164fd3613ef9;hpb=651d33e13bfa9a7b46464be412023ee747e612e8;p=gpl%2Fargeo-slc.git

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 38cc1d4e1..1f8ca96cf 100644
--- a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
+++ b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
@@ -4,23 +4,21 @@
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="locations">
+			<value>osgibundle:agent.properties</value>
+		</property>
+	</bean>
+
 	<!-- Manager -->
 	<bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager"
 		init-method="init" destroy-method="destroy">
-		<property name="slcExecutionNotifiers" ref="slcExecutionListeners" />
 		<property name="bundlesManager" ref="bundlesManager" />
 	</bean>
 
-	<bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager" />
-
-	<!-- Logging -->
-<!-- 	<bean id="log4Notification" class="org.argeo.slc.log4j.SlcExecutionAppender" -->
-<!-- 		init-method="init" destroy-method="destroy"> -->
-<!-- 		<property name="disabled" value="${slc.agent.log4Notification.disabled}" /> -->
-<!-- 		<property name="level" value="${slc.agent.log4Notification.level}" /> -->
-<!-- 		<property name="onlyExecutionThread" -->
-<!-- 			value="${slc.agent.log4Notification.onlyExecutionThread}" /> -->
-<!-- 	</bean> -->
-
-
+	<bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager">
+		<property name="defaultTimeout" value="${slc.agent.osgi.defaultTimeout}" />
+	</bean>
 </beans>
\ No newline at end of file